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

fix: inconsistencies on t5 technique compilation

Browse Source
This commit is contained in:
Jan Laupetin
2026-03-15 15:31:01 +01:00
parent f4ed3e6c93
commit b93925c306
6 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ObjWriting/Game/T5/Material/MaterialConstantZoneStateT5.cpp
View File

@@ -33,6 +33,7 @@ namespace
"DarkenPower",
"Detail_Amount",
"Detail_Normal_Tile",
"Diffuse_MapSampler",
"Diffuse_Normal_Height_Facing",
"Dimensions",
"DispersionAmount",
@@ -44,6 +45,7 @@ namespace
"EdgeMinDist",
"EdgeSize",
"Edge_Color_Multiplier",
"Edge_Intensity",
"Emissive_Amount",
"EnemiesColor",
"Exposure",
@@ -143,6 +145,7 @@ namespace
"NormalHeightMultiplier",
"Normal_Detail_Height",
"Normal_Detail_Scale",
"Normal_MapSampler",
"Normal_Map_Size_Scale",
"Normal_Variance_Scale",
"NumFrames",
@@ -157,6 +160,7 @@ namespace
"Player_Lookup_Scale",
"PositiveColor",
"Power",
"PreviewCompID",
"PulseColor",
"PulseInterval",
"PulseTime",
@@ -165,6 +169,7 @@ namespace
"Radius",
"ReflectionAmount",
"Reflection_Amount",
"Reflection_Amt",
"Reflection_Blur",
"Reticle_Alt_Color",
"Reticle_Color",
@@ -177,6 +182,7 @@ namespace
"ScanlineSpeed",
"ScatterAmount",
"ScatterSize",
"Scatter_Intensity",
"SceneNoise",
"SparkleBrightness",
"SparkleDensity",
@@ -189,6 +195,7 @@ namespace
"SpecularAmount",
"SpecularColor",
"Specular_Amount",
"Specular_Color",
"Specular_Decay_Threshold",
"Speed",
"StaticAmount",
@@ -202,6 +209,7 @@ namespace
"TearLookupSpeed",
"TearMultiplier",
"TearPower",
"Temporal_Sharpness",
"Thickness",
"TickMarkColorAndHarshness",
"Tint",
@@ -221,6 +229,9 @@ namespace
"WaterScale2",
"WaterSpeed1",
"WaterSpeed2",
"Wetness_Color",
"Wetness_Color_Gloss_Bias",
"Wetness_Specular_Swatch_Scale",
"Zoom",
"alphaDissolveParms",
"alphaRevealParms",
@@ -230,6 +241,11 @@ namespace
"alphaRevealParms4",
"clipSpaceLookupOffset",
"clipSpaceLookupScale",
"cloakTextureControl0",
"cloakTextureControl1",
"clothcharrColorMapScale",
"clothcharrEmberColorAndBrightness",
"clothcharrMaskMapScale",
"cloudsFeather",
"cloudsHeights",
"cloudsUVMad1",
@@ -333,6 +349,7 @@ namespace
"CompassMap",
"Detail_Map",
"Diffuse",
"DiffuseBurnt2",
"Diffuse_Map",
"DpadTexture",
"FontTextutre",
@@ -374,6 +391,7 @@ namespace
"Static",
"StaticMap",
"Static_Noise_Map",
"Stretch_Map",
"SunShadowSamplerState",
"SunShadowState",
"Surface_Normal_Map",

13
src/ObjWriting/Techset/CommonTechniqueDumper.cpp
View File

@@ -231,6 +231,7 @@ namespace
static_cast<unsigned>(arg.m_type.m_value_type));
return;
}
const auto buffer = std::ranges::find_if(shaderInfo.m_constant_buffers,
[&boundResource](const d3d11::ConstantBuffer& constantBuffer)
{
@@ -409,15 +410,15 @@ namespace
Indent();
std::string materialPropertyName;
if (m_constant_zone_state.GetConstantName(arg.m_value.name_hash, materialPropertyName)
|| m_constant_zone_state.GetTextureDefName(arg.m_value.name_hash, materialPropertyName))
{
m_stream << std::format("{} = material.{};\n", codeDestAccessor, materialPropertyName);
}
else if (m_constant_zone_state.HashString(codeDestAccessor) == arg.m_value.name_hash)
if (m_constant_zone_state.HashString(codeDestAccessor) == arg.m_value.name_hash)
{
m_stream << std::format("{} = material.{};\n", codeDestAccessor, codeDestAccessor);
}
else if (m_constant_zone_state.GetConstantName(arg.m_value.name_hash, materialPropertyName)
|| m_constant_zone_state.GetTextureDefName(arg.m_value.name_hash, materialPropertyName))
{
m_stream << std::format("{} = material.{};\n", codeDestAccessor, materialPropertyName);
}
else
{
m_stream << std::format("{} = material.#0x{:x};\n", codeDestAccessor, arg.m_value.name_hash);