BlueGit

timfa questward

Use crossing Gerstner waves and sharper shore crests for water.

timfa Tim Falken · pushed by timfa

Authored 2026-09-04 · 2 months ago

Hash
4055253a3d16e53c1d0c4efd9d670ee3544063cd
Parent
5738ddb3
4 files changed +97 −101
client/assets/grounds/deep-water/deep-water.png Binary file +0 −0

The contents of this binary file are not shown.

client/assets/grounds/water/water.png Binary file +0 −0

The contents of this binary file are not shown.

client/scripts/write-placeholder-assets.mjs +13 −13
@@ -53,24 +53,24 @@ overlay(join(root, "items", "lantern", "lantern-equip.png"), [200, 130, 48, 230]
53 53 torchBloom(join(root, "items", "lantern", "lantern-equip-bloom.png"));
54 54 torchBloom(join(root, "blocks", "torch", "torch-bloom.png"));
55 55
56 function writeWaterSheet (file, base)
56 function writeWaterNoise (file, seed)
57 57 {
58 const image = makeRgba(16, 16, base);
59 for (let y = 0; y < 16; y++)
58 const size = 16;
59 const image = makeRgba(size, size, [0, 0, 0, 255]);
60 for (let y = 0; y < size; y++)
60 61 {
61 const t = y / 15;
62 fillRect(image, 0, y, 16, 1, [
63 Math.round(base[0] * (1 - t * 0.15)),
64 Math.round(base[1] * (1 - t * 0.08)),
65 Math.round(base[2] * (1 + t * 0.05)),
66 255
67 ]);
62 for (let x = 0; x < size; x++)
63 {
64 const n = Math.abs(Math.sin((x + seed * 3.1) * 12.9898 + (y + seed) * 78.233)) * 43758.5453;
65 const v = Math.floor((n - Math.floor(n)) * 255);
66 fillRect(image, x, y, 1, 1, [v, v, v, 255]);
67 }
68 68 }
69 writeRgbaPng(file, 16, 16, image.pixels);
69 writeRgbaPng(file, size, size, image.pixels);
70 70 }
71 71
72 writeWaterSheet(join(root, "grounds", "water", "water.png"), [48, 118, 168, 255]);
73 writeWaterSheet(join(root, "grounds", "deep-water", "deep-water.png"), [28, 72, 118, 255]);
72 writeWaterNoise(join(root, "grounds", "water", "water.png"), 1);
73 writeWaterNoise(join(root, "grounds", "deep-water", "deep-water.png"), 2);
74 74
75 75 {
76 76 const image = makeRgba(24, 8, [0, 0, 0, 0]);
@@ -53,24 +53,24 @@ overlay(join(root, "items", "lantern", "lantern-equip.png"), [200, 130, 48, 230]
53torchBloom(join(root, "items", "lantern", "lantern-equip-bloom.png"));
53torchBloom(join(root, "items", "lantern", "lantern-equip-bloom.png"));
54torchBloom(join(root, "blocks", "torch", "torch-bloom.png"));
54torchBloom(join(root, "blocks", "torch", "torch-bloom.png"));
55
55
56function writeWaterSheet (file, base)
56function writeWaterNoise (file, seed)
57{
57{
58 const image = makeRgba(16, 16, base);
58 const size = 16;
59 for (let y = 0; y < 16; y++)
59 const image = makeRgba(size, size, [0, 0, 0, 255]);
60 for (let y = 0; y < size; y++)
60 {
61 {
61 const t = y / 15;
62 for (let x = 0; x < size; x++)
62 fillRect(image, 0, y, 16, 1, [
63 {
63 Math.round(base[0] * (1 - t * 0.15)),
64 const n = Math.abs(Math.sin((x + seed * 3.1) * 12.9898 + (y + seed) * 78.233)) * 43758.5453;
64 Math.round(base[1] * (1 - t * 0.08)),
65 const v = Math.floor((n - Math.floor(n)) * 255);
65 Math.round(base[2] * (1 + t * 0.05)),
66 fillRect(image, x, y, 1, 1, [v, v, v, 255]);
66 255
67 }
67 ]);
68 }
68 }
69 writeRgbaPng(file, 16, 16, image.pixels);
69 writeRgbaPng(file, size, size, image.pixels);
70}
70}
71
71
72writeWaterSheet(join(root, "grounds", "water", "water.png"), [48, 118, 168, 255]);
72writeWaterNoise(join(root, "grounds", "water", "water.png"), 1);
73writeWaterSheet(join(root, "grounds", "deep-water", "deep-water.png"), [28, 72, 118, 255]);
73writeWaterNoise(join(root, "grounds", "deep-water", "deep-water.png"), 2);
74
74
75{
75{
76 const image = makeRgba(24, 8, [0, 0, 0, 0]);
76 const image = makeRgba(24, 8, [0, 0, 0, 0]);
client/src/render/worldView.js +84 −88
@@ -126,101 +126,97 @@ const WATER_GROUND_FRAG = [
126 126 "uniform float u_shoreEdgeS;",
127 127 "uniform float u_shoreEdgeW;",
128 128 "uniform vec4 u_shoreUvRect;",
129 "float hash21(vec2 p) {",
130 " return fract(sin(dot(p, vec2(127.1, 311.7))) * 43758.5453123);",
131 "}",
132 "float vnoise(vec2 p) {",
133 " vec2 i = floor(p);",
134 " vec2 f = fract(p);",
135 " f = f * f * (3.0 - 2.0 * f);",
136 " float a = hash21(i);",
137 " float b = hash21(i + vec2(1.0, 0.0));",
138 " float c = hash21(i + vec2(0.0, 1.0));",
139 " float d = hash21(i + vec2(1.0, 1.0));",
140 " return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);",
141 "}",
142 // dir: wave travel direction; steep Q in (0..1); amp; len wavelength in tiles; speed.
143 "void gerstner(vec2 world, vec2 dir, float steep, float amp, float len, float speed, float t,",
144 " inout float h, inout float dx, inout float dy) {",
145 " float invLen = 1.0 / max(len, 0.001);",
146 " float d2 = max(dot(dir, dir), 1e-5);",
147 " vec2 d = dir * inversesqrt(d2);",
148 " float k = 6.2831853 * invLen;",
149 " float phase = k * dot(d, world) - speed * t;",
150 " float s = sin(phase);",
151 " float c = cos(phase);",
152 " h += amp * c;",
153 " float qak = steep * amp * k;",
154 " dx -= d.x * qak * s;",
155 " dy -= d.y * qak * s;",
156 "}",
157 "void coastEdge(",
158 " float enabled, float dist, float along, float phaseOff, float useShore,",
159 " vec2 shoreNu, inout float foam, inout float shoreMix, inout vec3 shoreRgb",
160 ") {",
161 " if (enabled < 0.5) { return; }",
162 " float n = vnoise(vec2(along * 3.0 + phaseOff, u_time * 0.15 + phaseOff * 0.2));",
163 " float k = 7.5;",
164 " float theta = along * k - u_time * 2.15 + phaseOff + n * 1.8;",
165 " float c = cos(theta);",
166 " float steep = 0.72;",
167 " float crest = (c + steep * c * c) / (1.0 + steep);",
168 " float runup = 0.08 + 0.14 * crest;",
169 " float front = smoothstep(runup + 0.05, runup - 0.02, dist);",
170 " float foamCrest = pow(max(0.0, crest), 2.2) * front;",
171 " foam = max(foam, foamCrest * 0.95);",
172 " float retreat = smoothstep(-0.05, -0.55, crest) * smoothstep(0.12, 0.0, dist);",
173 " if (retreat > 0.05 && useShore > 0.5 && u_hasShore > 0.5) {",
174 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
175 " vec4 shore = texture2D(u_secondary, shoreUv);",
176 " if (shore.a > 0.1) {",
177 " shoreRgb = shore.rgb;",
178 " shoreMix = max(shoreMix, retreat);",
179 " }",
180 " }",
181 "}",
129 182 "void main() {",
130 // Pixel grid (16x16) for body waves — stable across the tile.
131 183 " vec2 px = floor(v_texCoord * 16.0) + 0.5;",
132 184 " vec2 puv = px / 16.0;",
133 185 " vec2 world = vec2(u_tileX, u_tileY) + puv;",
134 " float w1 = sin(u_time * 1.7 + world.x * 5.1 + world.y * 3.3);",
135 " float w2 = sin(u_time * 2.3 + world.x * -3.7 + world.y * 6.2 + 1.7);",
136 " float body = 0.55 + 0.28 * w1 + 0.17 * w2;",
137 " vec3 shallowA = vec3(0.19, 0.46, 0.66);",
138 " vec3 shallowB = vec3(0.35, 0.67, 0.82);",
139 " vec3 deepA = vec3(0.11, 0.28, 0.46);",
140 " vec3 deepB = vec3(0.22, 0.47, 0.67);",
141 " vec3 baseA = mix(shallowA, deepA, u_deep);",
142 " vec3 baseB = mix(shallowB, deepB, u_deep);",
143 " vec3 rgb = mix(baseA, baseB, clamp(body, 0.0, 1.0));",
144 " vec3 foamCol = vec3(0.78, 0.92, 1.0);",
186 " float t = u_time;",
187 " float nSlow = vnoise(world * 0.55 + vec2(t * 0.04, -t * 0.03));",
188 " float nFine = vnoise(world * 2.4 + vec2(-t * 0.11, t * 0.09));",
189 " float texN = texture2D(u_texture, fract(world * 0.37)).r;",
190 " float h = 0.0;",
191 " float dx = 0.0;",
192 " float dy = 0.0;",
193 " gerstner(world, vec2(1.0, 0.35), 0.55, 0.38, 3.2, 1.15, t, h, dx, dy);",
194 " gerstner(world, vec2(-0.55, 1.0), 0.62, 0.26, 1.7, 1.55, t, h, dx, dy);",
195 " gerstner(world, vec2(0.75, -0.85), 0.48, 0.14, 0.85, 2.35, t, h, dx, dy);",
196 " h += (nSlow - 0.5) * 0.12 + (nFine - 0.5) * 0.06 + (texN - 0.5) * 0.05;",
197 " float slopeLit = clamp(0.55 + dx * 0.55 + dy * 0.28, 0.0, 1.0);",
198 " float crest = smoothstep(0.12, 0.72, h);",
199 " float trough = smoothstep(-0.05, -0.65, h);",
200 " vec3 shallowDeep = mix(vec3(0.16, 0.42, 0.62), vec3(0.09, 0.24, 0.40), u_deep);",
201 " vec3 shallowLit = mix(vec3(0.34, 0.66, 0.82), vec3(0.20, 0.45, 0.66), u_deep);",
202 " vec3 troughCol = mix(vec3(0.10, 0.28, 0.44), vec3(0.05, 0.14, 0.28), u_deep);",
203 " vec3 crestCol = mix(vec3(0.72, 0.88, 0.96), vec3(0.48, 0.70, 0.88), u_deep);",
204 " vec3 rgb = mix(shallowDeep, shallowLit, slopeLit);",
205 " rgb = mix(rgb, troughCol, trough * 0.85);",
206 " rgb = mix(rgb, crestCol, crest * (0.35 + 0.55 * slopeLit));",
207 " vec3 foamCol = vec3(0.82, 0.94, 1.0);",
145 208 " float foam = 0.0;",
146 209 " float shoreMix = 0.0;",
147 210 " vec3 shoreRgb = rgb;",
148 // Top-down sine coastline: surge = foam, retreat = neighbor shore pixels.
149 " float coastAmp = 0.09;",
150 " float coastBase = 0.14;",
151 " if (u_edgeN > 0.5) {",
152 " float along = puv.x;",
153 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 0.9 + u_tileY * 0.4);",
154 " float band = coastBase + coastAmp * wave;",
155 " float dist = puv.y;",
156 " if (dist < band) {",
157 " float t = 1.0 - dist / max(band, 0.001);",
158 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeN > 0.5) {",
159 " vec2 shoreNu = vec2(puv.x, 1.0 - dist);",
160 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
161 " vec4 shore = texture2D(u_secondary, shoreUv);",
162 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
163 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
164 " } else {",
165 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
166 " }",
167 " }",
168 " }",
169 " if (u_edgeS > 0.5) {",
170 " float along = puv.x;",
171 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 0.7 + u_tileY * 1.1 + 2.1);",
172 " float band = coastBase + coastAmp * wave;",
173 " float dist = 1.0 - puv.y;",
174 " if (dist < band) {",
175 " float t = 1.0 - dist / max(band, 0.001);",
176 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeS > 0.5) {",
177 " vec2 shoreNu = vec2(puv.x, dist);",
178 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
179 " vec4 shore = texture2D(u_secondary, shoreUv);",
180 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
181 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
182 " } else {",
183 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
184 " }",
185 " }",
186 " }",
187 " if (u_edgeW > 0.5) {",
188 " float along = puv.y;",
189 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 1.2 + u_tileY * 0.5 + 0.8);",
190 " float band = coastBase + coastAmp * wave;",
191 " float dist = puv.x;",
192 " if (dist < band) {",
193 " float t = 1.0 - dist / max(band, 0.001);",
194 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeW > 0.5) {",
195 " vec2 shoreNu = vec2(1.0 - dist, puv.y);",
196 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
197 " vec4 shore = texture2D(u_secondary, shoreUv);",
198 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
199 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
200 " } else {",
201 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
202 " }",
203 " }",
204 " }",
205 " if (u_edgeE > 0.5) {",
206 " float along = puv.y;",
207 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 0.4 + u_tileY * 0.9 + 3.3);",
208 " float band = coastBase + coastAmp * wave;",
209 " float dist = 1.0 - puv.x;",
210 " if (dist < band) {",
211 " float t = 1.0 - dist / max(band, 0.001);",
212 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeE > 0.5) {",
213 " vec2 shoreNu = vec2(dist, puv.y);",
214 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
215 " vec4 shore = texture2D(u_secondary, shoreUv);",
216 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
217 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
218 " } else {",
219 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
220 " }",
221 " }",
222 " }",
223 " rgb = mix(rgb, foamCol, clamp(foam, 0.0, 0.85));",
211 " coastEdge(u_edgeN, puv.y, puv.x, u_tileX * 0.7 + 0.1, u_shoreEdgeN,",
212 " vec2(puv.x, 1.0 - puv.y), foam, shoreMix, shoreRgb);",
213 " coastEdge(u_edgeS, 1.0 - puv.y, puv.x, u_tileX * 0.5 + 1.7, u_shoreEdgeS,",
214 " vec2(puv.x, 1.0 - puv.y), foam, shoreMix, shoreRgb);",
215 " coastEdge(u_edgeW, puv.x, puv.y, u_tileY * 0.6 + 2.9, u_shoreEdgeW,",
216 " vec2(1.0 - puv.x, puv.y), foam, shoreMix, shoreRgb);",
217 " coastEdge(u_edgeE, 1.0 - puv.x, puv.y, u_tileY * 0.8 + 4.1, u_shoreEdgeE,",
218 " vec2(1.0 - puv.x, puv.y), foam, shoreMix, shoreRgb);",
219 " rgb = mix(rgb, foamCol, clamp(foam, 0.0, 0.9));",
224 220 " rgb = mix(rgb, shoreRgb, clamp(shoreMix, 0.0, 1.0));",
225 221 " float litTop = mix(u_litNW, u_litNE, v_texCoord.x);",
226 222 " float litBottom = mix(u_litSW, u_litSE, v_texCoord.x);",
@@ -126,101 +126,97 @@ const WATER_GROUND_FRAG = [
126 "uniform float u_shoreEdgeS;",
126 "uniform float u_shoreEdgeS;",
127 "uniform float u_shoreEdgeW;",
127 "uniform float u_shoreEdgeW;",
128 "uniform vec4 u_shoreUvRect;",
128 "uniform vec4 u_shoreUvRect;",
129 "float hash21(vec2 p) {",
130 " return fract(sin(dot(p, vec2(127.1, 311.7))) * 43758.5453123);",
131 "}",
132 "float vnoise(vec2 p) {",
133 " vec2 i = floor(p);",
134 " vec2 f = fract(p);",
135 " f = f * f * (3.0 - 2.0 * f);",
136 " float a = hash21(i);",
137 " float b = hash21(i + vec2(1.0, 0.0));",
138 " float c = hash21(i + vec2(0.0, 1.0));",
139 " float d = hash21(i + vec2(1.0, 1.0));",
140 " return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);",
141 "}",
142 // dir: wave travel direction; steep Q in (0..1); amp; len wavelength in tiles; speed.
143 "void gerstner(vec2 world, vec2 dir, float steep, float amp, float len, float speed, float t,",
144 " inout float h, inout float dx, inout float dy) {",
145 " float invLen = 1.0 / max(len, 0.001);",
146 " float d2 = max(dot(dir, dir), 1e-5);",
147 " vec2 d = dir * inversesqrt(d2);",
148 " float k = 6.2831853 * invLen;",
149 " float phase = k * dot(d, world) - speed * t;",
150 " float s = sin(phase);",
151 " float c = cos(phase);",
152 " h += amp * c;",
153 " float qak = steep * amp * k;",
154 " dx -= d.x * qak * s;",
155 " dy -= d.y * qak * s;",
156 "}",
157 "void coastEdge(",
158 " float enabled, float dist, float along, float phaseOff, float useShore,",
159 " vec2 shoreNu, inout float foam, inout float shoreMix, inout vec3 shoreRgb",
160 ") {",
161 " if (enabled < 0.5) { return; }",
162 " float n = vnoise(vec2(along * 3.0 + phaseOff, u_time * 0.15 + phaseOff * 0.2));",
163 " float k = 7.5;",
164 " float theta = along * k - u_time * 2.15 + phaseOff + n * 1.8;",
165 " float c = cos(theta);",
166 " float steep = 0.72;",
167 " float crest = (c + steep * c * c) / (1.0 + steep);",
168 " float runup = 0.08 + 0.14 * crest;",
169 " float front = smoothstep(runup + 0.05, runup - 0.02, dist);",
170 " float foamCrest = pow(max(0.0, crest), 2.2) * front;",
171 " foam = max(foam, foamCrest * 0.95);",
172 " float retreat = smoothstep(-0.05, -0.55, crest) * smoothstep(0.12, 0.0, dist);",
173 " if (retreat > 0.05 && useShore > 0.5 && u_hasShore > 0.5) {",
174 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
175 " vec4 shore = texture2D(u_secondary, shoreUv);",
176 " if (shore.a > 0.1) {",
177 " shoreRgb = shore.rgb;",
178 " shoreMix = max(shoreMix, retreat);",
179 " }",
180 " }",
181 "}",
129 "void main() {",
182 "void main() {",
130 // Pixel grid (16x16) for body waves — stable across the tile.
131 " vec2 px = floor(v_texCoord * 16.0) + 0.5;",
183 " vec2 px = floor(v_texCoord * 16.0) + 0.5;",
132 " vec2 puv = px / 16.0;",
184 " vec2 puv = px / 16.0;",
133 " vec2 world = vec2(u_tileX, u_tileY) + puv;",
185 " vec2 world = vec2(u_tileX, u_tileY) + puv;",
134 " float w1 = sin(u_time * 1.7 + world.x * 5.1 + world.y * 3.3);",
186 " float t = u_time;",
135 " float w2 = sin(u_time * 2.3 + world.x * -3.7 + world.y * 6.2 + 1.7);",
187 " float nSlow = vnoise(world * 0.55 + vec2(t * 0.04, -t * 0.03));",
136 " float body = 0.55 + 0.28 * w1 + 0.17 * w2;",
188 " float nFine = vnoise(world * 2.4 + vec2(-t * 0.11, t * 0.09));",
137 " vec3 shallowA = vec3(0.19, 0.46, 0.66);",
189 " float texN = texture2D(u_texture, fract(world * 0.37)).r;",
138 " vec3 shallowB = vec3(0.35, 0.67, 0.82);",
190 " float h = 0.0;",
139 " vec3 deepA = vec3(0.11, 0.28, 0.46);",
191 " float dx = 0.0;",
140 " vec3 deepB = vec3(0.22, 0.47, 0.67);",
192 " float dy = 0.0;",
141 " vec3 baseA = mix(shallowA, deepA, u_deep);",
193 " gerstner(world, vec2(1.0, 0.35), 0.55, 0.38, 3.2, 1.15, t, h, dx, dy);",
142 " vec3 baseB = mix(shallowB, deepB, u_deep);",
194 " gerstner(world, vec2(-0.55, 1.0), 0.62, 0.26, 1.7, 1.55, t, h, dx, dy);",
143 " vec3 rgb = mix(baseA, baseB, clamp(body, 0.0, 1.0));",
195 " gerstner(world, vec2(0.75, -0.85), 0.48, 0.14, 0.85, 2.35, t, h, dx, dy);",
144 " vec3 foamCol = vec3(0.78, 0.92, 1.0);",
196 " h += (nSlow - 0.5) * 0.12 + (nFine - 0.5) * 0.06 + (texN - 0.5) * 0.05;",
197 " float slopeLit = clamp(0.55 + dx * 0.55 + dy * 0.28, 0.0, 1.0);",
198 " float crest = smoothstep(0.12, 0.72, h);",
199 " float trough = smoothstep(-0.05, -0.65, h);",
200 " vec3 shallowDeep = mix(vec3(0.16, 0.42, 0.62), vec3(0.09, 0.24, 0.40), u_deep);",
201 " vec3 shallowLit = mix(vec3(0.34, 0.66, 0.82), vec3(0.20, 0.45, 0.66), u_deep);",
202 " vec3 troughCol = mix(vec3(0.10, 0.28, 0.44), vec3(0.05, 0.14, 0.28), u_deep);",
203 " vec3 crestCol = mix(vec3(0.72, 0.88, 0.96), vec3(0.48, 0.70, 0.88), u_deep);",
204 " vec3 rgb = mix(shallowDeep, shallowLit, slopeLit);",
205 " rgb = mix(rgb, troughCol, trough * 0.85);",
206 " rgb = mix(rgb, crestCol, crest * (0.35 + 0.55 * slopeLit));",
207 " vec3 foamCol = vec3(0.82, 0.94, 1.0);",
145 " float foam = 0.0;",
208 " float foam = 0.0;",
146 " float shoreMix = 0.0;",
209 " float shoreMix = 0.0;",
147 " vec3 shoreRgb = rgb;",
210 " vec3 shoreRgb = rgb;",
148 // Top-down sine coastline: surge = foam, retreat = neighbor shore pixels.
211 " coastEdge(u_edgeN, puv.y, puv.x, u_tileX * 0.7 + 0.1, u_shoreEdgeN,",
149 " float coastAmp = 0.09;",
212 " vec2(puv.x, 1.0 - puv.y), foam, shoreMix, shoreRgb);",
150 " float coastBase = 0.14;",
213 " coastEdge(u_edgeS, 1.0 - puv.y, puv.x, u_tileX * 0.5 + 1.7, u_shoreEdgeS,",
151 " if (u_edgeN > 0.5) {",
214 " vec2(puv.x, 1.0 - puv.y), foam, shoreMix, shoreRgb);",
152 " float along = puv.x;",
215 " coastEdge(u_edgeW, puv.x, puv.y, u_tileY * 0.6 + 2.9, u_shoreEdgeW,",
153 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 0.9 + u_tileY * 0.4);",
216 " vec2(1.0 - puv.x, puv.y), foam, shoreMix, shoreRgb);",
154 " float band = coastBase + coastAmp * wave;",
217 " coastEdge(u_edgeE, 1.0 - puv.x, puv.y, u_tileY * 0.8 + 4.1, u_shoreEdgeE,",
155 " float dist = puv.y;",
218 " vec2(1.0 - puv.x, puv.y), foam, shoreMix, shoreRgb);",
156 " if (dist < band) {",
219 " rgb = mix(rgb, foamCol, clamp(foam, 0.0, 0.9));",
157 " float t = 1.0 - dist / max(band, 0.001);",
158 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeN > 0.5) {",
159 " vec2 shoreNu = vec2(puv.x, 1.0 - dist);",
160 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
161 " vec4 shore = texture2D(u_secondary, shoreUv);",
162 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
163 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
164 " } else {",
165 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
166 " }",
167 " }",
168 " }",
169 " if (u_edgeS > 0.5) {",
170 " float along = puv.x;",
171 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 0.7 + u_tileY * 1.1 + 2.1);",
172 " float band = coastBase + coastAmp * wave;",
173 " float dist = 1.0 - puv.y;",
174 " if (dist < band) {",
175 " float t = 1.0 - dist / max(band, 0.001);",
176 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeS > 0.5) {",
177 " vec2 shoreNu = vec2(puv.x, dist);",
178 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
179 " vec4 shore = texture2D(u_secondary, shoreUv);",
180 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
181 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
182 " } else {",
183 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
184 " }",
185 " }",
186 " }",
187 " if (u_edgeW > 0.5) {",
188 " float along = puv.y;",
189 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 1.2 + u_tileY * 0.5 + 0.8);",
190 " float band = coastBase + coastAmp * wave;",
191 " float dist = puv.x;",
192 " if (dist < band) {",
193 " float t = 1.0 - dist / max(band, 0.001);",
194 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeW > 0.5) {",
195 " vec2 shoreNu = vec2(1.0 - dist, puv.y);",
196 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
197 " vec4 shore = texture2D(u_secondary, shoreUv);",
198 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
199 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
200 " } else {",
201 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
202 " }",
203 " }",
204 " }",
205 " if (u_edgeE > 0.5) {",
206 " float along = puv.y;",
207 " float wave = sin(u_time * 2.6 + along * 14.0 + u_tileX * 0.4 + u_tileY * 0.9 + 3.3);",
208 " float band = coastBase + coastAmp * wave;",
209 " float dist = 1.0 - puv.x;",
210 " if (dist < band) {",
211 " float t = 1.0 - dist / max(band, 0.001);",
212 " if (wave < -0.2 && u_hasShore > 0.5 && u_shoreEdgeE > 0.5) {",
213 " vec2 shoreNu = vec2(dist, puv.y);",
214 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
215 " vec4 shore = texture2D(u_secondary, shoreUv);",
216 " if (shore.a > 0.1) { shoreRgb = shore.rgb; shoreMix = max(shoreMix, t); }",
217 " else { foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave))); }",
218 " } else {",
219 " foam = max(foam, t * (0.35 + 0.45 * max(0.0, wave)));",
220 " }",
221 " }",
222 " }",
223 " rgb = mix(rgb, foamCol, clamp(foam, 0.0, 0.85));",
224 " rgb = mix(rgb, shoreRgb, clamp(shoreMix, 0.0, 1.0));",
220 " rgb = mix(rgb, shoreRgb, clamp(shoreMix, 0.0, 1.0));",
225 " float litTop = mix(u_litNW, u_litNE, v_texCoord.x);",
221 " float litTop = mix(u_litNW, u_litNE, v_texCoord.x);",
226 " float litBottom = mix(u_litSW, u_litSE, v_texCoord.x);",
222 " float litBottom = mix(u_litSW, u_litSE, v_texCoord.x);",