Skip to content

fix(pbr): more mlp refraction fixes #972

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 2 commits into from
Feb 17, 2025
Merged

fix(pbr): more mlp refraction fixes #972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f97c6
fix(pbr): more mlp refraction fixes
ThePagi Feb 17, 2025
c6cce6b
style: 🎨 apply clang-format changes
ThePagi Feb 17, 2025
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
14 changes: 9 additions & 5 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,8 +1172,9 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
bool PBRParallax = false;
[branch] if ((PBRFlags & PBR::Flags::HasFeatureTexture0) != 0)
{
sampledCoatColor = TexRimSoftLightWorldMapOverlaySampler.Sample(SampRimSoftLightWorldMapOverlaySampler, uv);
sampledCoatColor.rgb = Color::Diffuse(sampledCoatColor.rgb);
float4 sampledCoatProperties = TexRimSoftLightWorldMapOverlaySampler.Sample(SampRimSoftLightWorldMapOverlaySampler, uv);
sampledCoatColor.rgb *= Color::Diffuse(sampledCoatProperties.rgb);
sampledCoatColor.a *= sampledCoatProperties.a;
}
[branch] if (SharedData::extendedMaterialSettings.EnableParallax && (PBRFlags & PBR::Flags::HasDisplacement) != 0)
{
Expand Down Expand Up @@ -1929,7 +1930,8 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
# if defined(TRUE_PBR) && !defined(LANDSCAPE) && !defined(LODLANDSCAPE)
[branch] if ((PBRFlags & PBR::Flags::InterlayerParallax) != 0)
{
refractedDirLightDirection = -refract(-DirLightDirection, coatModelNormal, eta);
if (dot(DirLightDirection, coatModelNormal) > 0)
refractedDirLightDirection = -refract(-DirLightDirection, coatModelNormal, eta);
}
# endif

Expand Down Expand Up @@ -2070,7 +2072,8 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
# if !defined(LANDSCAPE) && !defined(LODLANDSCAPE)
[branch] if ((PBRFlags & PBR::Flags::InterlayerParallax) != 0)
{
refractedLightDirection = -refract(-normalizedLightDirection, coatModelNormal, eta);
if (dot(normalizedLightDirection, coatModelNormal) > 0)
refractedLightDirection = -refract(-normalizedLightDirection, coatModelNormal, eta);
}
# endif
PBR::LightProperties lightProperties = PBR::InitLightProperties(lightColor, lightShadow, 1);
Expand Down Expand Up @@ -2174,7 +2177,8 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
# if defined(TRUE_PBR) && !defined(LANDSCAPE) && !defined(LODLANDSCAPE)
[branch] if ((PBRFlags & PBR::Flags::InterlayerParallax) != 0)
{
refractedLightDirection = -refract(-normalizedLightDirection, coatWorldNormal, eta);
if (dot(normalizedLightDirection, coatWorldNormal) > 0)
refractedLightDirection = -refract(-normalizedLightDirection, coatWorldNormal, eta);
}
# endif

Expand Down