Skip to content

fix(pbr): lod land blend matching #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlum merged 1 commit into from
Mar 2, 2025
Merged

fix(pbr): lod land blend matching #983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,7 +1543,6 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
float lodBlendMask = TexLandLodBlend2Sampler.Sample(SampLandLodBlend2Sampler, 3.0.xx * input.TexCoord0.zw).x;
float lodLandFadeFactor = GetLodLandBlendMultiplier(lodBlendParameter, lodBlendMask);
float lodLandBlendFactor = LODTexParams.z * input.LandBlendWeights2.w;

normal.xyz = lerp(normal.xyz, float3(0, 0, 1), lodLandBlendFactor);

# if !defined(TRUE_PBR)
Expand Down Expand Up @@ -1776,7 +1775,6 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
float3 specularColorPBR = 0;
float3 transmissionColor = 0;

float pbrWeight = 1;
float pbrGlossiness = 1 - pbrSurfaceProperties.Roughness;
# endif // TRUE_PBR

Expand Down Expand Up @@ -2604,22 +2602,23 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace

# if defined(LOD_LAND_BLEND) && defined(TRUE_PBR)
{
pbrWeight = 1 - lodLandBlendFactor;

float3 litLodLandColor = vertexColor * lodLandColor.xyz * lodLandFadeFactor * lodLandDiffuseColor;
color.xyz = lerp(color.xyz, litLodLandColor, lodLandBlendFactor);
# if defined(DEFERRED) && defined(SSGI)
lodLandDiffuseColor += directionalAmbientColorDirect;
# else
lodLandDiffuseColor += directionalAmbientColor;
# endif
float3 litLodLandColor = vertexColor * lodLandColor * lodLandFadeFactor * lodLandDiffuseColor;
color.xyz = lerp(color.xyz * Color::PBRLightingScale, litLodLandColor, lodLandBlendFactor);

specularColorPBR = lerp(specularColorPBR, 0, lodLandBlendFactor);
indirectDiffuseLobeWeight = lerp(indirectDiffuseLobeWeight, input.Color.xyz * lodLandColor * lodLandFadeFactor, lodLandBlendFactor);
specularColor = lerp(specularColorPBR * Color::PBRLightingScale, 0, lodLandBlendFactor);
indirectDiffuseLobeWeight = lerp(indirectDiffuseLobeWeight, vertexColor * lodLandColor * lodLandFadeFactor, lodLandBlendFactor);
indirectSpecularLobeWeight = lerp(indirectSpecularLobeWeight, 0, lodLandBlendFactor);
pbrGlossiness = lerp(pbrGlossiness, 0, lodLandBlendFactor);
}
# endif // defined(LOD_LAND_BLEND) && defined(TRUE_PBR)

# if defined(TRUE_PBR)
# elif defined(TRUE_PBR)
color.xyz *= Color::PBRLightingScale;
specularColorPBR *= Color::PBRLightingScale;
specularColor += specularColorPBR;
specularColor = specularColorPBR;
# endif

# if !defined(DEFERRED)
Expand Down