zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-09 12:41:49 +00:00
Code Activity

chore: remove unused t5 material property maxStreamedMips

Browse Source
This commit is contained in:
Jan Laupetin
2025-07-08 19:08:46 +02:00
parent 90cc7dacbb
commit 790729f5e0
6 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ObjCommon/Material/JsonMaterial.h.template
View File

@ -505,15 +505,14 @@ namespace GAME
class JsonMaterial class JsonMaterial
{ {
public: public:
#ifdef FEATURE_T5 #if defined(FEATURE_T5) || defined(FEATURE_T6)
uint8_t maxStreamedMips;
unsigned layeredSurfaceTypes;
#elif defined(FEATURE_T6)
unsigned layeredSurfaceTypes; unsigned layeredSurfaceTypes;
#if defined(FEATURE_T6)
unsigned surfaceFlags; unsigned surfaceFlags;
unsigned contents; unsigned contents;
uint8_t probeMipBits; uint8_t probeMipBits;
std::optional<std::string> thermalMaterial; std::optional<std::string> thermalMaterial;
#endif
#endif #endif
std::vector<MaterialGameFlags> gameFlags; std::vector<MaterialGameFlags> gameFlags;
unsigned sortKey; unsigned sortKey;
@ -530,15 +529,14 @@ namespace GAME
NLOHMANN_DEFINE_TYPE_EXTENSION( NLOHMANN_DEFINE_TYPE_EXTENSION(
JsonMaterial, JsonMaterial,
#ifdef FEATURE_T5 #if defined(FEATURE_T5) || defined(FEATURE_T6)
maxStreamedMips,
layeredSurfaceTypes,
#elif defined(FEATURE_T6)
layeredSurfaceTypes, layeredSurfaceTypes,
#if defined(FEATURE_T6)
surfaceFlags, surfaceFlags,
contents, contents,
probeMipBits, probeMipBits,
thermalMaterial, thermalMaterial,
#endif
#endif #endif
gameFlags, gameFlags,
sortKey, sortKey,

4
src/ObjLoading/Material/JsonMaterialLoader.cpp.template
View File

@ -436,9 +436,7 @@ namespace
material.stateFlags = static_cast<unsigned char>(jMaterial.stateFlags); material.stateFlags = static_cast<unsigned char>(jMaterial.stateFlags);
material.cameraRegion = jMaterial.cameraRegion; material.cameraRegion = jMaterial.cameraRegion;
#if defined(FEATURE_T5) #if defined(FEATURE_T6)
material.maxStreamedMips = jMaterial.maxStreamedMips;
#elif defined(FEATURE_T6)
material.probeMipBits = jMaterial.probeMipBits; material.probeMipBits = jMaterial.probeMipBits;
#endif #endif

1
src/ObjWriting/Game/T5/Material/DumperMaterialT5.cpp
View File

@ -30,5 +30,6 @@ void AssetDumperMaterial::DumpAsset(AssetDumpingContext& context, XAssetInfo<Mat
const auto* material = asset->Asset(); const auto* material = asset->Asset();
assert(material->info.gameFlags < 0x400); assert(material->info.gameFlags < 0x400);
assert(material->maxStreamedMips == 0);
DumpMaterialAsJson(*assetFile, *material, context); DumpMaterialAsJson(*assetFile, *material, context);
} }

4
src/ObjWriting/Material/JsonMaterialWriter.cpp.template
View File

@ -328,9 +328,7 @@ namespace
jMaterial.stateFlags = material.stateFlags; jMaterial.stateFlags = material.stateFlags;
jMaterial.cameraRegion = static_cast<GfxCameraRegionType>(material.cameraRegion); jMaterial.cameraRegion = static_cast<GfxCameraRegionType>(material.cameraRegion);
#if defined(FEATURE_T5) #if defined(FEATURE_T6)
jMaterial.maxStreamedMips = material.maxStreamedMips;
#elif defined(FEATURE_T6)
jMaterial.probeMipBits = material.probeMipBits; jMaterial.probeMipBits = material.probeMipBits;
#endif #endif

2
test/ObjLoadingTests/Game/T5/Material/LoaderMaterialT5Test.cpp
View File

@ -71,7 +71,6 @@ namespace
"CASTS_SHADOW" "CASTS_SHADOW"
], ],
"layeredSurfaceTypes": 536870914, "layeredSurfaceTypes": 536870914,
"maxStreamedMips": 0,
"sortKey": 4, "sortKey": 4,
"stateBits": [ "stateBits": [
{ {
@ -395,7 +394,6 @@ namespace
REQUIRE(material->stateFlags == 121); REQUIRE(material->stateFlags == 121);
REQUIRE(material->cameraRegion == CAMERA_REGION_LIT); REQUIRE(material->cameraRegion == CAMERA_REGION_LIT);
REQUIRE(material->maxStreamedMips == 0);
REQUIRE(material->techniqueSet != nullptr); REQUIRE(material->techniqueSet != nullptr);
REQUIRE(material->techniqueSet->name != nullptr); REQUIRE(material->techniqueSet->name != nullptr);

2
test/ObjWritingTests/Game/T5/Material/DumperMaterialT5Test.cpp
View File

@ -55,7 +55,6 @@ namespace
material->cameraRegion = CAMERA_REGION_LIT; material->cameraRegion = CAMERA_REGION_LIT;
material->stateFlags = 121; material->stateFlags = 121;
material->maxStreamedMips = 0;
material->techniqueSet = GivenTechset("mc_l_sm_r0c0n0s0", memory); material->techniqueSet = GivenTechset("mc_l_sm_r0c0n0s0", memory);
material->textureCount = 3; material->textureCount = 3;
@ -328,7 +327,6 @@ namespace
"CASTS_SHADOW" "CASTS_SHADOW"
], ],
"layeredSurfaceTypes": 536870914, "layeredSurfaceTypes": 536870914,
"maxStreamedMips": 0,
"sortKey": 4, "sortKey": 4,
"stateBits": [ "stateBits": [
{ {