Skip to content

fix(skylighting): fix visual inconsistencies #1005

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
Mar 10, 2025
Merged

fix(skylighting): fix visual inconsistencies #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8999a37
fix(skylighting): fix visual inconsistencies
doodlum Mar 10, 2025
1708495
style: 🎨 apply clang-format changes
doodlum Mar 10, 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
4 changes: 2 additions & 2 deletions package/Shaders/AmbientCompositeCS.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ void SampleSSGI(uint2 pixCoord, float3 normalWS, out float ao, out float3 il)
float skylightingDiffuse = SphericalHarmonics::FuncProductIntegral(skylightingSH, SphericalHarmonics::EvaluateCosineLobe(skylightingNormal)) / Math::PI;
skylightingDiffuse = saturate(skylightingDiffuse);

skylightingDiffuse *= 1.0 + saturate(normalWS.z) * (1.0 - SharedData::skylightingSettings.MinDiffuseVisibility);

skylightingDiffuse = lerp(1.0, skylightingDiffuse, Skylighting::getFadeOutFactor(positionMS.xyz));

skylightingDiffuse *= 1.0 + saturate(normalWS.z) * (1.0 - SharedData::skylightingSettings.MinDiffuseVisibility);

skylightingDiffuse = Skylighting::mixDiffuse(SharedData::skylightingSettings, skylightingDiffuse);

visibility = skylightingDiffuse;
Expand Down
2 changes: 1 addition & 1 deletion package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2461,7 +2461,7 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
if (Permutation::ExtraShaderDescriptor & Permutation::ExtraFlags::IsTree) {
// Remove AO
float3 originalVertexColor = vertexColor;
vertexColor = vertexColor / vertexAO;
vertexColor = lerp(vertexColor, vertexColor / vertexAO, sqrt(vertexAO));
vertexColor = lerp(input.Color.xyz, vertexColor, skylightingFadeOutFactor);

// Apply AO to direct lighting only
Expand Down