From 66b0aa52818ed5c7a912ee0c71e7e4f315e8dc5d Mon Sep 17 00:00:00 2001 From: David Kehoe Date: Mon, 4 May 2026 17:58:04 +1000 Subject: [PATCH 1/3] Update WaterCaustics.hlsli --- .../Shaders/WaterEffects/WaterCaustics.hlsli | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli b/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli index 525f2a3686..ae7e39063e 100644 --- a/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli +++ b/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli @@ -27,9 +27,9 @@ 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; + } causticsUV *= 0.5; @@ -37,12 +37,11 @@ namespace WaterEffects 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); } From a84bb2cef96fb49baa4cb2dee41268dce23351d2 Mon Sep 17 00:00:00 2001 From: davo0411 Date: Wed, 6 May 2026 22:11:06 +1000 Subject: [PATCH 2/3] Update WaterEffects.ini --- features/Water Effects/Shaders/Features/WaterEffects.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/Water Effects/Shaders/Features/WaterEffects.ini b/features/Water Effects/Shaders/Features/WaterEffects.ini index d4094c367b..f3b23540d3 100644 --- a/features/Water Effects/Shaders/Features/WaterEffects.ini +++ b/features/Water Effects/Shaders/Features/WaterEffects.ini @@ -1,5 +1,5 @@ [Info] -Version = 1-1-1 +Version = 1-1-2 [Nexus] autoupload = false From 855c7b5e1502a117ed445de935067479aace064c Mon Sep 17 00:00:00 2001 From: David Kehoe Date: Thu, 7 May 2026 19:29:11 +1000 Subject: [PATCH 3/3] Update WaterCaustics.hlsli --- .../Shaders/WaterEffects/WaterCaustics.hlsli | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli b/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli index ae7e39063e..84e2155a8e 100644 --- a/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli +++ b/features/Water Effects/Shaders/WaterEffects/WaterCaustics.hlsli @@ -26,20 +26,20 @@ namespace WaterEffects float2 causticsUV1 = PanCausticsUV(causticsUV, 0.5 * 0.2, 1.0); float2 causticsUV2 = PanCausticsUV(causticsUV, 1.0 * 0.2, -0.5); - float causticsHigh = 1.0; - if (causticsFade > 0.0) { - causticsHigh = min(SampleCaustics(causticsUV1), SampleCaustics(causticsUV2)) * 4.0; - } + const float causticsHigh = + (causticsFade > 0.0) + ? (min(SampleCaustics(causticsUV1), SampleCaustics(causticsUV2)) * 4.0) + : 1.0; 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) { - causticsLow = min(SampleCaustics(causticsUV1), SampleCaustics(causticsUV2)) * 4.0; - } + const float causticsLow = + (causticsFade < 1.0) + ? (min(SampleCaustics(causticsUV1), SampleCaustics(causticsUV2)) * 4.0) + : 1.0; const float caustics = lerp(causticsLow, causticsHigh, causticsFade); return lerp(1.0, caustics, shoreFactorCaustics);