mirror of
https://github.com/aharabada/glitchy-engine-beef.git
synced 2026-09-05 13:01:52 +00:00
Fixed compiler bugs
Stuff happens when you don't work on a project for half a year!
This commit is contained in:
+28
-2
@@ -1,10 +1,36 @@
|
|||||||
FileVersion = 1
|
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"]
|
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]
|
[Workspace]
|
||||||
StartupProject = "GlitchyEditor"
|
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]
|
[Configs.Debug.Win64]
|
||||||
AllocStackTraceDepth = 12
|
AllocStackTraceDepth = 12
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
FileVersion = 1
|
FileVersion = 1
|
||||||
Dependencies = {corlib = "*", GlitchLog = "*", GlitchyEngine = "*", Xml-Beef = "*"}
|
|
||||||
|
|
||||||
[Project]
|
[Project]
|
||||||
Name = "GlitchyEditor"
|
Name = "GlitchyEditor"
|
||||||
@@ -7,6 +6,12 @@ TargetType = "BeefGUIApplication"
|
|||||||
StartupObject = "GlitchyEngine.Program"
|
StartupObject = "GlitchyEngine.Program"
|
||||||
ProcessorMacros = ["GE_EDITOR_IMGUI_DEMO"]
|
ProcessorMacros = ["GE_EDITOR_IMGUI_DEMO"]
|
||||||
|
|
||||||
|
[Dependencies]
|
||||||
|
corlib = "*"
|
||||||
|
GlitchLog = "*"
|
||||||
|
GlitchyEngine = "*"
|
||||||
|
Xml-Beef = "*"
|
||||||
|
|
||||||
[Platform.Windows]
|
[Platform.Windows]
|
||||||
IconFile = "$(ProjectDir)/Resources/Textures/GlitchyEngineIcon.ico"
|
IconFile = "$(ProjectDir)/Resources/Textures/GlitchyEngineIcon.ico"
|
||||||
|
|
||||||
@@ -14,6 +19,10 @@ IconFile = "$(ProjectDir)/Resources/Textures/GlitchyEngineIcon.ico"
|
|||||||
PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
|
PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
|
||||||
DebugCommandArguments = "\"D:\\Development\\Git\\SingleStateToOrbit\""
|
DebugCommandArguments = "\"D:\\Development\\Git\\SingleStateToOrbit\""
|
||||||
|
|
||||||
|
[[Configs.Debug.Win64.DistinctOptions]]
|
||||||
|
Filter = "System.Collections.List<>"
|
||||||
|
ReflectAlwaysInclude = "IncludeAll"
|
||||||
|
|
||||||
[Configs.Release.Win64]
|
[Configs.Release.Win64]
|
||||||
PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
|
PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
|
||||||
|
|
||||||
|
|||||||
@@ -45,12 +45,12 @@ abstract class Asset : RefCounter
|
|||||||
Content.ManageAsset(this);
|
Content.ManageAsset(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected ~this()
|
//protected ~this()
|
||||||
{
|
//{
|
||||||
// TODO: crash when _contentManager is deleted first...
|
// TODO: crash when _contentManager is deleted first...
|
||||||
// TODO: unregister from content manager
|
// TODO: unregister from content manager
|
||||||
//_contentManager?.UnmanageAsset(this);
|
//_contentManager?.UnmanageAsset(this);
|
||||||
}
|
//}
|
||||||
|
|
||||||
static void AssetSerialize(BonWriter writer, ValueView value, BonEnvironment environment, SerializeValueState state)
|
static void AssetSerialize(BonWriter writer, ValueView value, BonEnvironment environment, SerializeValueState state)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,10 +9,6 @@ namespace GlitchyEngine.Core
|
|||||||
*/
|
*/
|
||||||
public class RefCounter : RefCounted, IDisposable
|
public class RefCounter : RefCounted, IDisposable
|
||||||
{
|
{
|
||||||
protected ~this()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
ReleaseRef();
|
ReleaseRef();
|
||||||
|
|||||||
@@ -122,10 +122,10 @@ namespace GlitchyEngine.World
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/*if (_font == null)
|
if (_font == null)
|
||||||
_font = new Font(@"C:\Windows\Fonts\arial.ttf", 24);
|
_font = new Font(@"C:\Windows\Fonts\arial.ttf", 24);
|
||||||
else
|
else
|
||||||
_font..AddRef();*/
|
_font..AddRef();
|
||||||
|
|
||||||
//_font = new Font(@"C:\Windows\Fonts\Cascadia Code.ttf", 24);
|
//_font = new Font(@"C:\Windows\Fonts\Cascadia Code.ttf", 24);
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
+1
-1
Submodule GlitchyEngine/vendor/bon updated: 0c80e365cd...22337c602f
Reference in New Issue
Block a user