Skip to content

refactor(skylighting): simplify skylightingSH initialization #2139

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
alandtse merged 1 commit into from
Apr 17, 2026
Merged

refactor(skylighting): simplify skylightingSH initialization #2139

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
8 changes: 2 additions & 6 deletions package/Shaders/RunGrass.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,16 +757,14 @@ PS_OUTPUT main(PS_INPUT input, bool frontFace : SV_IsFrontFace)
float3 directionalAmbientColor = Color::Ambient(max(0, SharedData::GetAmbient(normal)));

# if defined(SKYLIGHTING)
const static sh2 unitSH_grass1 = float4(sqrt(4.0 * Math::PI), 0, 0, 0);
sh2 skylightingSH = unitSH_grass1;
float skylightingDiffuse = 1.0;
if (!SharedData::InInterior) {
# if defined(VR)
float3 positionMSSkylight = input.WorldPosition.xyz + FrameBuffer::CameraPosAdjust[eyeIndex].xyz - FrameBuffer::CameraPosAdjust[0].xyz;
# else
float3 positionMSSkylight = input.WorldPosition.xyz;
# endif
skylightingSH = Skylighting::sample(SharedData::skylightingSettings, Skylighting::SkylightingProbeArray, Skylighting::stbn_vec3_2Dx1D_128x128x64, input.HPosition.xy, positionMSSkylight, normal);
sh2 skylightingSH = Skylighting::sample(SharedData::skylightingSettings, Skylighting::SkylightingProbeArray, Skylighting::stbn_vec3_2Dx1D_128x128x64, input.HPosition.xy, positionMSSkylight, normal);
skylightingDiffuse = SphericalHarmonics::FuncProductIntegral(skylightingSH, SphericalHarmonics::EvaluateCosineLobe(normal)) / Math::PI;
skylightingDiffuse = saturate(skylightingDiffuse);
skylightingDiffuse = lerp(1.0, skylightingDiffuse, skylightingFadeOutFactor);
Expand Down Expand Up @@ -950,16 +948,14 @@ PS_OUTPUT main(PS_INPUT input)
float3 directionalAmbientColor = Color::Ambient(max(0, SharedData::GetAmbient(normal)));

# if defined(SKYLIGHTING)
const static sh2 unitSH_grass2 = float4(sqrt(4.0 * Math::PI), 0, 0, 0);
sh2 skylightingSH = unitSH_grass2;
float skylightingDiffuse = 1.0;
if (!SharedData::InInterior) {
# if defined(VR)
float3 positionMSSkylight = input.WorldPosition.xyz + FrameBuffer::CameraPosAdjust[eyeIndex].xyz - FrameBuffer::CameraPosAdjust[0].xyz;
# else
float3 positionMSSkylight = input.WorldPosition.xyz;
# endif
skylightingSH = Skylighting::sample(SharedData::skylightingSettings, Skylighting::SkylightingProbeArray, Skylighting::stbn_vec3_2Dx1D_128x128x64, input.HPosition.xy, positionMSSkylight, normal);
sh2 skylightingSH = Skylighting::sample(SharedData::skylightingSettings, Skylighting::SkylightingProbeArray, Skylighting::stbn_vec3_2Dx1D_128x128x64, input.HPosition.xy, positionMSSkylight, normal);
skylightingDiffuse = SphericalHarmonics::FuncProductIntegral(skylightingSH, SphericalHarmonics::EvaluateCosineLobe(normal)) / Math::PI;
skylightingDiffuse = saturate(skylightingDiffuse);
skylightingDiffuse = lerp(1.0, skylightingDiffuse, skylightingFadeOutFactor);
Expand Down
Loading