Added more high-frequency water wave

Author: Luna5ama

shaders/pass/geometry/GBufferTranslucent.frag.glsl

@@ -151,7 +151,7 @@ GBufferData processOutput() {
             float rayVectorLength = length(rayVector);
             vec3 rayDir = rayVector / rayVectorLength;
 
-            const float MAX_WAVE_HEIGHT = -rcp(0.8349056);
+            const float MAX_WAVE_HEIGHT = -rcp(0.83);
 
             vec2 prevXY = vec2(0.0, 1.0);
 
@@ -191,7 +191,7 @@ GBufferData processOutput() {
                     }
 
                     waveWorldPos = samplePos;
-                    zOffset = fi * PARALLAX_STRENGTH + 0.4 / rayDir.y;
+                    zOffset = fi * PARALLAX_STRENGTH * 0.5 + 0.4 / rayDir.y;
                     break;
                 }
 

shaders/techniques/WaterWave.glsl

@@ -43,53 +43,53 @@ float waveHeight(vec3 wavePos, bool base) {
 
     waveTexCoord = MAT2_GOLDEN_ANGLE * (waveTexCoord + waveTime * -0.025);
 
-    float amp = 0.4;
     float wave = 0.0;
 
     if (base) {
         #ifdef DISTANT_HORIZONS
-        wave += amp * sampleNoise((waveTexCoord + curl + waveTime * 0.31) * vec2(0.1, 0.06)) * 2.0; // 0.8
+        wave += 0.4 * sampleNoise((waveTexCoord + curl + waveTime * 0.31) * vec2(0.1, 0.06)) * 2.0; // 0.8
         #endif
-        wave += amp * sampleNoise((waveTexCoord + curl + waveTime * 0.29) * vec2(0.5, 0.8)); // 1.2
+        wave += 0.4 * sampleNoise((waveTexCoord + curl + waveTime * 0.29) * vec2(0.5, 0.8)); // 1.2
     }
 
     // base [0.0, 1.2]
 
-    // detail [-0.8349056, 0.0]
-    amp *= -0.38; // -0.152
+    // detail [-0.83, 0.0]
     waveTexCoord = MAT2_GOLDEN_ANGLE * (waveTexCoord * 2.23);
     curl = MAT2_GOLDEN_ANGLE * (curl * 1.85);
     {
         waveTexCoordOgCurl = MAT2_GOLDEN_ANGLE * waveTexCoordOgCurl;
         vec2 curlCoord2 = waveTexCoordOgCurl * 0.72;
         curlCoord2 -= waveTime * 1.28;
         curlCoord2 -= (MAT2_GOLDEN_ANGLE * waveTime) * 1.57;
-        curl += textureLod(usam_waveHFCurl, curlCoord2, 0.0).rg * 0.021;
+        curl += textureLod(usam_waveHFCurl, curlCoord2, 0.0).rg * 0.028;
     }
 
-    wave += amp * sampleNoise((waveTexCoord + curl - waveTime * 0.86) * vec2(-0.85, 0.52)); // -0.152
+    wave += -0.12 * sampleNoise((waveTexCoord + curl - waveTime * 0.86) * vec2(-0.85, 0.52)); // -0.152
 
-    amp *= 2.08; // -0.31616
     waveTexCoord = MAT2_GOLDEN_ANGLE * (waveTexCoord * 1.03 - waveTime * 2.17);
     curl = MAT2_GOLDEN_ANGLE * (curl * 1.65);
 
-    wave += amp * (sampleNoise((waveTexCoord + curl) * vec2(-0.13, -0.36))) * 2.0; // -0.78432
+    wave += -0.59 * (sampleNoise((waveTexCoord + curl) * vec2(-0.13, -0.36))); // -0.63232
 
-    amp *= 0.16; // -0.0505856
-    waveTexCoord = MAT2_GOLDEN_ANGLE * (waveTexCoord * 2.02 - waveTime * 2.48);
-    curl = MAT2_GOLDEN_ANGLE * (curl * 1.25);
+    waveTexCoord = MAT2_GOLDEN_ANGLE * (waveTexCoord * 1.58 - waveTime * 1.48);
+    curl = MAT2_GOLDEN_ANGLE * (curl * 1.35);
 
     {
         waveTexCoordOgCurl = MAT2_GOLDEN_ANGLE * waveTexCoordOgCurl;
         vec2 curlCoord2 = waveTexCoordOgCurl;
-        curlCoord2 = curlCoord2 * 1.99;
+        curlCoord2 = curlCoord2 * 2.33;
         curlCoord2 += sin(timeV * 6.1 + 2.1) * 0.032 * CURL_DIR;
-        curlCoord2 -= waveTime * 2.57;
+        curlCoord2 -= waveTime * 2.07;
         curlCoord2 -= (MAT2_GOLDEN_ANGLE * waveTime) * 1.43;
-        curl += textureLod(usam_waveHFCurl, curlCoord2, 0.0).rg * 0.038;
+        curl += textureLod(usam_waveHFCurl, curlCoord2, 0.0).rg * 0.078;
     }
+    wave += -0.07 * sampleNoise((waveTexCoord + curl) * vec2(-0.57, -0.69) + waveTime * vec2(3.2, -5.1)); // -0.8349056
 
-    wave += amp * sampleNoise((waveTexCoord + curl) * vec2(-0.57, -0.89) + waveTime * vec2(1.6, -5.8)); // -0.8349056
+    waveTexCoord = MAT2_GOLDEN_ANGLE * (waveTexCoord * 1.97 - waveTime * 1.38);
+    curl = MAT2_GOLDEN_ANGLE * (curl * 1.73);
+
+    wave += -0.05 * sampleNoise((waveTexCoord + curl) * vec2(0.4, 0.6) - waveTime * vec2(1.1, 1.1)); // -0.8601984
 
     return wave;
 }