#5231: Move image loader classes to radiantcore

codereader · May 3, 2020 · 150cd31 · 150cd31
1 parent b856e1e
commit 150cd31
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 61 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -113,12 +113,6 @@ darkradiant_SOURCES = main.cpp \
                       fonts/GlyphInfo.cpp \
                       fonts/GlyphSet.cpp \
                       fonts/FontManager.cpp \
-                      image/dds.cpp \
-                      image/ddslib.cpp \
-                      image/DDSImage.cpp \
-                      image/Doom3ImageLoader.cpp \
-                      image/ImageLoaderWx.cpp \
-                      image/TGALoader.cpp \
                       map/MapModules.cpp \
                       map/format/Quake3MapFormat.cpp \
                       map/format/Quake4MapFormat.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -33,6 +33,12 @@ libradiantcore_la_LDFLAGS = -module -avoid-version \
 
 libradiantcore_la_SOURCES = Radiant.cpp \
                 commandsystem/CommandSystem.cpp \
+                imagefile/dds.cpp \
+                imagefile/ddslib.cpp \
+                imagefile/DDSImage.cpp \
+                imagefile/Doom3ImageLoader.cpp \
+                imagefile/ImageLoaderWx.cpp \
+                imagefile/TGALoader.cpp \
                 log/COutRedirector.cpp \
                 log/LogFile.cpp \
                 log/LogStream.cpp \

diff --git a/radiant/image/DDSImage.cpp → radiantcore/imagefile/DDSImage.cpp b/radiant/image/DDSImage.cpp → radiantcore/imagefile/DDSImage.cpp
diff --git a/radiant/image/DDSImage.h → radiantcore/imagefile/DDSImage.h b/radiant/image/DDSImage.h → radiantcore/imagefile/DDSImage.h
diff --git a/radiant/image/Doom3ImageLoader.cpp → radiantcore/imagefile/Doom3ImageLoader.cpp b/radiant/image/Doom3ImageLoader.cpp → radiantcore/imagefile/Doom3ImageLoader.cpp
diff --git a/radiant/image/Doom3ImageLoader.h → radiantcore/imagefile/Doom3ImageLoader.h b/radiant/image/Doom3ImageLoader.h → radiantcore/imagefile/Doom3ImageLoader.h
diff --git a/radiant/image/ImageLoaderWx.cpp → radiantcore/imagefile/ImageLoaderWx.cpp b/radiant/image/ImageLoaderWx.cpp → radiantcore/imagefile/ImageLoaderWx.cpp
diff --git a/radiant/image/ImageLoaderWx.h → radiantcore/imagefile/ImageLoaderWx.h b/radiant/image/ImageLoaderWx.h → radiantcore/imagefile/ImageLoaderWx.h
diff --git a/radiant/image/ImageTypeLoader.h → radiantcore/imagefile/ImageTypeLoader.h b/radiant/image/ImageTypeLoader.h → radiantcore/imagefile/ImageTypeLoader.h
diff --git a/radiant/image/TGALoader.cpp → radiantcore/imagefile/TGALoader.cpp b/radiant/image/TGALoader.cpp → radiantcore/imagefile/TGALoader.cpp
diff --git a/radiant/image/TGALoader.h → radiantcore/imagefile/TGALoader.h b/radiant/image/TGALoader.h → radiantcore/imagefile/TGALoader.h
diff --git a/radiant/image/dds.cpp → radiantcore/imagefile/dds.cpp b/radiant/image/dds.cpp → radiantcore/imagefile/dds.cpp
diff --git a/radiant/image/dds.h → radiantcore/imagefile/dds.h b/radiant/image/dds.h → radiantcore/imagefile/dds.h
diff --git a/radiant/image/ddslib.cpp → radiantcore/imagefile/ddslib.cpp b/radiant/image/ddslib.cpp → radiantcore/imagefile/ddslib.cpp
diff --git a/radiant/image/ddslib.h → radiantcore/imagefile/ddslib.h b/radiant/image/ddslib.h → radiantcore/imagefile/ddslib.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -247,12 +247,6 @@
     <ClCompile Include="..\..\radiant\fonts\FontManager.cpp" />
     <ClCompile Include="..\..\radiant\fonts\GlyphInfo.cpp" />
     <ClCompile Include="..\..\radiant\fonts\GlyphSet.cpp" />
-    <ClCompile Include="..\..\radiant\image\dds.cpp" />
-    <ClCompile Include="..\..\radiant\image\DDSImage.cpp" />
-    <ClCompile Include="..\..\radiant\image\ddslib.cpp" />
-    <ClCompile Include="..\..\radiant\image\Doom3ImageLoader.cpp" />
-    <ClCompile Include="..\..\radiant\image\ImageLoaderWx.cpp" />
-    <ClCompile Include="..\..\radiant\image\TGALoader.cpp" />
     <ClCompile Include="..\..\radiant\layers\LayerInfoFileModule.cpp" />
     <ClCompile Include="..\..\radiant\layers\LayerManager.cpp" />
     <ClCompile Include="..\..\radiant\layers\LayerModule.cpp" />
@@ -1073,13 +1067,6 @@
     <ClInclude Include="..\..\radiant\fonts\FontManager.h" />
     <ClInclude Include="..\..\radiant\fonts\GlyphInfo.h" />
     <ClInclude Include="..\..\radiant\fonts\GlyphSet.h" />
-    <ClInclude Include="..\..\radiant\image\dds.h" />
-    <ClInclude Include="..\..\radiant\image\DDSImage.h" />
-    <ClInclude Include="..\..\radiant\image\ddslib.h" />
-    <ClInclude Include="..\..\radiant\image\Doom3ImageLoader.h" />
-    <ClInclude Include="..\..\radiant\image\ImageLoaderWx.h" />
-    <ClInclude Include="..\..\radiant\image\ImageTypeLoader.h" />
-    <ClInclude Include="..\..\radiant\image\TGALoader.h" />
     <ClInclude Include="..\..\radiant\layers\LayerInfoFileModule.h" />
     <ClInclude Include="..\..\radiant\layers\LayerManager.h" />
     <ClInclude Include="..\..\radiant\layers\LayerUsageBreakdown.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -203,9 +203,6 @@
     <Filter Include="src\ui\entitylist">
       <UniqueIdentifier>{cf31bdd4-5049-41b1-bfe6-fafd3b1e8692}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\image">
-      <UniqueIdentifier>{6dc9fca4-5702-4a00-9723-0382b177177f}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\uimanager">
       <UniqueIdentifier>{9447d2a6-4742-4c6b-b53c-cd25985c034e}</UniqueIdentifier>
     </Filter>
@@ -991,24 +988,6 @@
     <ClCompile Include="..\..\radiant\ui\entitylist\GraphTreeModel.cpp">
       <Filter>src\ui\entitylist</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\image\dds.cpp">
-      <Filter>src\image</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\image\DDSImage.cpp">
-      <Filter>src\image</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\image\ddslib.cpp">
-      <Filter>src\image</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\image\Doom3ImageLoader.cpp">
-      <Filter>src\image</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\image\ImageLoaderWx.cpp">
-      <Filter>src\image</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\image\TGALoader.cpp">
-      <Filter>src\image</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\uimanager\DialogManager.cpp">
       <Filter>src\uimanager</Filter>
     </ClCompile>
@@ -2403,27 +2382,6 @@
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeNode.h">
       <Filter>src\ui\entitylist</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\image\dds.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\image\DDSImage.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\image\ddslib.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\image\Doom3ImageLoader.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\image\ImageLoaderWx.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\image\ImageTypeLoader.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\image\TGALoader.h">
-      <Filter>src\image</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\uimanager\DialogManager.h">
       <Filter>src\uimanager</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -19,6 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\radiantcore\imagefile\dds.cpp" />
+    <ClCompile Include="..\..\radiantcore\imagefile\DDSImage.cpp" />
+    <ClCompile Include="..\..\radiantcore\imagefile\ddslib.cpp" />
+    <ClCompile Include="..\..\radiantcore\imagefile\Doom3ImageLoader.cpp" />
+    <ClCompile Include="..\..\radiantcore\imagefile\ImageLoaderWx.cpp" />
+    <ClCompile Include="..\..\radiantcore\imagefile\TGALoader.cpp" />
     <ClCompile Include="..\..\radiantcore\map\format\MapFormatManager.cpp" />
     <ClCompile Include="..\..\radiantcore\map\namespace\ComplexName.cpp" />
     <ClCompile Include="..\..\radiantcore\map\namespace\Namespace.cpp" />
@@ -50,6 +56,13 @@
     <ClCompile Include="..\..\radiantcore\xmlregistry\XMLRegistry.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\radiantcore\imagefile\dds.h" />
+    <ClInclude Include="..\..\radiantcore\imagefile\DDSImage.h" />
+    <ClInclude Include="..\..\radiantcore\imagefile\ddslib.h" />
+    <ClInclude Include="..\..\radiantcore\imagefile\Doom3ImageLoader.h" />
+    <ClInclude Include="..\..\radiantcore\imagefile\ImageLoaderWx.h" />
+    <ClInclude Include="..\..\radiantcore\imagefile\ImageTypeLoader.h" />
+    <ClInclude Include="..\..\radiantcore\imagefile\TGALoader.h" />
     <ClInclude Include="..\..\radiantcore\map\format\MapFormatManager.h" />
     <ClInclude Include="..\..\radiantcore\map\namespace\ComplexName.h" />
     <ClInclude Include="..\..\radiantcore\map\namespace\Namespace.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -38,6 +38,9 @@
     <Filter Include="src\map\namespace">
       <UniqueIdentifier>{bbd860af-100a-4da4-9d58-0698fff513f2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\imagefile">
+      <UniqueIdentifier>{1de9fe7a-dbc8-403f-bf97-8132e505114c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -127,6 +130,24 @@
     <ClCompile Include="..\..\radiantcore\map\namespace\NamespaceFactory.cpp">
       <Filter>src\map\namespace</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\imagefile\dds.cpp">
+      <Filter>src\imagefile</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\imagefile\DDSImage.cpp">
+      <Filter>src\imagefile</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\imagefile\ddslib.cpp">
+      <Filter>src\imagefile</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\imagefile\Doom3ImageLoader.cpp">
+      <Filter>src\imagefile</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\imagefile\ImageLoaderWx.cpp">
+      <Filter>src\imagefile</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\imagefile\TGALoader.cpp">
+      <Filter>src\imagefile</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -288,5 +309,26 @@
     <ClInclude Include="..\..\radiantcore\map\namespace\UniqueNameSet.h">
       <Filter>src\map\namespace</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\imagefile\dds.h">
+      <Filter>src\imagefile</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\imagefile\DDSImage.h">
+      <Filter>src\imagefile</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\imagefile\ddslib.h">
+      <Filter>src\imagefile</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\imagefile\Doom3ImageLoader.h">
+      <Filter>src\imagefile</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\imagefile\ImageLoaderWx.h">
+      <Filter>src\imagefile</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\imagefile\ImageTypeLoader.h">
+      <Filter>src\imagefile</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\imagefile\TGALoader.h">
+      <Filter>src\imagefile</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>