Merge pull request #10 from gilmorem560/develop

Get the Thing PR
gilmorem560 · May 1, 2020 · f44f810 · f44f810
2 parents 0206d5c + d4df3cd
commit f44f810
Show file tree

Hide file tree

Showing 25 changed files with 1,196 additions and 411 deletions.
diff --git a/game-template.vcxproj b/game-template.vcxproj
@@ -221,14 +221,16 @@
     <ClCompile Include="src\modes\actor_test.c" />
     <ClCompile Include="src\modes\actor_test_obj\actors\cube.c" />
     <ClCompile Include="src\modes\actor_test_obj\actors\tetrahedron.c" />
+    <ClCompile Include="src\modes\actor_test_obj\actors\triangle.c" />
+    <ClCompile Include="src\modes\actor_test_obj\nodes\box.c" />
     <ClCompile Include="src\modes\actor_test_obj\nodes\camera.c" />
+    <ClCompile Include="src\modes\actor_test_obj\nodes\collectible.c" />
     <ClCompile Include="src\modes\actor_test_obj\nodes\environment.c" />
     <ClCompile Include="src\modes\actor_test_obj\nodes\orbit.c" />
     <ClCompile Include="src\modes\actor_test_obj\nodes\player.c" />
     <ClCompile Include="src\scene\actor.c" />
     <ClCompile Include="src\scene\collision\collision_box.c" />
     <ClCompile Include="src\scene\collision\collision_router.c" />
-    <ClCompile Include="src\scene\collision_index.c" />
     <ClCompile Include="src\scene\node.c" />
     <ClCompile Include="src\scene\scene.c" />
     <ClCompile Include="src\scene\texture.c" />
@@ -242,10 +244,11 @@
     <ClInclude Include="src\graphics\primitives\vect.h" />
     <ClInclude Include="src\input\input.h" />
     <ClInclude Include="src\modes\actor_test.h" />
+    <ClInclude Include="src\modes\actor_test_obj\actors.h" />
+    <ClInclude Include="src\modes\actor_test_obj\nodes.h" />
     <ClInclude Include="src\modes\modes.h" />
     <ClInclude Include="src\scene\actor.h" />
     <ClInclude Include="src\scene\collision.h" />
-    <ClInclude Include="src\scene\collision_index.h" />
     <ClInclude Include="src\scene\node.h" />
     <ClInclude Include="src\scene\scene.h" />
     <ClInclude Include="src\scene\texture.h" />

diff --git a/game-template.vcxproj.filters b/game-template.vcxproj.filters
@@ -48,6 +48,9 @@
     <Filter Include="Header Files\prim">
       <UniqueIdentifier>{46e68572-043e-4f2b-9c94-e37514456c5b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\mode\actor_test_obj">
+      <UniqueIdentifier>{faa0175a-2a0f-4e84-b9f1-be268609fed9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\main.c">
@@ -65,9 +68,6 @@
     <ClCompile Include="src\scene\actor.c">
       <Filter>Source Files\scene</Filter>
     </ClCompile>
-    <ClCompile Include="src\scene\collision_index.c">
-      <Filter>Source Files\scene</Filter>
-    </ClCompile>
     <ClCompile Include="src\scene\node.c">
       <Filter>Source Files\scene</Filter>
     </ClCompile>
@@ -122,6 +122,15 @@
     <ClCompile Include="src\graphics\primitives\vect.c">
       <Filter>Source Files\prim</Filter>
     </ClCompile>
+    <ClCompile Include="src\modes\actor_test_obj\actors\triangle.c">
+      <Filter>Source Files\mode\actor_test_obj\actors</Filter>
+    </ClCompile>
+    <ClCompile Include="src\modes\actor_test_obj\nodes\box.c">
+      <Filter>Source Files\mode\actor_test_obj\nodes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\modes\actor_test_obj\nodes\collectible.c">
+      <Filter>Source Files\mode\actor_test_obj\nodes</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\input\input.h">
@@ -151,9 +160,6 @@
     <ClInclude Include="src\scene\collision.h">
       <Filter>Header Files\scene</Filter>
     </ClInclude>
-    <ClInclude Include="src\scene\collision_index.h">
-      <Filter>Header Files\scene</Filter>
-    </ClInclude>
     <ClInclude Include="src\scene\node.h">
       <Filter>Header Files\scene</Filter>
     </ClInclude>
@@ -172,5 +178,11 @@
     <ClInclude Include="src\graphics\primitives\vect.h">
       <Filter>Header Files\prim</Filter>
     </ClInclude>
+    <ClInclude Include="src\modes\actor_test_obj\actors.h">
+      <Filter>Header Files\mode\actor_test_obj</Filter>
+    </ClInclude>
+    <ClInclude Include="src\modes\actor_test_obj\nodes.h">
+      <Filter>Header Files\mode\actor_test_obj</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -12,24 +12,18 @@ main_SOURCES = \
 	modes/actor_test.c \
 	modes/actor_test_obj/actors/cube.c \
 	modes/actor_test_obj/actors/tetrahedron.c \
-	modes/actor_test_obj/nodes/environment.c \
+	modes/actor_test_obj/actors/triangle.c \
+	modes/actor_test_obj/nodes/box.c \
 	modes/actor_test_obj/nodes/camera.c \
+	modes/actor_test_obj/nodes/collectible.c \
+	modes/actor_test_obj/nodes/environment.c \
 	modes/actor_test_obj/nodes/orbit.c \
 	modes/actor_test_obj/nodes/player.c \
 	scene/actor.c \
 	scene/collision/collision_box.c \
 	scene/collision/collision_router.c \
-	scene/collision_index.c \
 	scene/node.c \
 	scene/scene.c \
 	scene/texture.c \
 	main.c
-#old_SOURCES = \
-	graphics/objects/hedrons.c \
-	graphics/objects/prisms.c \
-	modes/diamond.c \
-	modes/map.c \
-	modes/sandbox.c \
-	modes/scene_test.c \
-	modes/stage.c
 main_LDFLAGS = -lX11