zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-03-05 12:33:02 +00:00
Code Activity

fix: not setting correct flags on technique post processing when reusing assets

Browse Source
This commit is contained in:
Jan Laupetin
2026-03-01 18:36:27 +01:00
parent 12199b5395
commit 925e51cb10
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ObjCompiling/Game/T6/Techset/TechniqueCompilerT6.cpp
View File

@@ -207,14 +207,19 @@ namespace
return technique; return technique;
} }
void ApplyTechFlagsFromMaterial(const Material& material) void ApplyTechFlagsFromMaterial(const Material& material, const Zone& zone)
{ {
if (!material.techniqueSet || material.stateBitsTable) if (!material.techniqueSet || !material.techniqueSet->name || !material.stateBitsTable)
return;
// Find the techniqueset asset from our zone since the material may link to a different one
const auto techniqueSetAsset = zone.m_pools.GetAsset<AssetTechniqueSet>(material.techniqueSet->name);
if (!techniqueSetAsset)
return; return;
for (auto techType = 0u; techType < TECHNIQUE_COUNT; techType++) for (auto techType = 0u; techType < TECHNIQUE_COUNT; techType++)
{ {
auto* technique = material.techniqueSet->techniques[techType]; auto* technique = techniqueSetAsset->Asset()->techniques[techType];
const auto stateBitsEntry = material.stateBitsEntry[techType]; const auto stateBitsEntry = material.stateBitsEntry[techType];
if (!technique || stateBitsEntry < 0 || static_cast<decltype(Material::stateBitsCount)>(stateBitsEntry) >= material.stateBitsCount) if (!technique || stateBitsEntry < 0 || static_cast<decltype(Material::stateBitsCount)>(stateBitsEntry) >= material.stateBitsCount)
@@ -307,7 +312,7 @@ namespace
const auto materials = m_zone.m_pools.PoolAssets<AssetMaterial>(); const auto materials = m_zone.m_pools.PoolAssets<AssetMaterial>();
for (auto* materialAsset : materials) for (auto* materialAsset : materials)
{ {
ApplyTechFlagsFromMaterial(*materialAsset->Asset()); ApplyTechFlagsFromMaterial(*materialAsset->Asset(), m_zone);
} }
} }