Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler bugs

Browse Source 
Stuff happens when you don't work on a project for half a year!
This commit is contained in:
Simon Lübeß
2026-04-11 09:35:45 +02:00
parent 1b8cc93834
commit 28a9242023
6 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BeefSpace.toml
+28 -2
View File
@@ -1,10 +1,36 @@
FileVersion = 1
Projects = {GlitchyEngine = {Path = "GlitchyEngine"}, GlitchLog = {Path = "GlitchLog"}, DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}, LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}, FreeType = {Path = "GlitchyEngine/vendor/freetype"}, cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}, GlitchyEditor = {Path = "GlitchyEditor"}, msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}, ImGui = {Path = "GlitchyEngine/vendor/imgui/ImGui"}, ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplDX11"}, ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplWin32"}, ImGuizmo = {Path = "GlitchyEngine/vendor/imgui/ImGuizmo"}, GlitchyEngineHelper = {Path = "GlitchyEngineHelper"}, bon = {Path = "GlitchyEngine/vendor/bon"}, box2d-beef = {Path = "GlitchyEngine/vendor/box2D"}, "Beef.Linq" = {Path = "GlitchyEngine/vendor/Beef.Linq/src"}, ScriptCore = {Path = "ScriptCore"}, NetHostBeef = {Path = "GlitchyEngine/vendor/NetHostBeef/NetHostBeef"}, "GlitchyEngine.Test" = {Path = "GlitchyEngine.Test"}, Xml-Beef = {Path = "GlitchyEngine/vendor/Xml-Beef"}, "GlitchyEngine.Benchmark" = {Path = "GlitchyEngine.Benchmark"}}
Locked = ["ImGui"]
WorkspaceFolders = {GlitchyEngine = ["GlitchyEngine", "GlitchLog", "GlitchyEngineHelper", "ScriptCore", "GlitchyEngine.Test", "GlitchyEngine.Benchmark"], "GlitchyEngine/Dependencies" = ["cgltf-beef", "DirectX", "FreeType", "ImGui", "ImGuiImplDX11", "ImGuiImplWin32", "ImGuizmo", "LodePng", "msdfgen-beef", "bon", "box2d-beef", "Beef.Linq", "NetHostBeef", "Xml-Beef"], Beef = ["Beefy2D", "corlib"]}
[Workspace]
StartupProject = "GlitchyEditor"
[Projects]
GlitchyEngine = {Path = "GlitchyEngine"}
GlitchLog = {Path = "GlitchLog"}
DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}
LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}
FreeType = {Path = "GlitchyEngine/vendor/freetype"}
cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}
GlitchyEditor = {Path = "GlitchyEditor"}
msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}
ImGui = {Path = "GlitchyEngine/vendor/imgui/ImGui"}
ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplDX11"}
ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplWin32"}
ImGuizmo = {Path = "GlitchyEngine/vendor/imgui/ImGuizmo"}
GlitchyEngineHelper = {Path = "GlitchyEngineHelper"}
bon = {Path = "GlitchyEngine/vendor/bon"}
box2d-beef = {Path = "GlitchyEngine/vendor/box2D"}
"Beef.Linq" = {Path = "GlitchyEngine/vendor/Beef.Linq/src"}
ScriptCore = {Path = "ScriptCore"}
NetHostBeef = {Path = "GlitchyEngine/vendor/NetHostBeef/NetHostBeef"}
"GlitchyEngine.Test" = {Path = "GlitchyEngine.Test"}
Xml-Beef = {Path = "GlitchyEngine/vendor/Xml-Beef"}
"GlitchyEngine.Benchmark" = {Path = "GlitchyEngine.Benchmark"}
[WorkspaceFolders]
GlitchyEngine = ["GlitchyEngine", "GlitchLog", "GlitchyEngineHelper", "ScriptCore", "GlitchyEngine.Test", "GlitchyEngine.Benchmark"]
"GlitchyEngine/Dependencies" = ["cgltf-beef", "DirectX", "FreeType", "ImGui", "ImGuiImplDX11", "ImGuiImplWin32", "ImGuizmo", "LodePng", "msdfgen-beef", "bon", "box2d-beef", "Beef.Linq", "NetHostBeef", "Xml-Beef"]
Beef = ["Beefy2D", "corlib"]
[Configs.Debug.Win64]
AllocStackTraceDepth = 12
GlitchyEditor/BeefProj.toml
+10 -1
View File
@@ -1,5 +1,4 @@
FileVersion = 1
Dependencies = {corlib = "*", GlitchLog = "*", GlitchyEngine = "*", Xml-Beef = "*"}
[Project]
Name = "GlitchyEditor"
@@ -7,6 +6,12 @@ TargetType = "BeefGUIApplication"
StartupObject = "GlitchyEngine.Program"
ProcessorMacros = ["GE_EDITOR_IMGUI_DEMO"]
[Dependencies]
corlib = "*"
GlitchLog = "*"
GlitchyEngine = "*"
Xml-Beef = "*"
[Platform.Windows]
IconFile = "$(ProjectDir)/Resources/Textures/GlitchyEngineIcon.ico"
@@ -14,6 +19,10 @@ IconFile = "$(ProjectDir)/Resources/Textures/GlitchyEngineIcon.ico"
PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
DebugCommandArguments = "\"D:\\Development\\Git\\SingleStateToOrbit\""
[[Configs.Debug.Win64.DistinctOptions]]
Filter = "System.Collections.List<>"
ReflectAlwaysInclude = "IncludeAll"
[Configs.Release.Win64]
PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
GlitchyEngine/src/Content/Asset.bf
+3 -3
View File
@@ -45,12 +45,12 @@ abstract class Asset : RefCounter
Content.ManageAsset(this);
}
protected ~this()
{
//protected ~this()
//{
// TODO: crash when _contentManager is deleted first...
// TODO: unregister from content manager
//_contentManager?.UnmanageAsset(this);
}
//}
static void AssetSerialize(BonWriter writer, ValueView value, BonEnvironment environment, SerializeValueState state)
{
GlitchyEngine/src/Core/RefCounter.bf
-4
View File
@@ -9,10 +9,6 @@ namespace GlitchyEngine.Core
*/
public class RefCounter : RefCounted, IDisposable
{
protected ~this()
{
}
public void Dispose()
{
ReleaseRef();
GlitchyEngine/src/World/Scene.bf
+2 -2
View File
@@ -122,10 +122,10 @@ namespace GlitchyEngine.World
}
});
/*if (_font == null)
if (_font == null)
_font = new Font(@"C:\Windows\Fonts\arial.ttf", 24);
else
_font..AddRef();*/
_font..AddRef();
//_font = new Font(@"C:\Windows\Fonts\Cascadia Code.ttf", 24);
}
GlitchyEngine/vendor/bon
Vendored
+1 -1
Submodule GlitchyEngine/vendor/bon updated: 0c80e365cd...22337c602f