#5231: Move scenegraph modules to radiantcore

codereader · May 3, 2020 · 30f772c · 30f772c
1 parent 3fc3333
commit 30f772c
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 34 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -206,9 +206,6 @@ darkradiant_SOURCES = main.cpp \
 					  render/RenderSystemFactory.cpp \
 					  render/View.cpp \
                       render/debug/SpacePartitionRenderer.cpp \
-                      scenegraph/SceneGraph.cpp \
-                      scenegraph/Octree.cpp \
-                      scenegraph/SceneGraphFactory.cpp \
                       shaders/CameraCubeMapDecl.cpp \
                       shaders/textures/TextureManipulator.cpp \
                       $(SHADERS_SOURCES) \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -41,6 +41,9 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 log/StringLogDevice.cpp \
                 modulesystem/ModuleLoader.cpp \
                 modulesystem/ModuleRegistry.cpp \
+                scenegraph/SceneGraph.cpp \
+                scenegraph/Octree.cpp \
+                scenegraph/SceneGraphFactory.cpp \
                 settings/Game.cpp \
                 settings/GameManager.cpp \
                 settings/LanguageManager.cpp \

diff --git a/radiant/scenegraph/Octree.cpp → radiantcore/scenegraph/Octree.cpp b/radiant/scenegraph/Octree.cpp → radiantcore/scenegraph/Octree.cpp
diff --git a/radiant/scenegraph/Octree.h → radiantcore/scenegraph/Octree.h b/radiant/scenegraph/Octree.h → radiantcore/scenegraph/Octree.h
diff --git a/radiant/scenegraph/OctreeNode.h → radiantcore/scenegraph/OctreeNode.h b/radiant/scenegraph/OctreeNode.h → radiantcore/scenegraph/OctreeNode.h
diff --git a/radiant/scenegraph/SceneGraph.cpp → radiantcore/scenegraph/SceneGraph.cpp b/radiant/scenegraph/SceneGraph.cpp → radiantcore/scenegraph/SceneGraph.cpp
diff --git a/radiant/scenegraph/SceneGraph.h → radiantcore/scenegraph/SceneGraph.h b/radiant/scenegraph/SceneGraph.h → radiantcore/scenegraph/SceneGraph.h
diff --git a/radiant/scenegraph/SceneGraphFactory.cpp → radiantcore/scenegraph/SceneGraphFactory.cpp b/radiant/scenegraph/SceneGraphFactory.cpp → radiantcore/scenegraph/SceneGraphFactory.cpp
diff --git a/radiant/scenegraph/SceneGraphFactory.h → radiantcore/scenegraph/SceneGraphFactory.h b/radiant/scenegraph/SceneGraphFactory.h → radiantcore/scenegraph/SceneGraphFactory.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -761,9 +761,6 @@
     <ClCompile Include="..\..\radiant\render\backend\glprogram\GenericVFPProgram.cpp" />
     <ClCompile Include="..\..\radiant\render\LinearLightList.cpp" />
     <ClCompile Include="..\..\radiant\render\View.cpp" />
-    <ClCompile Include="..\..\radiant\scenegraph\Octree.cpp" />
-    <ClCompile Include="..\..\radiant\scenegraph\SceneGraph.cpp" />
-    <ClCompile Include="..\..\radiant\scenegraph\SceneGraphFactory.cpp" />
     <ClCompile Include="..\..\radiant\selection\algorithm\Patch.cpp" />
     <ClCompile Include="..\..\radiant\selection\algorithm\Planes.cpp" />
     <ClCompile Include="..\..\radiant\selection\clipboard\Clipboard.cpp" />
@@ -1183,10 +1180,6 @@
     <ClInclude Include="..\..\radiant\render\backend\OpenGLStateManager.h" />
     <ClInclude Include="..\..\radiant\render\frontend\RenderableCollectionWalker.h" />
     <ClInclude Include="..\..\radiant\render\View.h" />
-    <ClInclude Include="..\..\radiant\scenegraph\Octree.h" />
-    <ClInclude Include="..\..\radiant\scenegraph\OctreeNode.h" />
-    <ClInclude Include="..\..\radiant\scenegraph\SceneGraph.h" />
-    <ClInclude Include="..\..\radiant\scenegraph\SceneGraphFactory.h" />
     <ClInclude Include="..\..\radiant\selection\algorithm\CommandNotAvailableException.h" />
     <ClInclude Include="..\..\radiant\selection\algorithm\Patch.h" />
     <ClInclude Include="..\..\radiant\selection\algorithm\Planes.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -275,9 +275,6 @@
     <Filter Include="src\shaders\textures">
       <UniqueIdentifier>{46e8ff59-4a11-4333-b0ec-5c2db40c76fd}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\scenegraph">
-      <UniqueIdentifier>{14eccd63-41f4-4f83-80ba-0f593bccbc60}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\md5model">
       <UniqueIdentifier>{9ece5d35-1ea4-4651-aa2c-b8a9c80b62da}</UniqueIdentifier>
     </Filter>
@@ -1354,15 +1351,6 @@
     <ClCompile Include="..\..\radiant\shaders\textures\TextureManipulator.cpp">
       <Filter>src\shaders\textures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\scenegraph\Octree.cpp">
-      <Filter>src\scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\scenegraph\SceneGraph.cpp">
-      <Filter>src\scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\scenegraph\SceneGraphFactory.cpp">
-      <Filter>src\scenegraph</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\md5model\MD5Anim.cpp">
       <Filter>src\md5model</Filter>
     </ClCompile>
@@ -2826,18 +2814,6 @@
     <ClInclude Include="..\..\radiant\shaders\textures\TextureManipulator.h">
       <Filter>src\shaders\textures</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\scenegraph\Octree.h">
-      <Filter>src\scenegraph</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\scenegraph\OctreeNode.h">
-      <Filter>src\scenegraph</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\scenegraph\SceneGraph.h">
-      <Filter>src\scenegraph</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\scenegraph\SceneGraphFactory.h">
-      <Filter>src\scenegraph</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\md5model\MD5Anim.h">
       <Filter>src\md5model</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -29,6 +29,9 @@
     <ClCompile Include="..\..\radiantcore\log\StringLogDevice.cpp" />
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp" />
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleRegistry.cpp" />
+    <ClCompile Include="..\..\radiantcore\scenegraph\Octree.cpp" />
+    <ClCompile Include="..\..\radiantcore\scenegraph\SceneGraph.cpp" />
+    <ClCompile Include="..\..\radiantcore\scenegraph\SceneGraphFactory.cpp" />
     <ClCompile Include="..\..\radiantcore\settings\Game.cpp" />
     <ClCompile Include="..\..\radiantcore\settings\GameManager.cpp" />
     <ClCompile Include="..\..\radiantcore\settings\LanguageManager.cpp" />
@@ -63,6 +66,10 @@
     <ClInclude Include="..\..\radiantcore\messagebus\MessageBus.h" />
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h" />
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleRegistry.h" />
+    <ClInclude Include="..\..\radiantcore\scenegraph\Octree.h" />
+    <ClInclude Include="..\..\radiantcore\scenegraph\OctreeNode.h" />
+    <ClInclude Include="..\..\radiantcore\scenegraph\SceneGraph.h" />
+    <ClInclude Include="..\..\radiantcore\scenegraph\SceneGraphFactory.h" />
     <ClInclude Include="..\..\radiantcore\settings\Game.h" />
     <ClInclude Include="..\..\radiantcore\settings\GameManager.h" />
     <ClInclude Include="..\..\radiantcore\settings\LanguageManager.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -26,6 +26,9 @@
     <Filter Include="src\messagebus">
       <UniqueIdentifier>{169ccdc4-199a-489e-a87d-81209e0b9252}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\scenegraph">
+      <UniqueIdentifier>{51a3447e-6021-4fc5-8c05-20531489b2a6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -94,6 +97,15 @@
     <ClCompile Include="..\..\radiantcore\Radiant.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\scenegraph\Octree.cpp">
+      <Filter>src\scenegraph</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\scenegraph\SceneGraph.cpp">
+      <Filter>src\scenegraph</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\scenegraph\SceneGraphFactory.cpp">
+      <Filter>src\scenegraph</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -228,5 +240,17 @@
     <ClInclude Include="..\..\radiantcore\Radiant.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\scenegraph\Octree.h">
+      <Filter>src\scenegraph</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\scenegraph\OctreeNode.h">
+      <Filter>src\scenegraph</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\scenegraph\SceneGraph.h">
+      <Filter>src\scenegraph</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\scenegraph\SceneGraphFactory.h">
+      <Filter>src\scenegraph</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>