From 0f12fb9d6d221d3bb29303a0cdc4f96e485dae89 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 1 Apr 2018 08:25:38 +0200
Subject: [PATCH] - moved the texture file format handlers to a subdirectory
 for clarity.

---
 src/CMakeLists.txt                            | 41 ++++++++++---------
 src/textures/{ => formats}/automaptexture.cpp |  0
 .../{ => formats}/backdroptexture.cpp         |  0
 .../{ => formats}/brightmaptexture.cpp        |  0
 src/textures/{ => formats}/buildtexture.cpp   |  0
 src/textures/{ => formats}/canvastexture.cpp  |  0
 src/textures/{ => formats}/ddstexture.cpp     |  0
 src/textures/{ => formats}/emptytexture.cpp   |  0
 src/textures/{ => formats}/flattexture.cpp    |  0
 src/textures/{ => formats}/imgztexture.cpp    |  0
 src/textures/{ => formats}/jpegtexture.cpp    |  0
 src/textures/{ => formats}/md5check.cpp       |  0
 .../{ => formats}/multipatchtexture.cpp       |  0
 src/textures/{ => formats}/patchtexture.cpp   |  0
 src/textures/{ => formats}/pcxtexture.cpp     |  0
 src/textures/{ => formats}/pngtexture.cpp     |  0
 src/textures/{ => formats}/rawpagetexture.cpp |  0
 src/textures/{ => formats}/shadertexture.cpp  |  0
 src/textures/{ => formats}/tgatexture.cpp     |  0
 src/textures/{ => formats}/warptexture.cpp    |  0
 src/textures/{ => formats}/worldtexture.cpp   |  0
 21 files changed, 21 insertions(+), 20 deletions(-)
 rename src/textures/{ => formats}/automaptexture.cpp (100%)
 rename src/textures/{ => formats}/backdroptexture.cpp (100%)
 rename src/textures/{ => formats}/brightmaptexture.cpp (100%)
 rename src/textures/{ => formats}/buildtexture.cpp (100%)
 rename src/textures/{ => formats}/canvastexture.cpp (100%)
 rename src/textures/{ => formats}/ddstexture.cpp (100%)
 rename src/textures/{ => formats}/emptytexture.cpp (100%)
 rename src/textures/{ => formats}/flattexture.cpp (100%)
 rename src/textures/{ => formats}/imgztexture.cpp (100%)
 rename src/textures/{ => formats}/jpegtexture.cpp (100%)
 rename src/textures/{ => formats}/md5check.cpp (100%)
 rename src/textures/{ => formats}/multipatchtexture.cpp (100%)
 rename src/textures/{ => formats}/patchtexture.cpp (100%)
 rename src/textures/{ => formats}/pcxtexture.cpp (100%)
 rename src/textures/{ => formats}/pngtexture.cpp (100%)
 rename src/textures/{ => formats}/rawpagetexture.cpp (100%)
 rename src/textures/{ => formats}/shadertexture.cpp (100%)
 rename src/textures/{ => formats}/tgatexture.cpp (100%)
 rename src/textures/{ => formats}/warptexture.cpp (100%)
 rename src/textures/{ => formats}/worldtexture.cpp (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35e529a08..409e50f27 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1110,30 +1110,30 @@ set (PCH_SOURCES
 	resourcefiles/resourcefile.cpp
 	textures/animations.cpp
 	textures/anim_switches.cpp
-	textures/automaptexture.cpp
 	textures/bitmap.cpp
-	textures/brightmaptexture.cpp
-	textures/buildtexture.cpp
-	textures/canvastexture.cpp
-	textures/ddstexture.cpp
-	textures/flattexture.cpp
-	textures/imgztexture.cpp
-	textures/jpegtexture.cpp
-	textures/md5check.cpp
-	textures/multipatchtexture.cpp
-	textures/patchtexture.cpp
-	textures/pcxtexture.cpp
-	textures/pngtexture.cpp
-	textures/rawpagetexture.cpp
-	textures/emptytexture.cpp
-	textures/backdroptexture.cpp
-	textures/shadertexture.cpp
 	textures/texture.cpp
 	textures/texturemanager.cpp
-	textures/tgatexture.cpp
-	textures/warptexture.cpp
 	textures/skyboxtexture.cpp
-	textures/worldtexture.cpp
+	textures/formats/automaptexture.cpp
+	textures/formats/brightmaptexture.cpp
+	textures/formats/buildtexture.cpp
+	textures/formats/canvastexture.cpp
+	textures/formats/ddstexture.cpp
+	textures/formats/flattexture.cpp
+	textures/formats/imgztexture.cpp
+	textures/formats/jpegtexture.cpp
+	textures/formats/md5check.cpp
+	textures/formats/multipatchtexture.cpp
+	textures/formats/patchtexture.cpp
+	textures/formats/pcxtexture.cpp
+	textures/formats/pngtexture.cpp
+	textures/formats/rawpagetexture.cpp
+	textures/formats/emptytexture.cpp
+	textures/formats/backdroptexture.cpp
+	textures/formats/shadertexture.cpp
+	textures/formats/tgatexture.cpp
+	textures/formats/worldtexture.cpp
+	textures/formats/warptexture.cpp
 	xlat/parse_xlat.cpp
 	fragglescript/t_func.cpp
 	fragglescript/t_load.cpp
@@ -1438,6 +1438,7 @@ source_group("Poly Renderer\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_D
 source_group("Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/drawers/.+")
 source_group("Poly Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/polyrenderer/scene/.+")
 source_group("Render Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+")
+source_group("Render Data\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/formats/.+")
 source_group("Render Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/.+")
 source_group("Render Data\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/models/.+")
 source_group("Render Interface" FILES r_defs.h r_renderer.h r_sky.cpp r_sky.h r_state.h r_utility.cpp r_utility.h)
diff --git a/src/textures/automaptexture.cpp b/src/textures/formats/automaptexture.cpp
similarity index 100%
rename from src/textures/automaptexture.cpp
rename to src/textures/formats/automaptexture.cpp
diff --git a/src/textures/backdroptexture.cpp b/src/textures/formats/backdroptexture.cpp
similarity index 100%
rename from src/textures/backdroptexture.cpp
rename to src/textures/formats/backdroptexture.cpp
diff --git a/src/textures/brightmaptexture.cpp b/src/textures/formats/brightmaptexture.cpp
similarity index 100%
rename from src/textures/brightmaptexture.cpp
rename to src/textures/formats/brightmaptexture.cpp
diff --git a/src/textures/buildtexture.cpp b/src/textures/formats/buildtexture.cpp
similarity index 100%
rename from src/textures/buildtexture.cpp
rename to src/textures/formats/buildtexture.cpp
diff --git a/src/textures/canvastexture.cpp b/src/textures/formats/canvastexture.cpp
similarity index 100%
rename from src/textures/canvastexture.cpp
rename to src/textures/formats/canvastexture.cpp
diff --git a/src/textures/ddstexture.cpp b/src/textures/formats/ddstexture.cpp
similarity index 100%
rename from src/textures/ddstexture.cpp
rename to src/textures/formats/ddstexture.cpp
diff --git a/src/textures/emptytexture.cpp b/src/textures/formats/emptytexture.cpp
similarity index 100%
rename from src/textures/emptytexture.cpp
rename to src/textures/formats/emptytexture.cpp
diff --git a/src/textures/flattexture.cpp b/src/textures/formats/flattexture.cpp
similarity index 100%
rename from src/textures/flattexture.cpp
rename to src/textures/formats/flattexture.cpp
diff --git a/src/textures/imgztexture.cpp b/src/textures/formats/imgztexture.cpp
similarity index 100%
rename from src/textures/imgztexture.cpp
rename to src/textures/formats/imgztexture.cpp
diff --git a/src/textures/jpegtexture.cpp b/src/textures/formats/jpegtexture.cpp
similarity index 100%
rename from src/textures/jpegtexture.cpp
rename to src/textures/formats/jpegtexture.cpp
diff --git a/src/textures/md5check.cpp b/src/textures/formats/md5check.cpp
similarity index 100%
rename from src/textures/md5check.cpp
rename to src/textures/formats/md5check.cpp
diff --git a/src/textures/multipatchtexture.cpp b/src/textures/formats/multipatchtexture.cpp
similarity index 100%
rename from src/textures/multipatchtexture.cpp
rename to src/textures/formats/multipatchtexture.cpp
diff --git a/src/textures/patchtexture.cpp b/src/textures/formats/patchtexture.cpp
similarity index 100%
rename from src/textures/patchtexture.cpp
rename to src/textures/formats/patchtexture.cpp
diff --git a/src/textures/pcxtexture.cpp b/src/textures/formats/pcxtexture.cpp
similarity index 100%
rename from src/textures/pcxtexture.cpp
rename to src/textures/formats/pcxtexture.cpp
diff --git a/src/textures/pngtexture.cpp b/src/textures/formats/pngtexture.cpp
similarity index 100%
rename from src/textures/pngtexture.cpp
rename to src/textures/formats/pngtexture.cpp
diff --git a/src/textures/rawpagetexture.cpp b/src/textures/formats/rawpagetexture.cpp
similarity index 100%
rename from src/textures/rawpagetexture.cpp
rename to src/textures/formats/rawpagetexture.cpp
diff --git a/src/textures/shadertexture.cpp b/src/textures/formats/shadertexture.cpp
similarity index 100%
rename from src/textures/shadertexture.cpp
rename to src/textures/formats/shadertexture.cpp
diff --git a/src/textures/tgatexture.cpp b/src/textures/formats/tgatexture.cpp
similarity index 100%
rename from src/textures/tgatexture.cpp
rename to src/textures/formats/tgatexture.cpp
diff --git a/src/textures/warptexture.cpp b/src/textures/formats/warptexture.cpp
similarity index 100%
rename from src/textures/warptexture.cpp
rename to src/textures/formats/warptexture.cpp
diff --git a/src/textures/worldtexture.cpp b/src/textures/formats/worldtexture.cpp
similarity index 100%
rename from src/textures/worldtexture.cpp
rename to src/textures/formats/worldtexture.cpp