From 790729f5e01f7769858df0d66b9026d84512d38c Mon Sep 17 00:00:00 2001
From: Jan Laupetin <jan@laupetin.net>
Date: Tue, 8 Jul 2025 19:08:46 +0200
Subject: [PATCH] chore: remove unused t5 material property maxStreamedMips

---
 src/ObjCommon/Material/JsonMaterial.h.template     | 14 ++++++--------
 .../Material/JsonMaterialLoader.cpp.template       |  4 +---
 .../Game/T5/Material/DumperMaterialT5.cpp          |  1 +
 .../Material/JsonMaterialWriter.cpp.template       |  4 +---
 .../Game/T5/Material/LoaderMaterialT5Test.cpp      |  2 --
 .../Game/T5/Material/DumperMaterialT5Test.cpp      |  2 --
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/ObjCommon/Material/JsonMaterial.h.template b/src/ObjCommon/Material/JsonMaterial.h.template
index 091fec76..f0eecbd0 100644
--- a/src/ObjCommon/Material/JsonMaterial.h.template
+++ b/src/ObjCommon/Material/JsonMaterial.h.template
@@ -505,15 +505,14 @@ namespace GAME
     class JsonMaterial
     {
     public:
-#ifdef FEATURE_T5
-        uint8_t maxStreamedMips;
-        unsigned layeredSurfaceTypes;
-#elif defined(FEATURE_T6)
+#if defined(FEATURE_T5) || defined(FEATURE_T6)
         unsigned layeredSurfaceTypes;
+#if defined(FEATURE_T6)
         unsigned surfaceFlags;
         unsigned contents;
         uint8_t probeMipBits;
         std::optional<std::string> thermalMaterial;
+#endif
 #endif
         std::vector<MaterialGameFlags> gameFlags;
         unsigned sortKey;
@@ -530,15 +529,14 @@ namespace GAME
 
     NLOHMANN_DEFINE_TYPE_EXTENSION(
         JsonMaterial,
-#ifdef FEATURE_T5
-        maxStreamedMips,
-        layeredSurfaceTypes,
-#elif defined(FEATURE_T6)
+#if defined(FEATURE_T5) || defined(FEATURE_T6)
         layeredSurfaceTypes,
+#if defined(FEATURE_T6)
         surfaceFlags,
         contents,
         probeMipBits,
         thermalMaterial,
+#endif
 #endif
         gameFlags,
         sortKey,
diff --git a/src/ObjLoading/Material/JsonMaterialLoader.cpp.template b/src/ObjLoading/Material/JsonMaterialLoader.cpp.template
index 086c7904..d1887d1f 100644
--- a/src/ObjLoading/Material/JsonMaterialLoader.cpp.template
+++ b/src/ObjLoading/Material/JsonMaterialLoader.cpp.template
@@ -436,9 +436,7 @@ namespace
 
             material.stateFlags = static_cast<unsigned char>(jMaterial.stateFlags);
             material.cameraRegion = jMaterial.cameraRegion;
-#if defined(FEATURE_T5)
-            material.maxStreamedMips = jMaterial.maxStreamedMips;
-#elif defined(FEATURE_T6)
+#if defined(FEATURE_T6)
             material.probeMipBits = jMaterial.probeMipBits;
 #endif
 
diff --git a/src/ObjWriting/Game/T5/Material/DumperMaterialT5.cpp b/src/ObjWriting/Game/T5/Material/DumperMaterialT5.cpp
index 2d687c0e..dcc6feb8 100644
--- a/src/ObjWriting/Game/T5/Material/DumperMaterialT5.cpp
+++ b/src/ObjWriting/Game/T5/Material/DumperMaterialT5.cpp
@@ -30,5 +30,6 @@ void AssetDumperMaterial::DumpAsset(AssetDumpingContext& context, XAssetInfo<Mat
 
     const auto* material = asset->Asset();
     assert(material->info.gameFlags < 0x400);
+    assert(material->maxStreamedMips == 0);
     DumpMaterialAsJson(*assetFile, *material, context);
 }
diff --git a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template
index 918402fd..a29a1cf4 100644
--- a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template
+++ b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template
@@ -328,9 +328,7 @@ namespace
 
             jMaterial.stateFlags = material.stateFlags;
             jMaterial.cameraRegion = static_cast<GfxCameraRegionType>(material.cameraRegion);
-#if defined(FEATURE_T5)
-            jMaterial.maxStreamedMips = material.maxStreamedMips;
-#elif defined(FEATURE_T6)
+#if defined(FEATURE_T6)
             jMaterial.probeMipBits = material.probeMipBits;
 #endif
 
diff --git a/test/ObjLoadingTests/Game/T5/Material/LoaderMaterialT5Test.cpp b/test/ObjLoadingTests/Game/T5/Material/LoaderMaterialT5Test.cpp
index 6979a94f..90f8283d 100644
--- a/test/ObjLoadingTests/Game/T5/Material/LoaderMaterialT5Test.cpp
+++ b/test/ObjLoadingTests/Game/T5/Material/LoaderMaterialT5Test.cpp
@@ -71,7 +71,6 @@ namespace
         "CASTS_SHADOW"
     ],
     "layeredSurfaceTypes": 536870914,
-    "maxStreamedMips": 0,
     "sortKey": 4,
     "stateBits": [
         {
@@ -395,7 +394,6 @@ namespace
 
         REQUIRE(material->stateFlags == 121);
         REQUIRE(material->cameraRegion == CAMERA_REGION_LIT);
-        REQUIRE(material->maxStreamedMips == 0);
 
         REQUIRE(material->techniqueSet != nullptr);
         REQUIRE(material->techniqueSet->name != nullptr);
diff --git a/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp b/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp
index b6136ebc..4cc56013 100644
--- a/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp
+++ b/test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp
@@ -55,7 +55,6 @@ namespace
 
         material->cameraRegion = CAMERA_REGION_LIT;
         material->stateFlags = 121;
-        material->maxStreamedMips = 0;
         material->techniqueSet = GivenTechset("mc_l_sm_r0c0n0s0", memory);
 
         material->textureCount = 3;
@@ -328,7 +327,6 @@ namespace
         "CASTS_SHADOW"
     ],
     "layeredSurfaceTypes": 536870914,
-    "maxStreamedMips": 0,
     "sortKey": 4,
     "stateBits": [
         {