Merge pull request #128 from Laupetin/feature/json-material-loading

feat: load t6 materials from json
Laupetin · Feb 29, 2024 · 3ebea76 · 3ebea76
2 parents d3c3786 + a0a420f
commit 3ebea76
Show file tree

Hide file tree

Showing 17 changed files with 1,843 additions and 1,103 deletions.
diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h
@@ -2913,9 +2913,7 @@ namespace T6
         GFXS_POLYGON_OFFSET_0 = 0,
         GFXS_POLYGON_OFFSET_1 = 1,
         GFXS_POLYGON_OFFSET_2 = 2,
-        GFXS_POLYGON_OFFSET_SHADOWMAP = 3,
-
-        GFXS_POLYGON_OFFSET_COUNT
+        GFXS_POLYGON_OFFSET_SHADOWMAP = 3
     };
 
     enum GfxStencilOp
@@ -2927,9 +2925,7 @@ namespace T6
         GFXS_STENCILOP_DECRSAT = 0x4,
         GFXS_STENCILOP_INVERT = 0x5,
         GFXS_STENCILOP_INCR = 0x6,
-        GFXS_STENCILOP_DECR = 0x7,
-
-        GFXS_STENCILOP_COUNT,
+        GFXS_STENCILOP_DECR = 0x7
     };
 
     enum GfxStencilFunc
@@ -2941,9 +2937,7 @@ namespace T6
         GFXS_STENCILFUNC_GREATER = 0x4,
         GFXS_STENCILFUNC_NOTEQUAL = 0x5,
         GFXS_STENCILFUNC_GREATEREQUAL = 0x6,
-        GFXS_STENCILFUNC_ALWAYS = 0x7,
-
-        GFXS_STENCILFUNC_COUNT,
+        GFXS_STENCILFUNC_ALWAYS = 0x7
     };
 
     struct GfxStateBitsLoadBitsStructured

diff --git a/src/ObjCommon.lua b/src/ObjCommon.lua
@@ -3,6 +3,7 @@ ObjCommon = {}
 function ObjCommon:include(includes)
 	if includes:handle(self:name()) then
 		Common:include(includes)
+		json:include(includes)
 		minizip:include(includes)
 		includedirs {
 			path.join(ProjectFolder(), "ObjCommon")

diff --git a/src/ObjCommon/Game/T6/Material/JsonMaterial.cpp b/src/ObjCommon/Game/T6/Material/JsonMaterial.cpp