#5231: Move MD5 model code to core binary

codereader · May 25, 2020 · faebae2 · faebae2
1 parent 78d1019
commit faebae2
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 79 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -73,14 +73,6 @@ darkradiant_SOURCES = main.cpp \
                       map/aas/Doom3AasFileLoader.cpp \
                       map/aas/Doom3AasFileSettings.cpp \
                       map/aas/Doom3AasFile.cpp \
-                      md5model/MD5Skeleton.cpp \
-                      md5model/plugin.cpp \
-                      md5model/MD5Model.cpp \
-                      md5model/MD5ModelLoader.cpp \
-                      md5model/MD5AnimationCache.cpp \
-                      md5model/MD5Surface.cpp \
-                      md5model/MD5Anim.cpp \
-                      md5model/MD5ModelNode.cpp \
                       modelfile/AseExporter.cpp \
                       modelfile/Lwo2Chunk.cpp \
                       modelfile/Lwo2Exporter.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -114,6 +114,14 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 map/namespace/ComplexName.cpp \
                 map/namespace/Namespace.cpp \
                 map/namespace/NamespaceFactory.cpp \
+                md5model/MD5Skeleton.cpp \
+                md5model/MD5Module.cpp \
+                md5model/MD5Model.cpp \
+                md5model/MD5ModelLoader.cpp \
+                md5model/MD5AnimationCache.cpp \
+                md5model/MD5Surface.cpp \
+                md5model/MD5Anim.cpp \
+                md5model/MD5ModelNode.cpp \
                 model/ModelCache.cpp \
                 model/ModelFormatManager.cpp \
                 model/NullModel.cpp \

diff --git a/radiant/md5model/MD5Anim.cpp → radiantcore/model/md5/MD5Anim.cpp b/radiant/md5model/MD5Anim.cpp → radiantcore/model/md5/MD5Anim.cpp
diff --git a/radiant/md5model/MD5Anim.h → radiantcore/model/md5/MD5Anim.h b/radiant/md5model/MD5Anim.h → radiantcore/model/md5/MD5Anim.h
diff --git a/radiant/md5model/MD5AnimationCache.cpp → radiantcore/model/md5/MD5AnimationCache.cpp b/radiant/md5model/MD5AnimationCache.cpp → radiantcore/model/md5/MD5AnimationCache.cpp
diff --git a/radiant/md5model/MD5AnimationCache.h → radiantcore/model/md5/MD5AnimationCache.h b/radiant/md5model/MD5AnimationCache.h → radiantcore/model/md5/MD5AnimationCache.h
diff --git a/radiant/md5model/MD5DataStructures.h → radiantcore/model/md5/MD5DataStructures.h b/radiant/md5model/MD5DataStructures.h → radiantcore/model/md5/MD5DataStructures.h
diff --git a/radiant/md5model/MD5Model.cpp → radiantcore/model/md5/MD5Model.cpp b/radiant/md5model/MD5Model.cpp → radiantcore/model/md5/MD5Model.cpp
diff --git a/radiant/md5model/MD5Model.h → radiantcore/model/md5/MD5Model.h b/radiant/md5model/MD5Model.h → radiantcore/model/md5/MD5Model.h
diff --git a/radiant/md5model/MD5ModelLoader.cpp → radiantcore/model/md5/MD5ModelLoader.cpp b/radiant/md5model/MD5ModelLoader.cpp → radiantcore/model/md5/MD5ModelLoader.cpp
diff --git a/radiant/md5model/MD5ModelLoader.h → radiantcore/model/md5/MD5ModelLoader.h b/radiant/md5model/MD5ModelLoader.h → radiantcore/model/md5/MD5ModelLoader.h
diff --git a/radiant/md5model/MD5ModelNode.cpp → radiantcore/model/md5/MD5ModelNode.cpp b/radiant/md5model/MD5ModelNode.cpp → radiantcore/model/md5/MD5ModelNode.cpp
diff --git a/radiant/md5model/MD5ModelNode.h → radiantcore/model/md5/MD5ModelNode.h b/radiant/md5model/MD5ModelNode.h → radiantcore/model/md5/MD5ModelNode.h
diff --git a/radiant/md5model/plugin.cpp → radiantcore/model/md5/MD5Module.cpp b/radiant/md5model/plugin.cpp → radiantcore/model/md5/MD5Module.cpp
diff --git a/radiant/md5model/MD5Skeleton.cpp → radiantcore/model/md5/MD5Skeleton.cpp b/radiant/md5model/MD5Skeleton.cpp → radiantcore/model/md5/MD5Skeleton.cpp
diff --git a/radiant/md5model/MD5Skeleton.h → radiantcore/model/md5/MD5Skeleton.h b/radiant/md5model/MD5Skeleton.h → radiantcore/model/md5/MD5Skeleton.h
diff --git a/radiant/md5model/MD5Surface.cpp → radiantcore/model/md5/MD5Surface.cpp b/radiant/md5model/MD5Surface.cpp → radiantcore/model/md5/MD5Surface.cpp
diff --git a/radiant/md5model/MD5Surface.h → radiantcore/model/md5/MD5Surface.h b/radiant/md5model/MD5Surface.h → radiantcore/model/md5/MD5Surface.h
diff --git a/radiant/md5model/RenderableMD5Skeleton.h → ...antcore/model/md5/RenderableMD5Skeleton.h b/radiant/md5model/RenderableMD5Skeleton.h → ...antcore/model/md5/RenderableMD5Skeleton.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -224,14 +224,6 @@
     <ClCompile Include="..\..\radiant\map\MapModules.cpp" />
     <ClCompile Include="..\..\radiant\map\MapPropertyInfoFileModule.cpp" />
     <ClCompile Include="..\..\radiant\map\RenderableAasFile.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\MD5Anim.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\MD5AnimationCache.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\MD5Model.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\MD5ModelLoader.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\MD5ModelNode.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\MD5Skeleton.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\MD5Surface.cpp" />
-    <ClCompile Include="..\..\radiant\md5model\plugin.cpp" />
     <ClCompile Include="..\..\radiant\modelfile\AseExporter.cpp" />
     <ClCompile Include="..\..\radiant\modelfile\Lwo2Chunk.cpp" />
     <ClCompile Include="..\..\radiant\modelfile\Lwo2Exporter.cpp" />
@@ -923,15 +915,6 @@
     <ClInclude Include="..\..\radiant\map\infofile\InfoFileManager.h" />
     <ClInclude Include="..\..\radiant\map\MapPropertyInfoFileModule.h" />
     <ClInclude Include="..\..\radiant\map\RenderableAasFile.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5Anim.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5AnimationCache.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5DataStructures.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5Model.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5ModelLoader.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5ModelNode.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5Skeleton.h" />
-    <ClInclude Include="..\..\radiant\md5model\MD5Surface.h" />
-    <ClInclude Include="..\..\radiant\md5model\RenderableMD5Skeleton.h" />
     <ClInclude Include="..\..\radiant\modelfile\AseExporter.h" />
     <ClInclude Include="..\..\radiant\modelfile\Lwo2Chunk.h" />
     <ClInclude Include="..\..\radiant\modelfile\Lwo2Exporter.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -203,9 +203,6 @@
     <Filter Include="src\eventmanager">
       <UniqueIdentifier>{9215c909-e37e-4fef-b0ce-04455bf61cf2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\md5model">
-      <UniqueIdentifier>{9ece5d35-1ea4-4651-aa2c-b8a9c80b62da}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\map\aas">
       <UniqueIdentifier>{6a40fdfb-2b56-41c2-ba54-dbf1ca276a43}</UniqueIdentifier>
     </Filter>
@@ -985,30 +982,6 @@
     <ClCompile Include="..\..\radiant\eventmanager\WidgetToggle.cpp">
       <Filter>src\eventmanager</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\MD5Anim.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\MD5AnimationCache.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\MD5Model.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\MD5ModelLoader.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\MD5ModelNode.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\MD5Skeleton.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\MD5Surface.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\md5model\plugin.cpp">
-      <Filter>src\md5model</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\Documentation.cpp">
       <Filter>src\ui</Filter>
     </ClCompile>
@@ -1998,33 +1971,6 @@
     <ClInclude Include="..\..\radiant\eventmanager\WidgetToggle.h">
       <Filter>src\eventmanager</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5Anim.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5AnimationCache.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5DataStructures.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5Model.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5ModelLoader.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5ModelNode.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5Skeleton.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\MD5Surface.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\md5model\RenderableMD5Skeleton.h">
-      <Filter>src\md5model</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\Documentation.h">
       <Filter>src\ui</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -94,6 +94,14 @@
     <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\md5\MD5Anim.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5AnimationCache.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Model.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5ModelLoader.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5ModelNode.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Module.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Skeleton.cpp" />
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Surface.cpp" />
     <ClCompile Include="..\..\radiantcore\model\ModelCache.cpp" />
     <ClCompile Include="..\..\radiantcore\model\ModelFormatManager.cpp" />
     <ClCompile Include="..\..\radiantcore\model\NullModel.cpp" />
@@ -269,6 +277,15 @@
     <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\md5\MD5Anim.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5AnimationCache.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5DataStructures.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5Model.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5ModelLoader.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5ModelNode.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5Skeleton.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5Surface.h" />
+    <ClInclude Include="..\..\radiantcore\model\md5\RenderableMD5Skeleton.h" />
     <ClInclude Include="..\..\radiantcore\model\ModelCache.h" />
     <ClInclude Include="..\..\radiantcore\model\ModelFormatManager.h" />
     <ClInclude Include="..\..\radiantcore\model\NullModel.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -125,6 +125,9 @@
     <Filter Include="src\map\format\primitiveparsers">
       <UniqueIdentifier>{14d01f25-2d8c-4df6-b0ee-14629a2d13ba}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\model\md5">
+      <UniqueIdentifier>{29be273d-ab50-438d-b093-68823b761c71}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -541,6 +544,30 @@
     <ClCompile Include="..\..\radiantcore\map\format\primitiveparsers\PatchDef3.cpp">
       <Filter>src\map\format\primitiveparsers</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Anim.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5AnimationCache.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Model.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5ModelLoader.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5ModelNode.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Skeleton.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Surface.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\model\md5\MD5Module.cpp">
+      <Filter>src\model\md5</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -1161,5 +1188,32 @@
     <ClInclude Include="..\..\radiantcore\map\format\primitiveparsers\PatchDef3.h">
       <Filter>src\map\format\primitiveparsers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5Anim.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5AnimationCache.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5DataStructures.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5Model.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5ModelLoader.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5ModelNode.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5Skeleton.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\MD5Surface.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\model\md5\RenderableMD5Skeleton.h">
+      <Filter>src\model\md5</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>