Skip to content

fix(water effects): fix water caustics X4000 warnings #2279

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 4 commits into from
May 8, 2026
Merged

fix(water effects): fix water caustics X4000 warnings #2279

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66b0aa5
Update WaterCaustics.hlsli
davo0411 May 4, 2026
a84bb2c
Update WaterEffects.ini
davo0411 May 6, 2026
855c7b5
Update WaterCaustics.hlsli
davo0411 May 7, 2026
4f4e84d
Merge branch 'dev' into fix/compiler-warnings-water-caustics
davo0411 May 7, 2026
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: 1 addition & 1 deletion features/Water Effects/Shaders/Features/WaterEffects.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Info]
Version = 1-1-1
Version = 1-1-2

[Nexus]
autoupload = false
11 changes: 5 additions & 6 deletions features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,21 @@ namespace WaterEffects
float2 causticsUV2 = PanCausticsUV(causticsUV, 1.0 * 0.2, -0.5);

float causticsHigh = 1.0;

if (causticsFade > 0.0)
if (causticsFade > 0.0) {
causticsHigh = min(SampleCaustics(causticsUV1), SampleCaustics(causticsUV2)) * 4.0;
}
Comment thread
davo0411 marked this conversation as resolved.
Outdated

causticsUV *= 0.5;

causticsUV1 = PanCausticsUV(causticsUV, 0.5 * 0.1, 1.0);
causticsUV2 = PanCausticsUV(causticsUV, 1.0 * 0.1, -0.5);

float causticsLow = 1.0;

if (causticsFade < 1.0)
if (causticsFade < 1.0) {
causticsLow = min(SampleCaustics(causticsUV1), SampleCaustics(causticsUV2)) * 4.0;
}

float caustics = lerp(causticsLow, causticsHigh, causticsFade);

const float caustics = lerp(causticsLow, causticsHigh, causticsFade);
return lerp(1.0, caustics, shoreFactorCaustics);
}

Expand Down
Loading