refactor(IW3): rework image loader to remove dependency on d3d9ltcg.lib and xgraphics.lib

codxe.vcxproj

@@ -79,6 +79,11 @@
       </ClCompile>
 
       <ClCompile Include="src\common\config.cpp" />
+      <ClCompile Include="src\image\dds_loader.cpp" />
+      <ClCompile Include="src\image\dds_writer.cpp" />
+      <ClCompile Include="src\image\texture_layout.cpp" />
+      <ClCompile Include="src\image\xenos_texture.cpp" />
+      <ClCompile Include="src\utils\endian.cpp" />
 
       <ClCompile Include="src\game\iw2\sp\components\scr_parser.cpp" />
       <ClCompile Include="src\game\iw2\sp\main.cpp" />
@@ -134,6 +139,7 @@
       <ClCompile Include="src\game\iw4\mp_tu6\components\events.cpp" />
       <ClCompile Include="src\game\iw4\mp_tu6\components\g_client_fields.cpp" />
       <ClCompile Include="src\game\iw4\mp_tu6\components\g_scr_main.cpp" />
+      <ClCompile Include="src\game\iw4\mp_tu6\components\image_loader.cpp" />
       <ClCompile Include="src\game\iw4\mp_tu6\components\mpsp.cpp" />
       <ClCompile Include="src\game\iw4\mp_tu6\components\mr.cpp" />
       <ClCompile Include="src\game\iw4\mp_tu6\components\patches.cpp" />
@@ -203,6 +209,12 @@
 
       <ClInclude Include="src\common\branding.h" />
       <ClInclude Include="src\common\config.h" />
+      <ClInclude Include="src\image\dds_loader.h" />
+      <ClInclude Include="src\image\dds_types.h" />
+      <ClInclude Include="src\image\dds_writer.h" />
+      <ClInclude Include="src\image\texture_layout.h" />
+      <ClInclude Include="src\image\xenos_texture.h" />
+      <ClInclude Include="src\utils\endian.h" />
 
       <ClInclude Include="src\game\iw2\sp\components\scr_parser.h" />
       <ClInclude Include="src\game\iw2\sp\main.h" />
@@ -262,6 +274,7 @@
       <ClInclude Include="src\game\iw4\mp_tu6\components\events.h" />
       <ClInclude Include="src\game\iw4\mp_tu6\components\g_client_fields.h" />
       <ClInclude Include="src\game\iw4\mp_tu6\components\g_scr_main.h" />
+      <ClInclude Include="src\game\iw4\mp_tu6\components\image_loader.h" />
       <ClInclude Include="src\game\iw4\mp_tu6\components\mpsp.h" />
       <ClInclude Include="src\game\iw4\mp_tu6\components\mr.h" />
       <ClInclude Include="src\game\iw4\mp_tu6\components\patches.h" />

src/common/config.cpp

@@ -11,12 +11,12 @@
 
 const char *CONFIG_PATH = "game:\\_codxe\\codxe.json";
 const char *MOD_DIR = "game:\\_codxe\\mods";
+const char *USERRAW_DIR = "game:\\_codxe\\userraw";
 const char *DUMP_DIR = "game:\\_codxe\\dump";
 
 // Default values
 std::string Config::active_mod = "";
-bool Config::dump_rawfile = false;
-bool Config::dump_map_ents = false;
+bool Config::dump_assets = false;
 std::string Config::mod_base_path = "";
 
 namespace
@@ -203,8 +203,7 @@ Config::~Config()
     // Reset to defaults on cleanup
     active_mod = "";
     mod_base_path = "";
-    dump_rawfile = false;
-    dump_map_ents = false;
+    dump_assets = false;
     DbgPrint("[codxe][Config] Configuration unloaded\n");
 }
 
@@ -243,13 +242,9 @@ bool Config::LoadFromJson(const char *jsonBuffer, DWORD bufferSize)
                 wcstombs(narrowValue, valueBuffer, sizeof(narrowValue));
                 active_mod = narrowValue;
             }
-            else if (wcscmp(propertyName, L"dump_rawfile") == 0)
+            else if (wcscmp(propertyName, L"dump_assets") == 0)
             {
-                dump_rawfile = (jsonTokenType == Json_True);
-            }
-            else if (wcscmp(propertyName, L"dump_map_ents") == 0)
-            {
-                dump_map_ents = (jsonTokenType == Json_True);
+                dump_assets = (jsonTokenType == Json_True);
             }
             else
             {
@@ -262,8 +257,7 @@ bool Config::LoadFromJson(const char *jsonBuffer, DWORD bufferSize)
 
     DbgPrint("[codxe][Config] Configuration loaded:\n");
     DbgPrint("  Active Mod: %s\n", active_mod.c_str());
-    DbgPrint("  Dump Raw Scripts: %s\n", dump_rawfile ? "true" : "false");
-    DbgPrint("  Dump Map Entities: %s\n", dump_map_ents ? "true" : "false");
+    DbgPrint("  Dump Assets: %s\n", dump_assets ? "true" : "false");
 
     if (!active_mod.empty())
     {

src/common/config.h

@@ -4,6 +4,7 @@
 
 extern const char *CONFIG_PATH;
 extern const char *MOD_DIR;
+extern const char *USERRAW_DIR;
 extern const char *DUMP_DIR;
 
 bool DirectoryExists(const char *path);
@@ -23,8 +24,7 @@ class Config : public Module
 
     static std::string active_mod;
     static std::string mod_base_path;
-    static bool dump_rawfile;
-    static bool dump_map_ents;
+    static bool dump_assets;
 
     static std::string GetModBasePath();
     static const char *GetModBasePathCStr();

src/game/iw2/mp/components/scr_parser.cpp

@@ -15,7 +15,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
                                                                                        archive);
     };
 
-    if (Config::dump_rawfile)
+    if (Config::dump_assets)
     {
         DbgPrint("GSCLoader: Dumping script %s\n", extFilename);
         auto contents = callOriginal();

src/game/iw2/sp/components/scr_parser.cpp

@@ -15,7 +15,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
                                                                                        archive);
     };
 
-    if (Config::dump_rawfile)
+    if (Config::dump_assets)
     {
         DbgPrint("GSCLoader: Dumping script %s\n", extFilename);
         auto contents = callOriginal();