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

chore: add layeredSurfaceTypes to t5 materials

Browse Source
This commit is contained in:
Jan
2025-07-01 22:06:30 +01:00
parent e9b9ad093c
commit 811e796b1a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,6 +507,7 @@ namespace GAME
public: public:
#ifdef FEATURE_T5 #ifdef FEATURE_T5
uint8_t maxStreamedMips; uint8_t maxStreamedMips;
unsigned layeredSurfaceTypes;
#elif defined(FEATURE_T6) #elif defined(FEATURE_T6)
unsigned layeredSurfaceTypes; unsigned layeredSurfaceTypes;
unsigned surfaceFlags; unsigned surfaceFlags;
@ -531,6 +532,7 @@ namespace GAME
JsonMaterial, JsonMaterial,
#ifdef FEATURE_T5 #ifdef FEATURE_T5
maxStreamedMips, maxStreamedMips,
layeredSurfaceTypes,
#elif defined(FEATURE_T6) #elif defined(FEATURE_T6)
layeredSurfaceTypes, layeredSurfaceTypes,
surfaceFlags, surfaceFlags,

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

@ -418,8 +418,10 @@ namespace
} }
material.info.surfaceTypeBits = jMaterial.surfaceTypeBits; material.info.surfaceTypeBits = jMaterial.surfaceTypeBits;
#ifdef FEATURE_T6 #if defined(FEATURE_T5) || defined(FEATURE_T6)
material.info.layeredSurfaceTypes = jMaterial.layeredSurfaceTypes; material.info.layeredSurfaceTypes = jMaterial.layeredSurfaceTypes;
#endif
#if defined(FEATURE_T6)
material.info.surfaceFlags = jMaterial.surfaceFlags; material.info.surfaceFlags = jMaterial.surfaceFlags;
material.info.contents = jMaterial.contents; material.info.contents = jMaterial.contents;
#endif #endif

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

@ -313,8 +313,10 @@ namespace
jMaterial.textureAtlas->columns = material.info.textureAtlasColumnCount; jMaterial.textureAtlas->columns = material.info.textureAtlasColumnCount;
jMaterial.surfaceTypeBits = material.info.surfaceTypeBits; jMaterial.surfaceTypeBits = material.info.surfaceTypeBits;
#ifdef FEATURE_T6 #if defined(FEATURE_T5) || defined(FEATURE_T6)
jMaterial.layeredSurfaceTypes = material.info.layeredSurfaceTypes; jMaterial.layeredSurfaceTypes = material.info.layeredSurfaceTypes;
#endif
#if defined(FEATURE_T6)
jMaterial.surfaceFlags = material.info.surfaceFlags; jMaterial.surfaceFlags = material.info.surfaceFlags;
jMaterial.contents = material.info.contents; jMaterial.contents = material.info.contents;
#endif #endif