Skip to content

chore(skylighting): minor tweaks #1478

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
Sep 16, 2025
Merged

chore(skylighting): minor tweaks #1478

Show file tree
Hide file tree
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
20 changes: 0 additions & 20 deletions package/Shaders/Water.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,26 +918,6 @@ DiffuseOutput GetWaterDiffuseColor(PS_INPUT input, float3 normal, float3 viewDir
float3 refractionColor = RefractionTex.Sample(RefractionSampler, refractionUV).xyz;
float3 refractionDiffuseColor = lerp(ShallowColor.xyz, DeepColor.xyz, distanceMul.y);

if (!(Permutation::PixelShaderDescriptor & Permutation::WaterFlags::Interior)) {
# if defined(SKYLIGHTING)
float3 skylightingPosition = lerp(input.WPosition.xyz, refractionWorldPosition.xyz, noise);

# if defined(VR)
float3 positionMSSkylight = skylightingPosition + FrameBuffer::CameraPosAdjust[eyeIndex].xyz - FrameBuffer::CameraPosAdjust[0].xyz;
# else
float3 positionMSSkylight = skylightingPosition;
# endif

sh2 skylightingSH = Skylighting::sampleNoBias(SharedData::skylightingSettings, Skylighting::SkylightingProbeArray, positionMSSkylight);
float skylightingDiffuse = SphericalHarmonics::FuncProductIntegral(skylightingSH, SphericalHarmonics::EvaluateCosineLobe(float3(0, 0, 1))) / Math::PI;
skylightingDiffuse = saturate(skylightingDiffuse);
skylightingDiffuse = lerp(1.0, skylightingDiffuse, Skylighting::getFadeOutFactor(input.WPosition.xyz));

float3 refractionDiffuseColorSkylight = Skylighting::mixDiffuse(SharedData::skylightingSettings, skylightingDiffuse);
refractionDiffuseColor = Color::LinearToGamma(Color::GammaToLinear(refractionDiffuseColor) * refractionDiffuseColorSkylight);
# endif
}

# if defined(UNDERWATER)
float refractionMul = 0;
# else
Expand Down
4 changes: 2 additions & 2 deletions src/Features/Skylighting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ struct Skylighting : Feature
struct Settings
{
float MaxZenith = 3.1415926f / 2.f; // 90 deg
float MinDiffuseVisibility = 0.25f;
float MinSpecularVisibility = 0.25f;
float MinDiffuseVisibility = 0.1f;
float MinSpecularVisibility = 0.1f;
} settings;

struct SkylightingCB
Expand Down