#5576: Move some files from models/picomodel/ to the more generic mod…

…els/import/
codereader · Apr 4, 2021 · ed51de4 · ed51de4
1 parent 53f905f
commit ed51de4
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 21 deletions.
diff --git a/radiantcore/CMakeLists.txt b/radiantcore/CMakeLists.txt
@@ -154,8 +154,8 @@ add_library(radiantcore MODULE
             model/ModelFormatManager.cpp
             model/NullModel.cpp
             model/NullModelNode.cpp
-            model/picomodel/AseModelLoader.cpp
-            model/picomodel/ModelImporterBase.cpp
+            model/import/AseModelLoader.cpp
+            model/import/ModelImporterBase.cpp
             model/picomodel/PicoModelLoader.cpp
             model/picomodel/PicoModelModule.cpp
             model/picomodel/StaticModel.cpp

diff --git a/...ntcore/model/picomodel/AseModelLoader.cpp → radiantcore/model/import/AseModelLoader.cpp b/...ntcore/model/picomodel/AseModelLoader.cpp → radiantcore/model/import/AseModelLoader.cpp
@@ -1,11 +1,11 @@
 #include "AseModelLoader.h"
 
-#include "lib/picomodel.h"
+#include "../picomodel/lib/picomodel.h"
 #include "os/path.h"
 #include "string/case_conv.h"
-#include "StaticModel.h"
 
-#include "PicoModelLoader.h"
+#include "../picomodel/StaticModel.h"
+#include "../picomodel/PicoModelLoader.h"
 
 extern "C"
 {

diff --git a/radiantcore/model/picomodel/AseModelLoader.h → radiantcore/model/import/AseModelLoader.h b/radiantcore/model/picomodel/AseModelLoader.h → radiantcore/model/import/AseModelLoader.h
diff --git a/...ore/model/picomodel/ModelImporterBase.cpp → ...ntcore/model/import/ModelImporterBase.cpp b/...ore/model/picomodel/ModelImporterBase.cpp → ...ntcore/model/import/ModelImporterBase.cpp
@@ -5,8 +5,8 @@
 #include "imodelcache.h"
 #include "string/case_conv.h"
 #include "os/path.h"
-#include "StaticModelNode.h"
-#include "StaticModel.h"
+#include "../picomodel/StaticModelNode.h"
+#include "../picomodel/StaticModel.h"
 
 namespace model
 {

diff --git a/...tcore/model/picomodel/ModelImporterBase.h → radiantcore/model/import/ModelImporterBase.h b/...tcore/model/picomodel/ModelImporterBase.h → radiantcore/model/import/ModelImporterBase.h
diff --git a/radiantcore/model/picomodel/PicoModelLoader.h b/radiantcore/model/picomodel/PicoModelLoader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ModelImporterBase.h"
+#include "../import/ModelImporterBase.h"
 #include "StaticModel.h"
 
 typedef struct picoModule_s picoModule_t;

diff --git a/radiantcore/model/picomodel/PicoModelModule.h b/radiantcore/model/picomodel/PicoModelModule.h
@@ -13,7 +13,7 @@
 
 #include "string/case_conv.h"
 #include "PicoModelLoader.h"
-#include "AseModelLoader.h"
+#include "../import/AseModelLoader.h"
 
 namespace model
 {

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -151,6 +151,8 @@
     <ClCompile Include="..\..\radiantcore\model\export\PatchSurface.cpp" />
     <ClCompile Include="..\..\radiantcore\model\export\ScaledModelExporter.cpp" />
     <ClCompile Include="..\..\radiantcore\model\export\WavefrontExporter.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\import\AseModelLoader.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\import\ModelImporterBase.cpp" />
     <ClCompile Include="..\..\radiantcore\model\md5\MD5Anim.cpp" />
     <ClCompile Include="..\..\radiantcore\model\md5\MD5AnimationCache.cpp" />
     <ClCompile Include="..\..\radiantcore\model\md5\MD5Model.cpp" />
@@ -163,7 +165,6 @@
     <ClCompile Include="..\..\radiantcore\model\ModelFormatManager.cpp" />
     <ClCompile Include="..\..\radiantcore\model\NullModel.cpp" />
     <ClCompile Include="..\..\radiantcore\model\NullModelNode.cpp" />
-    <ClCompile Include="..\..\radiantcore\model\picomodel\AseModelLoader.cpp" />
     <ClCompile Include="..\..\radiantcore\model\picomodel\lib\lwo\clip.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
@@ -578,7 +579,6 @@
       <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </ForcedIncludeFiles>
     </ClCompile>
-    <ClCompile Include="..\..\radiantcore\model\picomodel\ModelImporterBase.cpp" />
     <ClCompile Include="..\..\radiantcore\model\picomodel\PicoModelLoader.cpp" />
     <ClCompile Include="..\..\radiantcore\model\picomodel\PicoModelModule.cpp" />
     <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModel.cpp" />
@@ -875,6 +875,8 @@
     <ClInclude Include="..\..\radiantcore\model\export\PatchSurface.h" />
     <ClInclude Include="..\..\radiantcore\model\export\ScaledModelExporter.h" />
     <ClInclude Include="..\..\radiantcore\model\export\WavefrontExporter.h" />
+    <ClInclude Include="..\..\radiantcore\model\import\AseModelLoader.h" />
+    <ClInclude Include="..\..\radiantcore\model\import\ModelImporterBase.h" />
     <ClInclude Include="..\..\radiantcore\model\md5\MD5Anim.h" />
     <ClInclude Include="..\..\radiantcore\model\md5\MD5AnimationCache.h" />
     <ClInclude Include="..\..\radiantcore\model\md5\MD5DataStructures.h" />
@@ -889,12 +891,10 @@
     <ClInclude Include="..\..\radiantcore\model\NullModel.h" />
     <ClInclude Include="..\..\radiantcore\model\NullModelLoader.h" />
     <ClInclude Include="..\..\radiantcore\model\NullModelNode.h" />
-    <ClInclude Include="..\..\radiantcore\model\picomodel\AseModelLoader.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\lib\lwo\lwo2.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\lib\picointernal.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\lib\picomodel.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\lib\pm_fm.h" />
-    <ClInclude Include="..\..\radiantcore\model\picomodel\ModelImporterBase.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\PicoModelLoader.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\PicoModelModule.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModel.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -197,6 +197,9 @@
     <Filter Include="src\entity\algorithm">
       <UniqueIdentifier>{b7afddd6-8c82-4975-a947-00999bd70fec}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\model\import">
+      <UniqueIdentifier>{a98a0273-a99f-4a0d-b181-14479a01cecd}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -1027,11 +1030,11 @@
     <ClCompile Include="..\..\radiantcore\shaders\MaterialSourceGenerator.cpp">
       <Filter>src\shaders</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiantcore\model\picomodel\AseModelLoader.cpp">
-      <Filter>src\model\picomodel</Filter>
+    <ClCompile Include="..\..\radiantcore\model\import\AseModelLoader.cpp">
+      <Filter>src\model\import</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiantcore\model\picomodel\ModelImporterBase.cpp">
-      <Filter>src\model\picomodel</Filter>
+    <ClCompile Include="..\..\radiantcore\model\import\ModelImporterBase.cpp">
+      <Filter>src\model\import</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -2103,11 +2106,11 @@
     <ClInclude Include="..\..\radiantcore\shaders\MaterialSourceGenerator.h">
       <Filter>src\shaders</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\model\picomodel\AseModelLoader.h">
-      <Filter>src\model\picomodel</Filter>
+    <ClInclude Include="..\..\radiantcore\model\import\AseModelLoader.h">
+      <Filter>src\model\import</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\model\picomodel\ModelImporterBase.h">
-      <Filter>src\model\picomodel</Filter>
+    <ClInclude Include="..\..\radiantcore\model\import\ModelImporterBase.h">
+      <Filter>src\model\import</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>