Merge pull request #272 from Laupetin/feature/iwi-converter

feat: iwi converter tool

premake5.lua

@@ -112,6 +112,7 @@ group ""
 -- ========================
 include "src/Common.lua"
 include "src/Crypto.lua"
+include "src/ImageConverter.lua"
 include "src/Linker.lua"
 include "src/Parser.lua"
 include "src/RawTemplater.lua"
@@ -125,6 +126,7 @@ include "src/ZoneLoading.lua"
 include "src/ZoneWriting.lua"
 include "src/ZoneCommon.lua"
 include "src/ObjCommon.lua"
+include "src/ObjImage.lua"
 include "src/ObjLoading.lua"
 include "src/ObjWriting.lua"
 include "tools/scripts/raw.lua"
@@ -141,6 +143,7 @@ group "Components"
     ZoneLoading:project()
     ZoneWriting:project()
     ObjCommon:project()
+    ObjImage:project()
     ObjLoading:project()
     ObjWriting:project()
 group ""
@@ -155,6 +158,7 @@ group ""
 group "Tools"
     Linker:project()
     Unlinker:project()
+    ImageConverter:project()
 group ""
 
 group "Raw"

src/Common/Game/IW3/IW3.h

@@ -4,7 +4,6 @@
 
 // #include <d3d9.h>
 #include "Game/IAsset.h"
-#include "Image/Texture.h"
 
 #include "IW3_Assets.h"
 

src/Common/Game/IW3/IW3_Assets.h

@@ -1326,7 +1326,6 @@ namespace IW3
         // void/*IDirect3DTexture9*/* map;
         // void/*IDirect3DVolumeTexture9*/* volmap;
         // void/*IDirect3DCubeTexture9*/* cubemap;
-        Texture* texture;
         GfxImageLoadDef* loadDef;
     };
 

src/Common/Game/IW4/CommonIW4.cpp

@@ -2,6 +2,8 @@
 
 #include "Utils/Pack.h"
 
+#include <cctype>
+
 using namespace IW4;
 
 int Common::StringTable_HashString(const char* str)

src/Common/Game/IW4/IW4.h

@@ -4,7 +4,6 @@
 
 // #include <d3d9.h>
 #include "Game/IAsset.h"
-#include "Image/Texture.h"
 
 #include "IW4_Assets.h"
 

src/Common/Game/IW4/IW4_Assets.h

@@ -1009,7 +1009,6 @@ namespace IW4
         // IDirect3DTexture9* map;
         // IDirect3DVolumeTexture9* volmap;
         // IDirect3DCubeTexture9* cubemap;
-        Texture* texture;
         GfxImageLoadDef* loadDef;
     };
 

src/Common/Game/IW5/CommonIW5.cpp

@@ -2,6 +2,8 @@
 
 #include "Utils/Pack.h"
 
+#include <cctype>
+
 using namespace IW5;
 
 int Common::StringTable_HashString(const char* str)

src/Common/Game/IW5/IW5.h

@@ -4,7 +4,6 @@
 
 // #include <d3d9.h>
 #include "Game/IAsset.h"
-#include "Image/Texture.h"
 
 #include "IW5_Assets.h"
 

src/Common/Game/IW5/IW5_Assets.h

@@ -1143,9 +1143,6 @@ namespace IW5
         // IDirect3DTexture9* map;
         // IDirect3DVolumeTexture9* volmap;
         // IDirect3DCubeTexture9* cubemap;
-#ifndef __ida
-        Texture* texture;
-#endif
         GfxImageLoadDef* loadDef;
     };
 

src/Common/Game/T5/T5.h

@@ -4,7 +4,6 @@
 
 // #include <d3d9.h>
 #include "Game/IAsset.h"
-#include "Image/Texture.h"
 
 #include "T5_Assets.h"
 

src/Common/Game/T5/T5_Assets.h

@@ -1024,7 +1024,6 @@ namespace T5
         // IDirect3DTexture9* map;
         // IDirect3DVolumeTexture9* volmap;
         // IDirect3DCubeTexture9* cubemap;
-        Texture* texture;
         GfxImageLoadDef* loadDef;
     };
 

src/Common/Game/T6/CommonT6.cpp

@@ -2,62 +2,8 @@
 
 #include "Utils/Pack.h"
 
-#include <cctype>
-
 using namespace T6;
 
-int Common::Com_HashKey(const char* str, const int maxLen)
-{
-    if (str == nullptr)
-        return 0;
-
-    int hash = 0;
-    for (int i = 0; i < maxLen; i++)
-    {
-        if (str[i] == '\0')
-            break;
-
-        hash += str[i] * (0x77 + i);
-    }
-
-    return hash ^ ((hash ^ (hash >> 10)) >> 10);
-}
-
-int Common::Com_HashString(const char* str)
-{
-    if (!str)
-        return 0;
-
-    auto result = 0x1505;
-    auto offset = 0;
-    while (str[offset])
-    {
-        const auto c = tolower(str[offset++]);
-        result = c + 33 * result;
-    }
-
-    return result;
-}
-
-int Common::Com_HashString(const char* str, const int len)
-{
-    if (!str)
-        return 0;
-
-    int result = 0x1505;
-    int offset = 0;
-    while (str[offset])
-    {
-        if (len > 0 && offset >= len)
-            break;
-
-        const int c = tolower(str[offset++]);
-        result = c + 33 * result;
-    }
-
-    return result;
-}
-
 PackedTexCoords Common::Vec2PackTexCoords(const float (&in)[2])
 {
     return PackedTexCoords{pack32::Vec2PackTexCoordsUV(in)};

src/Common/Game/T6/CommonT6.h

@@ -2,14 +2,64 @@
 
 #include "T6.h"
 
+#include <cctype>
+
 namespace T6
 {
     class Common
     {
     public:
-        static int Com_HashKey(const char* str, int maxLen);
-        static int Com_HashString(const char* str);
-        static int Com_HashString(const char* str, int len);
+        static constexpr int Com_HashKey(const char* str, const int maxLen)
+        {
+            if (str == nullptr)
+                return 0;
+
+            int hash = 0;
+            for (int i = 0; i < maxLen; i++)
+            {
+                if (str[i] == '\0')
+                    break;
+
+                hash += str[i] * (0x77 + i);
+            }
+
+            return hash ^ ((hash ^ (hash >> 10)) >> 10);
+        }
+
+        static constexpr int Com_HashString(const char* str)
+        {
+            if (!str)
+                return 0;
+
+            auto result = 0x1505;
+            auto offset = 0;
+            while (str[offset])
+            {
+                const auto c = tolower(str[offset++]);
+                result = c + 33 * result;
+            }
+
+            return result;
+        }
+
+        static constexpr int Com_HashString(const char* str, const int len)
+        {
+            if (!str)
+                return 0;
+
+            int result = 0x1505;
+            int offset = 0;
+            while (str[offset])
+            {
+                if (len > 0 && offset >= len)
+                    break;
+
+                const int c = tolower(str[offset++]);
+                result = c + 33 * result;
+            }
+
+            return result;
+        }
 
         static constexpr uint32_t R_HashString(const char* str, uint32_t hash)
         {

src/Common/Game/T6/T6.h

@@ -4,7 +4,6 @@
 
 // #include <d3d11.h>
 #include "Game/IAsset.h"
-#include "Image/Texture.h"
 
 #include "T6_Assets.h"
 

src/Common/Game/T6/T6_Assets.h

@@ -848,7 +848,6 @@ namespace T6
     union GfxTexture
     {
         void /*ID3D11ShaderResourceView*/* basemap;
-        Texture* texture;
         GfxImageLoadDef* loadDef;
     };