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 t6 material property probeMipBits

Browse Source
This commit is contained in:
Jan Laupetin
2025-07-08 19:12:26 +02:00
parent 790729f5e0
commit 75c7949d3f
6 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,7 +510,6 @@ namespace GAME
#if defined(FEATURE_T6) #if defined(FEATURE_T6)
unsigned surfaceFlags; unsigned surfaceFlags;
unsigned contents; unsigned contents;
uint8_t probeMipBits;
std::optional<std::string> thermalMaterial; std::optional<std::string> thermalMaterial;
#endif #endif
#endif #endif
@ -534,7 +533,6 @@ namespace GAME
#if defined(FEATURE_T6) #if defined(FEATURE_T6)
surfaceFlags, surfaceFlags,
contents, contents,
probeMipBits,
thermalMaterial, thermalMaterial,
#endif #endif
#endif #endif

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

@ -436,9 +436,6 @@ 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_T6)
material.probeMipBits = jMaterial.probeMipBits;
#endif
auto* techniqueSet = m_context.LoadDependency<AssetTechniqueSet>(jMaterial.techniqueSet); auto* techniqueSet = m_context.LoadDependency<AssetTechniqueSet>(jMaterial.techniqueSet);
if (!techniqueSet) if (!techniqueSet)

1
src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp
View File

@ -31,5 +31,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); assert(material->info.hashIndex == 0);
assert(material->probeMipBits == 0);
DumpMaterialAsJson(*assetFile, *material, context); DumpMaterialAsJson(*assetFile, *material, context);
} }

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

@ -328,9 +328,6 @@ 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_T6)
jMaterial.probeMipBits = material.probeMipBits;
#endif
if (material.techniqueSet && material.techniqueSet->name) if (material.techniqueSet && material.techniqueSet->name)
jMaterial.techniqueSet = AssetName(material.techniqueSet->name); jMaterial.techniqueSet = AssetName(material.techniqueSet->name);

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

@ -63,7 +63,6 @@ namespace
"CASTS_SHADOW" "CASTS_SHADOW"
], ],
"layeredSurfaceTypes": 536870925, "layeredSurfaceTypes": 536870925,
"probeMipBits": 0,
"sortKey": 4, "sortKey": 4,
"stateBits": [ "stateBits": [
{ {

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

@ -284,7 +284,6 @@ namespace
"CASTS_SHADOW" "CASTS_SHADOW"
], ],
"layeredSurfaceTypes": 536870925, "layeredSurfaceTypes": 536870925,
"probeMipBits": 0,
"sortKey": 4, "sortKey": 4,
"stateBits": [ "stateBits": [
{ {