Material JSON Update

Updated the Material JSON export/rebuilding with new class and instance flags. The updated code is completely backward compatible with the older Material JSON files, except that there are updated/newer additional flags that can be used now, see below: Class Flags Changes: UNKNOWN_1 -> SAMPLE_LIGHTING UNKNOWN_2 -> HORIZONMAPPING Instance Flags Changes: Added TRANSALL Added SAMPLE_LIGHTING Added EXCLUDE_GLOBAL_SHADOWS Added ALL And of course any Material JSON files exported now will include the updated/newer flags.
glacier-modding · Jan 3, 2024 · 13c835c · 13c835c
1 parent 4d89198
commit 13c835c
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 53 deletions.
diff --git a/src/material.cpp b/src/material.cpp
@@ -1334,27 +1334,30 @@ std::string material::get_property_name(std::string property) {
     return property;
 }
 
-uint32_t material::encode_flags(std::vector<std::string> flags, nlohmann::ordered_json temp_json) {
+uint32_t material::encode_flags(std::map<uint32_t, std::vector<std::string>>& flags, nlohmann::ordered_json temp_json) {
     uint32_t value = 0;
 
-    for (uint32_t i = 0; i < flags.size(); i++) {
-        if (temp_json.contains(flags.at(i))) {
-            if (temp_json[flags.at(i)].get<bool>())
-                value += 1 << i;
+    for (auto& flag : flags) {
+        for (auto& flag_string : flag.second) {
+            if (temp_json.contains(flag_string)) {
+                if (temp_json[flag_string].get<bool>())
+                    value += flag.first;
+                break;
+            }
         }
     }
 
     return value;
 }
 
-nlohmann::ordered_json material::decode_flags(std::vector<std::string> flags, uint32_t value) {
+nlohmann::ordered_json material::decode_flags(std::map<uint32_t, std::vector<std::string>>& flags, uint32_t value) {
     nlohmann::ordered_json temp_json = nlohmann::ordered_json::object();
 
-    for (uint32_t i = 0; i < flags.size(); i++) {
-        if ((value >> i) & 1)
-            temp_json[flags.at(i)] = true;
+    for (auto& flag : flags) {
+        if ((value & flag.first) == flag.first)
+            temp_json[flag.second[0]] = true;
         else
-            temp_json[flags.at(i)] = false;
+            temp_json[flag.second[0]] = false;
     }
 
     return temp_json;

diff --git a/src/material.h b/src/material.h
@@ -61,9 +61,9 @@ class material {
 
     std::string get_property_name(std::string property);
 
-    uint32_t encode_flags(std::vector<std::string> flags, nlohmann::ordered_json temp_json);
+    uint32_t encode_flags(std::map<uint32_t, std::vector<std::string>>& flags, nlohmann::ordered_json temp_json);
 
-    nlohmann::ordered_json decode_flags(std::vector<std::string> flags, uint32_t value);
+    nlohmann::ordered_json decode_flags(std::map<uint32_t, std::vector<std::string>>& flags, uint32_t value);
 
     std::string matt_file_name = "";
     uint32_t matt_rpkg_index = 0;
@@ -86,47 +86,50 @@ class material {
     std::string type = "";
     std::vector<mati_property> mati_properties;
 
-    const std::vector<std::string> ClassFlags = {
-            "REFLECTION2D",
-            "REFRACTION2D",
-            "LIGHTING",
-            "EMISSIVE",
-            "DISCARD",
-            "LM_SKIN",
-            "PRIMCLASS_STANDARD",
-            "PRIMCLASS_LINKED",
-            "PRIMCLASS_WEIGHTED",
-            "DOFOVERRIDE",
-            "USES_DEFAULT_VS",
-            "USES_SPRITE_SA_VS",
-            "USES_SPRITE_AO_VS",
-            "ALPHA",
-            "USES_SIMPLE_SHADER",
-            "DISABLE_INSTANCING",
-            "LM_HAIR",
-            "UNKNOWN_1",
-            "UNKNOWN_2",
-            "UNKNOWN_3",
-            "UNKNOWN_4",
-            "UNKNOWN_5"
-    };
-
-    const std::vector<std::string> InstanceFlags = {
-            "OPAQUE_EMISSIVE",
-            "TRANS_EMISSIVE",
-            "TRANSADD_EMISSIVE",
-            "OPAQUE_LIT",
-            "TRANS_LIT",
-            "DECAL",
-            "REFRACTIVE",
-            "LM_SKIN",
-            "LM_HAIR",
-            "FORCE_EMISSIVE",
-            "DISABLE_SHADER_LOD",
-            "DISCARD",
-            "DECAL_EMISSIVE",
-            "WATER_CLIPPING"
-    };
+    std::map<uint32_t, std::vector<std::string>> ClassFlags = {
+        {0x1, {"REFLECTION2D"}},
+        {0x2, {"REFRACTION2D"}},
+        {0x4, {"LIGHTING"}},
+        {0x8, {"EMISSIVE"}},
+        {0x10, {"DISCARD"}},
+        {0x20, {"LM_SKIN"}},
+        {0x40, {"PRIMCLASS_STANDARD"}},
+        {0x80, {"PRIMCLASS_LINKED"}},
+        {0x100, {"PRIMCLASS_WEIGHTED"}},
+        {0x200, {"DOFOVERRIDE"}},
+        {0x400, {"USES_DEFAULT_VS"}},
+        {0x800, {"USES_SPRITE_SA_VS"}},
+        {0x1000, {"USES_SPRITE_AO_VS"}},
+        {0x2000, {"ALPHA"}},
+        {0x4000, {"USES_SIMPLE_SHADER"}},
+        {0x8000, {"DISABLE_INSTANCING"}},
+        {0x10000, {"LM_HAIR"}},
+        {0x20000, {"SAMPLE_LIGHTING", "UNKNOWN_1"}},
+        {0x40000, {"HORIZONMAPPING", "UNKNOWN_2"}},
+        {0x80000, {"UNKNOWN_3"}},
+        {0x100000, {"UNKNOWN_4"}},
+        {0x200000, {"UNKNOWN_5"}}};
+
+    std::map<uint32_t, std::vector<std::string>> InstanceFlags = {
+        {0x1, {"OPAQUE_EMISSIVE"}},
+        {0x2, {"TRANS_EMISSIVE"}},
+        {0x4, {"TRANSADD_EMISSIVE"}},
+        {0x6, {"TRANSALL"}},
+        {0x8, {"OPAQUE_LIT"}},
+        {0x10, {"TRANS_LIT"}},
+        {0x20, {"DECAL"}},
+        {0x40, {"REFRACTIVE"}},
+        {0x80, {"LM_SKIN"}},
+        {0x100, {"LM_HAIR"}},
+        {0x200, {"FORCE_EMISSIVE"}},
+        {0x400, {"DISABLE_SHADER_LOD"}},
+        {0x800, {"DISCARD"}},
+        {0x1000, {"DECAL_EMISSIVE"}},
+        {0x1020, {"DECAL_ALL"}},
+        {0x2000, {"WATER_CLIPPING"}},
+        {0x4000, {"SAMPLE_LIGHTING"}},
+        {0x8000, {"EXCLUDE_GLOBAL_SHADOWS"}},
+        {0xFFFFFFFF, {"ALL"}}};
 
     const std::unordered_map<std::string, std::string> mati_property_name_map = {
             {"AREF", "Alpha Reference"},