zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-04 02:01:51 +00:00
Code Activity

chore: remove hashIndex from t6 json material as it is always 0

Browse Source
This commit is contained in:
Jan
2025-07-01 21:31:46 +01:00
parent c57ea0d2f2
commit e9b9ad093c
6 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,6 @@ namespace GAME
uint8_t maxStreamedMips; uint8_t maxStreamedMips;
#elif defined(FEATURE_T6) #elif defined(FEATURE_T6)
unsigned layeredSurfaceTypes; unsigned layeredSurfaceTypes;
unsigned hashIndex;
unsigned surfaceFlags; unsigned surfaceFlags;
unsigned contents; unsigned contents;
uint8_t probeMipBits; uint8_t probeMipBits;
@ -534,7 +533,6 @@ namespace GAME
maxStreamedMips, maxStreamedMips,
#elif defined(FEATURE_T6) #elif defined(FEATURE_T6)
layeredSurfaceTypes, layeredSurfaceTypes,
hashIndex,
surfaceFlags, surfaceFlags,
contents, contents,
probeMipBits, probeMipBits,

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

@ -420,7 +420,6 @@ namespace
material.info.surfaceTypeBits = jMaterial.surfaceTypeBits; material.info.surfaceTypeBits = jMaterial.surfaceTypeBits;
#ifdef FEATURE_T6 #ifdef FEATURE_T6
material.info.layeredSurfaceTypes = jMaterial.layeredSurfaceTypes; material.info.layeredSurfaceTypes = jMaterial.layeredSurfaceTypes;
material.info.hashIndex = static_cast<uint16_t>(jMaterial.hashIndex);
material.info.surfaceFlags = jMaterial.surfaceFlags; material.info.surfaceFlags = jMaterial.surfaceFlags;
material.info.contents = jMaterial.contents; material.info.contents = jMaterial.contents;
#endif #endif

1
src/ObjWriting/Game/T6/Material/DumperMaterialT6.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 < 0x8000); assert(material->info.gameFlags < 0x8000);
assert(material->info.hashIndex == 0);
DumpMaterialAsJson(*assetFile, *material, context); DumpMaterialAsJson(*assetFile, *material, context);
} }

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

@ -315,7 +315,6 @@ namespace
jMaterial.surfaceTypeBits = material.info.surfaceTypeBits; jMaterial.surfaceTypeBits = material.info.surfaceTypeBits;
#ifdef FEATURE_T6 #ifdef FEATURE_T6
jMaterial.layeredSurfaceTypes = material.info.layeredSurfaceTypes; jMaterial.layeredSurfaceTypes = material.info.layeredSurfaceTypes;
jMaterial.hashIndex = material.info.hashIndex;
jMaterial.surfaceFlags = material.info.surfaceFlags; jMaterial.surfaceFlags = material.info.surfaceFlags;
jMaterial.contents = material.info.contents; jMaterial.contents = material.info.contents;
#endif #endif

1
test/ObjLoadingTests/Game/T6/Material/LoaderMaterialT6Test.cpp
View File

@ -62,7 +62,6 @@ namespace
"10", "10",
"CASTS_SHADOW" "CASTS_SHADOW"
], ],
"hashIndex": 0,
"layeredSurfaceTypes": 536870925, "layeredSurfaceTypes": 536870925,
"probeMipBits": 0, "probeMipBits": 0,
"sortKey": 4, "sortKey": 4,

1
test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp
View File

@ -282,7 +282,6 @@ namespace
"10", "10",
"CASTS_SHADOW" "CASTS_SHADOW"
], ],
"hashIndex": 0,
"layeredSurfaceTypes": 536870925, "layeredSurfaceTypes": 536870925,
"probeMipBits": 0, "probeMipBits": 0,
"sortKey": 4, "sortKey": 4,