#5231: Move ModelFormatManager to core module, along with the NullMod…

…el implementations
codereader · May 18, 2020 · f5697d3 · f5697d3
1 parent 354d8c1
commit f5697d3
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 33 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -364,10 +364,7 @@ darkradiant_SOURCES = main.cpp \
                       model/ModelCache.cpp \
                       model/ModelScalePreserver.cpp \
                       model/ModelExporter.cpp \
-					  model/ModelFormatManager.cpp \
-                      model/NullModel.cpp \
-					  model/ScaledModelExporter.cpp \
-                      model/NullModelNode.cpp 
+					  model/ScaledModelExporter.cpp
 
 check_PROGRAMS = facePlaneTest vfsTest shadersTest
 TESTS = $(check_PROGRAMS)

diff --git a/radiant/model/ModelCache.cpp b/radiant/model/ModelCache.cpp
@@ -13,7 +13,6 @@
 #include "os/file.h"
 
 #include "module/StaticModule.h"
-#include "NullModelLoader.h"
 #include <functional>
 
 #include "map/algorithm/Models.h"

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -88,6 +88,9 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 map/namespace/ComplexName.cpp \
                 map/namespace/Namespace.cpp \
                 map/namespace/NamespaceFactory.cpp \
+                model/ModelFormatManager.cpp \
+                model/NullModel.cpp \
+                model/NullModelNode.cpp \
                 modulesystem/ModuleLoader.cpp \
                 modulesystem/ModuleRegistry.cpp \
                 rendersystem/backend/glprogram/ARBBumpProgram.cpp \

diff --git a/radiant/model/ModelFormatManager.cpp → radiantcore/model/ModelFormatManager.cpp b/radiant/model/ModelFormatManager.cpp → radiantcore/model/ModelFormatManager.cpp
diff --git a/radiant/model/ModelFormatManager.h → radiantcore/model/ModelFormatManager.h b/radiant/model/ModelFormatManager.h → radiantcore/model/ModelFormatManager.h
diff --git a/radiant/model/NullModel.cpp → radiantcore/model/NullModel.cpp b/radiant/model/NullModel.cpp → radiantcore/model/NullModel.cpp
diff --git a/radiant/model/NullModel.h → radiantcore/model/NullModel.h b/radiant/model/NullModel.h → radiantcore/model/NullModel.h
diff --git a/radiant/model/NullModelLoader.h → radiantcore/model/NullModelLoader.h b/radiant/model/NullModelLoader.h → radiantcore/model/NullModelLoader.h
diff --git a/radiant/model/NullModelNode.cpp → radiantcore/model/NullModelNode.cpp b/radiant/model/NullModelNode.cpp → radiantcore/model/NullModelNode.cpp
diff --git a/radiant/model/NullModelNode.h → radiantcore/model/NullModelNode.h b/radiant/model/NullModelNode.h → radiantcore/model/NullModelNode.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -681,10 +681,7 @@
     <ClCompile Include="..\..\radiant\modelfile\WavefrontExporter.cpp" />
     <ClCompile Include="..\..\radiant\model\ModelCache.cpp" />
     <ClCompile Include="..\..\radiant\model\ModelExporter.cpp" />
-    <ClCompile Include="..\..\radiant\model\ModelFormatManager.cpp" />
     <ClCompile Include="..\..\radiant\model\ModelScalePreserver.cpp" />
-    <ClCompile Include="..\..\radiant\model\NullModel.cpp" />
-    <ClCompile Include="..\..\radiant\model\NullModelNode.cpp" />
     <ClCompile Include="..\..\radiant\model\ScaledModelExporter.cpp" />
     <ClCompile Include="..\..\radiant\particles\editor\ParticleEditor.cpp" />
     <ClCompile Include="..\..\radiant\particles\ParticleDef.cpp" />
@@ -1018,11 +1015,7 @@
     <ClInclude Include="..\..\radiant\modelfile\WavefrontExporter.h" />
     <ClInclude Include="..\..\radiant\model\ModelCache.h" />
     <ClInclude Include="..\..\radiant\model\ModelExporter.h" />
-    <ClInclude Include="..\..\radiant\model\ModelFormatManager.h" />
     <ClInclude Include="..\..\radiant\model\ModelScalePreserver.h" />
-    <ClInclude Include="..\..\radiant\model\NullModel.h" />
-    <ClInclude Include="..\..\radiant\model\NullModelLoader.h" />
-    <ClInclude Include="..\..\radiant\model\NullModelNode.h" />
     <ClInclude Include="..\..\radiant\model\ScaledModelExporter.h" />
     <ClInclude Include="..\..\radiant\particles\editor\ParticleEditor.h" />
     <ClInclude Include="..\..\radiant\particles\editor\ParticleEditorModule.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -823,15 +823,6 @@
     <ClCompile Include="..\..\radiant\model\ModelCache.cpp">
       <Filter>src\model</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\model\NullModel.cpp">
-      <Filter>src\model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\model\NullModelNode.cpp">
-      <Filter>src\model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\model\ModelFormatManager.cpp">
-      <Filter>src\model</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\model\ScaledModelExporter.cpp">
       <Filter>src\model</Filter>
     </ClCompile>
@@ -2004,18 +1995,6 @@
     <ClInclude Include="..\..\radiant\model\ModelCache.h">
       <Filter>src\model</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\model\NullModel.h">
-      <Filter>src\model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\model\NullModelLoader.h">
-      <Filter>src\model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\model\NullModelNode.h">
-      <Filter>src\model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\model\ModelFormatManager.h">
-      <Filter>src\model</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\model\ScaledModelExporter.h">
       <Filter>src\model</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -68,6 +68,9 @@
     <ClCompile Include="..\..\radiantcore\map\namespace\ComplexName.cpp" />
     <ClCompile Include="..\..\radiantcore\map\namespace\Namespace.cpp" />
     <ClCompile Include="..\..\radiantcore\map\namespace\NamespaceFactory.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\ModelFormatManager.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\NullModel.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\NullModelNode.cpp" />
     <ClCompile Include="..\..\radiantcore\precompiled.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -194,6 +197,10 @@
     <ClInclude Include="..\..\radiantcore\map\namespace\Namespace.h" />
     <ClInclude Include="..\..\radiantcore\map\namespace\NamespaceFactory.h" />
     <ClInclude Include="..\..\radiantcore\map\namespace\UniqueNameSet.h" />
+    <ClInclude Include="..\..\radiantcore\model\ModelFormatManager.h" />
+    <ClInclude Include="..\..\radiantcore\model\NullModel.h" />
+    <ClInclude Include="..\..\radiantcore\model\NullModelLoader.h" />
+    <ClInclude Include="..\..\radiantcore\model\NullModelNode.h" />
     <ClInclude Include="..\..\radiantcore\precompiled.h" />
     <ClInclude Include="..\..\radiantcore\Radiant.h" />
     <ClInclude Include="..\..\radiantcore\commandsystem\CaseInsensitiveCompare.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -98,6 +98,9 @@
     <Filter Include="src\entity\target">
       <UniqueIdentifier>{c631249d-5618-4429-bc52-7bf108cc13b7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\model">
+      <UniqueIdentifier>{9e9f3eed-43d3-462c-8219-68860002cc87}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -397,6 +400,15 @@
     <ClCompile Include="..\..\radiantcore\entity\speaker\SpeakerRenderables.cpp">
       <Filter>src\entity\speaker</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\ModelFormatManager.cpp">
+      <Filter>src\model</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\NullModel.cpp">
+      <Filter>src\model</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\NullModelNode.cpp">
+      <Filter>src\model</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -852,5 +864,17 @@
     <ClInclude Include="..\..\radiantcore\entity\speaker\SpeakerRenderables.h">
       <Filter>src\entity\speaker</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\ModelFormatManager.h">
+      <Filter>src\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\NullModelLoader.h">
+      <Filter>src\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\NullModel.h">
+      <Filter>src\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\NullModelNode.h">
+      <Filter>src\model</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>