From 8d98db1a5025f3cba64fb7c59ce58919f429240a Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Sun, 4 Apr 2021 09:34:27 +0200
Subject: [PATCH] #5576: Move StaticModel from model/picomodel/ to to its
 parent folder

---
 radiantcore/CMakeLists.txt                    |  6 ++--
 .../model/{picomodel => }/StaticModel.cpp     |  0
 .../model/{picomodel => }/StaticModel.h       |  0
 .../model/{picomodel => }/StaticModelNode.cpp |  0
 .../model/{picomodel => }/StaticModelNode.h   |  0
 .../{picomodel => }/StaticModelSurface.cpp    |  0
 .../{picomodel => }/StaticModelSurface.h      |  2 +-
 radiantcore/model/import/AseModelLoader.cpp   |  2 +-
 .../model/picomodel/PicoModelLoader.cpp       |  4 +--
 radiantcore/model/picomodel/PicoModelLoader.h |  2 +-
 tools/msvc/DarkRadiantCore.vcxproj            | 12 +++----
 tools/msvc/DarkRadiantCore.vcxproj.filters    | 36 +++++++++----------
 12 files changed, 32 insertions(+), 32 deletions(-)
 rename radiantcore/model/{picomodel => }/StaticModel.cpp (100%)
 rename radiantcore/model/{picomodel => }/StaticModel.h (100%)
 rename radiantcore/model/{picomodel => }/StaticModelNode.cpp (100%)
 rename radiantcore/model/{picomodel => }/StaticModelNode.h (100%)
 rename radiantcore/model/{picomodel => }/StaticModelSurface.cpp (100%)
 rename radiantcore/model/{picomodel => }/StaticModelSurface.h (98%)

diff --git a/radiantcore/CMakeLists.txt b/radiantcore/CMakeLists.txt
index 5cc2ba0ec6..a68b11f924 100644
--- a/radiantcore/CMakeLists.txt
+++ b/radiantcore/CMakeLists.txt
@@ -158,9 +158,9 @@ add_library(radiantcore MODULE
             model/import/ModelImporterBase.cpp
             model/picomodel/PicoModelLoader.cpp
             model/picomodel/PicoModelModule.cpp
-            model/picomodel/StaticModel.cpp
-            model/picomodel/StaticModelNode.cpp
-            model/picomodel/StaticModelSurface.cpp
+            model/StaticModel.cpp
+            model/StaticModelNode.cpp
+            model/StaticModelSurface.cpp
             model/picomodel/lib/lwo/clip.c
             model/picomodel/lib/lwo/envelope.c
             model/picomodel/lib/lwo/list.c
diff --git a/radiantcore/model/picomodel/StaticModel.cpp b/radiantcore/model/StaticModel.cpp
similarity index 100%
rename from radiantcore/model/picomodel/StaticModel.cpp
rename to radiantcore/model/StaticModel.cpp
diff --git a/radiantcore/model/picomodel/StaticModel.h b/radiantcore/model/StaticModel.h
similarity index 100%
rename from radiantcore/model/picomodel/StaticModel.h
rename to radiantcore/model/StaticModel.h
diff --git a/radiantcore/model/picomodel/StaticModelNode.cpp b/radiantcore/model/StaticModelNode.cpp
similarity index 100%
rename from radiantcore/model/picomodel/StaticModelNode.cpp
rename to radiantcore/model/StaticModelNode.cpp
diff --git a/radiantcore/model/picomodel/StaticModelNode.h b/radiantcore/model/StaticModelNode.h
similarity index 100%
rename from radiantcore/model/picomodel/StaticModelNode.h
rename to radiantcore/model/StaticModelNode.h
diff --git a/radiantcore/model/picomodel/StaticModelSurface.cpp b/radiantcore/model/StaticModelSurface.cpp
similarity index 100%
rename from radiantcore/model/picomodel/StaticModelSurface.cpp
rename to radiantcore/model/StaticModelSurface.cpp
diff --git a/radiantcore/model/picomodel/StaticModelSurface.h b/radiantcore/model/StaticModelSurface.h
similarity index 98%
rename from radiantcore/model/picomodel/StaticModelSurface.h
rename to radiantcore/model/StaticModelSurface.h
index 5bf565590d..f6c8f7f3c5 100644
--- a/radiantcore/model/picomodel/StaticModelSurface.h
+++ b/radiantcore/model/StaticModelSurface.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "GLProgramAttributes.h"
-#include "lib/picomodel.h"
+#include "picomodel/lib/picomodel.h"
 #include "render.h"
 #include "math/AABB.h"
 
diff --git a/radiantcore/model/import/AseModelLoader.cpp b/radiantcore/model/import/AseModelLoader.cpp
index ebb3d7247d..489dfad1b5 100644
--- a/radiantcore/model/import/AseModelLoader.cpp
+++ b/radiantcore/model/import/AseModelLoader.cpp
@@ -4,7 +4,7 @@
 #include "os/path.h"
 #include "string/case_conv.h"
 
-#include "../picomodel/StaticModel.h"
+#include "../StaticModel.h"
 #include "../picomodel/PicoModelLoader.h"
 
 extern "C"
diff --git a/radiantcore/model/picomodel/PicoModelLoader.cpp b/radiantcore/model/picomodel/PicoModelLoader.cpp
index 08249d9e57..30f931ff5b 100644
--- a/radiantcore/model/picomodel/PicoModelLoader.cpp
+++ b/radiantcore/model/picomodel/PicoModelLoader.cpp
@@ -10,8 +10,8 @@
 
 #include "idatastream.h"
 #include "string/case_conv.h"
-#include "StaticModel.h"
-#include "StaticModelSurface.h"
+#include "../StaticModel.h"
+#include "../StaticModelSurface.h"
 
 namespace model {
 
diff --git a/radiantcore/model/picomodel/PicoModelLoader.h b/radiantcore/model/picomodel/PicoModelLoader.h
index 6125ad97ad..6069b093be 100644
--- a/radiantcore/model/picomodel/PicoModelLoader.h
+++ b/radiantcore/model/picomodel/PicoModelLoader.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../import/ModelImporterBase.h"
-#include "StaticModel.h"
+#include "../StaticModel.h"
 
 typedef struct picoModule_s picoModule_t;
 typedef struct picoSurface_s picoSurface_t;
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index 4fc057f7e8..3ad885b6c5 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -581,9 +581,9 @@
     </ClCompile>
     <ClCompile Include="..\..\radiantcore\model\picomodel\PicoModelLoader.cpp" />
     <ClCompile Include="..\..\radiantcore\model\picomodel\PicoModelModule.cpp" />
-    <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModel.cpp" />
-    <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModelNode.cpp" />
-    <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModelSurface.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\StaticModel.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\StaticModelNode.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\StaticModelSurface.cpp" />
     <ClCompile Include="..\..\radiantcore\particles\ParticleDef.cpp" />
     <ClCompile Include="..\..\radiantcore\particles\ParticleNode.cpp" />
     <ClCompile Include="..\..\radiantcore\particles\ParticleParameter.cpp" />
@@ -897,9 +897,9 @@
     <ClInclude Include="..\..\radiantcore\model\picomodel\lib\pm_fm.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\PicoModelLoader.h" />
     <ClInclude Include="..\..\radiantcore\model\picomodel\PicoModelModule.h" />
-    <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModel.h" />
-    <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModelNode.h" />
-    <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModelSurface.h" />
+    <ClInclude Include="..\..\radiantcore\model\StaticModel.h" />
+    <ClInclude Include="..\..\radiantcore\model\StaticModelNode.h" />
+    <ClInclude Include="..\..\radiantcore\model\StaticModelSurface.h" />
     <ClInclude Include="..\..\radiantcore\particles\ParticleDef.h" />
     <ClInclude Include="..\..\radiantcore\particles\ParticleNode.h" />
     <ClInclude Include="..\..\radiantcore\particles\ParticleParameter.h" />
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index 344adcb899..b587873242 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -994,15 +994,6 @@
     <ClCompile Include="..\..\radiantcore\eclass\EClassColourManager.cpp">
       <Filter>src\eclass</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModel.cpp">
-      <Filter>src\model\picomodel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModelNode.cpp">
-      <Filter>src\model\picomodel</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiantcore\model\picomodel\StaticModelSurface.cpp">
-      <Filter>src\model\picomodel</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiantcore\rendersystem\GLFont.cpp">
       <Filter>src\rendersystem</Filter>
     </ClCompile>
@@ -1036,6 +1027,15 @@
     <ClCompile Include="..\..\radiantcore\model\import\ModelImporterBase.cpp">
       <Filter>src\model\import</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\StaticModel.cpp">
+      <Filter>src\model</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\StaticModelNode.cpp">
+      <Filter>src\model</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\StaticModelSurface.cpp">
+      <Filter>src\model</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -2058,15 +2058,6 @@
     <ClInclude Include="..\..\radiantcore\eclass\EClassColourManager.h">
       <Filter>src\eclass</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModel.h">
-      <Filter>src\model\picomodel</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModelNode.h">
-      <Filter>src\model\picomodel</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiantcore\model\picomodel\StaticModelSurface.h">
-      <Filter>src\model\picomodel</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiantcore\rendersystem\GLFont.h">
       <Filter>src\rendersystem</Filter>
     </ClInclude>
@@ -2112,5 +2103,14 @@
     <ClInclude Include="..\..\radiantcore\model\import\ModelImporterBase.h">
       <Filter>src\model\import</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\StaticModel.h">
+      <Filter>src\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\StaticModelNode.h">
+      <Filter>src\model</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\StaticModelSurface.h">
+      <Filter>src\model</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file