Skip to content

chore(skylighting): revise skylighting boost #995

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 7 commits into from
Mar 8, 2025
Merged

chore(skylighting): revise skylighting boost #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cba488a
chore(skylighting): increase skylighting boost
doodlum Mar 8, 2025
fa3b94c
chore: subsurface properties for skylighting
doodlum Mar 8, 2025
eb6d233
style: 🎨 apply clang-format changes
doodlum Mar 8, 2025
3d1c6c1
chore: implement skylighting boost differently
doodlum Mar 8, 2025
3bbc544
Merge branch 'skylighting-brighter' of https://github.com/doodlum/sky…
doodlum Mar 8, 2025
9cfb9e9
fix: grass
doodlum Mar 8, 2025
c377aec
style: 🎨 apply clang-format changes
doodlum Mar 8, 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
2 changes: 2 additions & 0 deletions package/Shaders/AmbientCompositeCS.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ 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 = Skylighting::mixDiffuse(SharedData::skylightingSettings, skylightingDiffuse);
Expand Down
16 changes: 7 additions & 9 deletions package/Shaders/Lighting.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2288,7 +2288,6 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
# endif

float3 directionalAmbientColor = max(0, mul(DirectionalAmbient, modelNormal));
float3 directionalAmbientColorDirect = 0;

# if defined(SKYLIGHTING)
float skylightingDiffuse = 1;
Expand All @@ -2301,15 +2300,12 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace

skylightingDiffuse = lerp(1.0, skylightingDiffuse, skylightingFadeOutFactor);

float skylightingBoost = 0.25 * skylightingDiffuse * saturate(worldSpaceNormal.z) * (1.0 - SharedData::skylightingSettings.MinDiffuseVisibility);

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

directionalAmbientColor = Color::GammaToLinear(directionalAmbientColor);
directionalAmbientColorDirect = directionalAmbientColor * skylightingBoost;
directionalAmbientColorDirect = Color::LinearToGamma(directionalAmbientColorDirect);

directionalAmbientColor *= skylightingDiffuse + skylightingBoost;
directionalAmbientColor *= skylightingDiffuse;
directionalAmbientColor *= 1.0 + saturate(worldSpaceNormal.z) * (1.0 - SharedData::skylightingSettings.MinDiffuseVisibility);
directionalAmbientColor = Color::LinearToGamma(directionalAmbientColor);
}
# endif
Expand All @@ -2322,7 +2318,6 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace

# if !defined(TRUE_PBR)
# if defined(DEFERRED) && defined(SSGI)
diffuseColor += directionalAmbientColorDirect;
# else
diffuseColor += directionalAmbientColor;
# endif
Expand Down Expand Up @@ -2465,12 +2460,17 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace

if (Permutation::ExtraShaderDescriptor & Permutation::ExtraFlags::IsTree) {
// Remove AO
float3 originalVertexColor = vertexColor;
vertexColor = vertexColor / vertexAO;
vertexColor = lerp(input.Color.xyz, vertexColor, skylightingFadeOutFactor);

// Apply AO to direct lighting only
float3 originalDiffuseColor = diffuseColor;
diffuseColor -= lightsDiffuseColor;
diffuseColor += lerp(lightsDiffuseColor, lightsDiffuseColor * vertexAO, skylightingFadeOutFactor);

vertexColor = lerp(vertexColor, originalVertexColor, SharedData::skylightingSettings.MinDiffuseVisibility);
diffuseColor = lerp(diffuseColor, originalDiffuseColor, SharedData::skylightingSettings.MinDiffuseVisibility);
}

// Brighten skylighting on vertex AO
Expand Down Expand Up @@ -2502,7 +2502,6 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
# endif

# if defined(DEFERRED) && defined(SSGI)
color.xyz += indirectDiffuseLobeWeight * directionalAmbientColorDirect;
# else
color.xyz += indirectDiffuseLobeWeight * directionalAmbientColor;
# endif
Expand Down Expand Up @@ -2596,7 +2595,6 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
# if defined(LOD_LAND_BLEND) && defined(TRUE_PBR)
{
# if defined(DEFERRED) && defined(SSGI)
lodLandDiffuseColor += directionalAmbientColorDirect;
# else
lodLandDiffuseColor += directionalAmbientColor;
# endif
Expand Down
25 changes: 7 additions & 18 deletions package/Shaders/RunGrass.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,6 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
normal = normalize(float3(normal.xy, max(0, normal.z)));

float3 directionalAmbientColor = max(0, mul(SharedData::DirectionalAmbient, float4(normal, 1.0)));
float3 directionalAmbientColorDirect = 0;

# if defined(SKYLIGHTING)
if (!SharedData::InInterior) {
Expand All @@ -709,23 +708,18 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace
float skylightingDiffuse = SphericalHarmonics::FuncProductIntegral(skylightingSH, SphericalHarmonics::EvaluateCosineLobe(skylightingNormal)) / Math::PI;
skylightingDiffuse = saturate(skylightingDiffuse);

float skylightingBoost = 0.25 * skylightingDiffuse * saturate(normal.z) * (1.0 - SharedData::skylightingSettings.MinDiffuseVisibility);

skylightingDiffuse = lerp(1.0, skylightingDiffuse, skylightingFadeOutFactor);
skylightingDiffuse = Skylighting::mixDiffuse(SharedData::skylightingSettings, skylightingDiffuse);

directionalAmbientColor = Color::GammaToLinear(directionalAmbientColor);
directionalAmbientColorDirect = directionalAmbientColor * skylightingBoost;
directionalAmbientColorDirect = Color::LinearToGamma(directionalAmbientColorDirect);

directionalAmbientColor *= skylightingDiffuse + skylightingBoost;
directionalAmbientColor *= skylightingDiffuse;
directionalAmbientColor *= 1.0 + saturate(normal.z) * (1.0 - SharedData::skylightingSettings.MinDiffuseVisibility);
directionalAmbientColor = Color::LinearToGamma(directionalAmbientColor);
}
# endif // SKYLIGHTING

# if defined(SSGI)
diffuseColor += directionalAmbientColorDirect;
# else
# if !defined(SSGI)
diffuseColor += directionalAmbientColor;
# endif

Expand Down Expand Up @@ -875,7 +869,6 @@ PS_OUTPUT main(PS_INPUT input)
# endif

float3 directionalAmbientColor = max(0, mul(SharedData::DirectionalAmbient, float4(normal, 1.0)));
float3 directionalAmbientColorDirect = 0;

# if defined(SKYLIGHTING)
if (!SharedData::InInterior) {
Expand All @@ -891,23 +884,19 @@ PS_OUTPUT main(PS_INPUT input)
float skylightingDiffuse = SphericalHarmonics::FuncProductIntegral(skylightingSH, SphericalHarmonics::EvaluateCosineLobe(skylightingNormal)) / Math::PI;
skylightingDiffuse = saturate(skylightingDiffuse);

float skylightingBoost = 0.25 * skylightingDiffuse * saturate(normal.z) * (1.0 - SharedData::skylightingSettings.MinDiffuseVisibility);

skylightingDiffuse = lerp(1.0, skylightingDiffuse, skylightingFadeOutFactor);
skylightingDiffuse = Skylighting::mixDiffuse(SharedData::skylightingSettings, skylightingDiffuse);

directionalAmbientColor = Color::GammaToLinear(directionalAmbientColor);
directionalAmbientColorDirect = directionalAmbientColor * skylightingBoost;
directionalAmbientColorDirect = Color::LinearToGamma(directionalAmbientColorDirect);

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

directionalAmbientColor = Color::LinearToGamma(directionalAmbientColor);
}
# endif // SKYLIGHTING

# if defined(SSGI)
diffuseColor += directionalAmbientColorDirect;
# else
# if !defined(SSGI)
diffuseColor += directionalAmbientColor;
# endif

Expand Down