garbage collection

fallahn · Aug 3, 2023 · 62a951d · 62a951d
1 parent c69ffcb
commit 62a951d
Show file tree

Hide file tree

Showing 8 changed files with 462 additions and 2 deletions.
diff --git a/crogine.sln b/crogine.sln
@@ -268,6 +268,7 @@ Global
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|ARM.ActiveCfg = Debug|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|x64.ActiveCfg = Debug|x64
+		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|x64.Build.0 = Debug|x64
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.Debug|x86.ActiveCfg = Debug|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.DebugASan|Any CPU.ActiveCfg = DebugASan|Win32
 		{64579103-DEC3-41E4-971F-9C0DF996BE8B}.DebugASan|ARM.ActiveCfg = DebugASan|Win32
@@ -290,7 +291,6 @@ Global
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|ARM.ActiveCfg = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x64.ActiveCfg = DebugGNS|x64
-		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x64.Build.0 = DebugGNS|x64
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x86.ActiveCfg = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.Debug|x86.Build.0 = Debug|Win32
 		{B1559428-CDF8-4797-8766-0EA62BDD6D1B}.DebugASan|Any CPU.ActiveCfg = DebugASan|Win32

diff --git a/samples/scratchpad/scratchpad.vcxproj b/samples/scratchpad/scratchpad.vcxproj
@@ -315,6 +315,7 @@
     <ClCompile Include="src\collision\DebugDraw.cpp" />
     <ClCompile Include="src\collision\RollSystem.cpp" />
     <ClCompile Include="src\frustum\FrustumState.cpp" />
+    <ClCompile Include="src\gc\GcState.cpp" />
     <ClCompile Include="src\LoadingScreen.cpp" />
     <ClCompile Include="src\log\LogState.cpp" />
     <ClCompile Include="src\main.cpp" />
@@ -363,6 +364,7 @@
     <ClInclude Include="src\collision\Utils.hpp" />
     <ClInclude Include="src\ErrorCheck.hpp" />
     <ClInclude Include="src\frustum\FrustumState.hpp" />
+    <ClInclude Include="src\gc\GcState.hpp" />
     <ClInclude Include="src\LoadingScreen.hpp" />
     <ClInclude Include="src\log\LogState.hpp" />
     <ClInclude Include="src\MenuState.hpp" />

diff --git a/samples/scratchpad/scratchpad.vcxproj.filters b/samples/scratchpad/scratchpad.vcxproj.filters
@@ -97,6 +97,12 @@
     <Filter Include="Source Files\log">
       <UniqueIdentifier>{018844ae-a528-4c69-b21a-52e9e53bffc9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\gc">
+      <UniqueIdentifier>{a3891728-5ef9-4dbc-a171-26e24f2d1048}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\gc">
+      <UniqueIdentifier>{3d37093a-b41e-4736-96d6-952fb4ca1a14}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\LoadingScreen.cpp">
@@ -210,6 +216,9 @@
     <ClCompile Include="src\log\LogState.cpp">
       <Filter>Source Files\log</Filter>
     </ClCompile>
+    <ClCompile Include="src\gc\GcState.cpp">
+      <Filter>Source Files\gc</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\ErrorCheck.hpp">
@@ -356,6 +365,9 @@
     <ClInclude Include="src\log\LogState.hpp">
       <Filter>Header Files\log</Filter>
     </ClInclude>
+    <ClInclude Include="src\gc\GcState.hpp">
+      <Filter>Header Files\gc</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\voxels\Tables.inl">

diff --git a/samples/scratchpad/src/MyApp.cpp b/samples/scratchpad/src/MyApp.cpp
@@ -43,6 +43,7 @@ source distribution.
 #include "animblend/AnimBlendState.hpp"
 #include "ssao/SSAOState.hpp"
 #include "log/LogState.hpp"
+#include "gc/GcState.hpp"
 #include "LoadingScreen.hpp"
 
 #include <crogine/core/Clock.hpp>
@@ -162,9 +163,10 @@ bool MyApp::initialise()
     m_stateStack.registerState<AnimBlendState>(States::ScratchPad::AnimBlend);
     m_stateStack.registerState<SSAOState>(States::ScratchPad::SSAO);
     m_stateStack.registerState<LogState>(States::ScratchPad::Log);
+    m_stateStack.registerState<GCState>(States::ScratchPad::GC);
 
 #ifdef CRO_DEBUG_
-    m_stateStack.pushState(States::ScratchPad::BatCat);
+    m_stateStack.pushState(States::ScratchPad::GC);
     //m_stateStack.pushState(States::ScratchPad::MainMenu);
 #else
     m_stateStack.pushState(States::ScratchPad::MainMenu);

diff --git a/samples/scratchpad/src/StateIDs.hpp b/samples/scratchpad/src/StateIDs.hpp
@@ -42,6 +42,7 @@ namespace States
             Bush,
             BSP,
             Frustum,
+            GC,
             Log,
             MeshCollision,
             Retro,

diff --git a/samples/scratchpad/src/gc/CMakeLists.txt b/samples/scratchpad/src/gc/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(GC_SRC
+  ${PROJECT_DIR}/gc/GcState.cpp)