Skip to content

fix(unified water): distance calculation for raindrops & LOD fade #1890

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
Feb 16, 2026
Merged

fix(unified water): distance calculation for raindrops & LOD fade #1890

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
4 changes: 2 additions & 2 deletions package/Shaders/Water.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ WaterNormalData GetWaterNormal(PS_INPUT input, float distanceFactor, float norma

float4 raindropInfo = float4(0, 0, 1, 0);
float maxRainDropDistance = SharedData::wetnessEffectsSettings.RaindropFxRange * SharedData::wetnessEffectsSettings.RaindropFxRange * 3;
float rainDropDistance = dot(input.WPosition, input.WPosition);
float rainDropDistance = dot(input.WPosition.xyz, input.WPosition.xyz);
float distanceFadeout = saturate((1 - saturate(rainDropDistance / maxRainDropDistance)) * 3);
if (finalNormal.z > 0 && SharedData::wetnessEffectsSettings.Raining > 0.0f && SharedData::wetnessEffectsSettings.EnableRaindropFx &&
(rainDropDistance < maxRainDropDistance) && wetnessOcclusion > 0.05) {
Expand Down Expand Up @@ -1133,7 +1133,7 @@ PS_OUTPUT main(PS_INPUT input)
# if defined(SIMPLE) || defined(UNDERWATER) || defined(LOD) || defined(SPECULAR)
float3 viewDirection = normalize(input.WPosition.xyz);

float distanceFactor = saturate(lerp(FrameBuffer::FrameParams.w, 1, (input.WPosition.w - 8192) / (WaterParams.x - 8192)));
float distanceFactor = saturate(lerp(FrameBuffer::FrameParams.w, 1, (length(input.WPosition.xyz) - 8192) / (WaterParams.x - 8192)));
float4 distanceMul = saturate(lerp(VarAmounts.z, 1, -(distanceFactor - 1))).xxxx;
float distanceBlendFactor = distanceFactor;
# if defined(UNIFIED_WATER)
Expand Down