BlueGit

timfa questward

Polish simplex water: top-left light, scroll flow, foam rim, deeper deep.

Drop plastic fresnel varnish for matte height shading, scroll the FBM in XY, darken deep palette, and lerp the last ~3 coast pixels to white foam.

timfa Tim Falken · pushed by timfa

Authored 2026-09-04 · 2 months ago

Hash
6f55c2f464a3fa64f401a21d7c769f6ac0fe22b0
Parent
cab7b7ed
1 file changed +48 −24
client/src/render/worldView.js +48 −24
@@ -209,54 +209,76 @@ const WATER_GROUND_FRAG = [
209 209 " vec2 px = floor(v_texCoord * 16.0) + 0.5;",
210 210 " vec2 puv = px / 16.0;",
211 211 " vec2 world = vec2(u_tileX, u_tileY) + puv;",
212 " float t = u_time * 0.55;",
213 // Pseudo-normals from offset FBM samples + texture distortion.
214 " float eps = 0.09;",
215 " vec3 base = vec3(world * 0.85, t);",
212 " float t = u_time;",
213 // Scroll XY (flow) + mild Z ripple so the field actually travels.
214 " vec2 flow = vec2(t * 0.22, t * 0.14);",
215 " float eps = 0.10;",
216 " vec3 base = vec3(world * 0.85 + flow, t * 0.35);",
216 217 " float nC = fbm(base);",
217 218 " float nL = fbm(base + vec3(-eps, 0.0, 0.0));",
218 219 " float nR = fbm(base + vec3(eps, 0.0, 0.0));",
219 220 " float nD = fbm(base + vec3(0.0, -eps, 0.0));",
220 221 " float nU = fbm(base + vec3(0.0, eps, 0.0));",
221 " vec2 distort = vec2(nL - nR, nD - nU) * 0.22;",
222 " float texN = texture2D(u_texture, wrapUv(world * 0.28 + distort + vec2(t * 0.03, -t * 0.02))).r;",
223 " float h = nC * 0.85 + (texN - 0.5) * 0.35;",
224 " vec3 normal = normalize(vec3(nL - nR, nD - nU, 0.42));",
225 " float ndotl = clamp(dot(normal, normalize(vec3(0.45, 0.55, 0.7))), 0.0, 1.0);",
226 " float fresnel = pow(1.0 - clamp(normal.z, 0.0, 1.0), 2.4);",
222 " vec2 distort = vec2(nL - nR, nD - nU) * 0.14;",
223 " float texN = texture2D(u_texture, wrapUv(world * 0.28 + flow * 0.6 + distort)).r;",
224 " float h = nC * 0.9 + (texN - 0.5) * 0.22;",
225 // Flatter normals + light from top-left (screen: -X, -Y).
226 " vec3 normal = normalize(vec3(nL - nR, nD - nU, 0.85));",
227 " float ndotl = clamp(dot(normal, normalize(vec3(-0.55, -0.5, 0.75))), 0.0, 1.0);",
227 228 " float wave = h * 0.5 + 0.5;",
228 " float glitter = pow(max(0.0, ndotl), 8.0) + pow(fresnel, 3.0) * 0.55;",
229 " glitter = clamp(glitter + pow(max(0.0, wave - 0.62), 2.8) * 0.7, 0.0, 1.0);",
230 // Cardinal + diagonal land proximity (inner corners like WWW/WLL).
229 // Soft diffuse water — crest highlights only, no varnish/fresnel shell.
230 " float crest = smoothstep(0.58, 0.82, wave);",
231 " float glitter = pow(max(0.0, ndotl), 3.5) * crest * 0.45;",
231 232 " float edgeProx = 0.0;",
232 " if (u_edgeN > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.y)); }",
233 " if (u_edgeS > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.y)); }",
234 " if (u_edgeW > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.x)); }",
235 " if (u_edgeE > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.x)); }",
233 " float foamBand = 0.0;",
234 " float pxBand = 3.0 / 16.0;",
235 " if (u_edgeN > 0.5) {",
236 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.y));",
237 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, puv.y));",
238 " }",
239 " if (u_edgeS > 0.5) {",
240 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.y));",
241 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, 1.0 - puv.y));",
242 " }",
243 " if (u_edgeW > 0.5) {",
244 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.x));",
245 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, puv.x));",
246 " }",
247 " if (u_edgeE > 0.5) {",
248 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.x));",
249 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, 1.0 - puv.x));",
250 " }",
236 251 " if (u_edgeNE > 0.5) {",
237 252 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(1.0 - puv.x, puv.y))));",
253 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(1.0 - puv.x, puv.y))));",
238 254 " }",
239 255 " if (u_edgeNW > 0.5) {",
240 256 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(puv.x, puv.y))));",
257 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(puv.x, puv.y))));",
241 258 " }",
242 259 " if (u_edgeSE > 0.5) {",
243 260 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(1.0 - puv.x, 1.0 - puv.y))));",
261 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(1.0 - puv.x, 1.0 - puv.y))));",
244 262 " }",
245 263 " if (u_edgeSW > 0.5) {",
246 264 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(puv.x, 1.0 - puv.y))));",
265 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(puv.x, 1.0 - puv.y))));",
247 266 " }",
248 267 " float waveBody = wave * (1.0 - edgeProx * 0.72);",
249 " float glitterBody = glitter * (1.0 - edgeProx * 0.85);",
250 268 " float deepTop = mix(u_deepNW, u_deepNE, puv.x);",
251 269 " float deepBot = mix(u_deepSW, u_deepSE, puv.x);",
252 270 " float deepMix = mix(deepTop, deepBot, puv.y);",
253 " vec3 deepCol = mix(vec3(0.12, 0.36, 0.56), vec3(0.06, 0.18, 0.34), deepMix);",
254 " vec3 midCol = mix(vec3(0.22, 0.52, 0.70), vec3(0.12, 0.34, 0.54), deepMix);",
255 " vec3 litCol = mix(vec3(0.55, 0.82, 0.94), vec3(0.34, 0.60, 0.82), deepMix);",
256 " vec3 sparkCol = mix(vec3(0.94, 0.99, 1.0), vec3(0.72, 0.88, 0.98), deepMix);",
271 " vec3 deepCol = mix(vec3(0.12, 0.36, 0.56), vec3(0.03, 0.09, 0.20), deepMix);",
272 " vec3 midCol = mix(vec3(0.22, 0.52, 0.70), vec3(0.07, 0.22, 0.40), deepMix);",
273 " vec3 litCol = mix(vec3(0.48, 0.74, 0.88), vec3(0.22, 0.45, 0.66), deepMix);",
274 " vec3 sparkCol = mix(vec3(0.82, 0.92, 0.98), vec3(0.55, 0.74, 0.88), deepMix);",
275 " vec3 foamCol = vec3(0.90, 0.97, 1.0);",
276 // Height-driven body + gentle top-left diffuse (matte, not plastic).
277 " float shade = mix(0.78, 1.08, ndotl);",
257 278 " vec3 rgb = mix(deepCol, midCol, smoothstep(0.28, 0.58, waveBody));",
258 " rgb = mix(rgb, litCol, smoothstep(0.45, 0.88, waveBody) * (0.35 + 0.65 * ndotl));",
259 " rgb = mix(rgb, sparkCol, glitterBody * 0.95);",
279 " rgb = mix(rgb, litCol, smoothstep(0.48, 0.85, waveBody) * 0.55);",
280 " rgb *= shade;",
281 " rgb = mix(rgb, sparkCol, glitter * (1.0 - edgeProx * 0.85));",
260 282 " rgb = mix(rgb, deepCol, edgeProx * 0.55);",
261 283 " float shoreW = 0.0;",
262 284 " vec3 shoreRgb = rgb;",
@@ -275,6 +297,8 @@ const WATER_GROUND_FRAG = [
275 297 " float darkAmt = 1.0 - smoothstep(0.18, 0.52, waveBody);",
276 298 " float shoreMask = step(0.42, edgeProx * (0.35 + 0.65 * darkAmt)) * shoreW;",
277 299 " rgb = mix(rgb, shoreRgb, shoreMask);",
300 // Last 2–3 water pixels along the coast → white foam.
301 " rgb = mix(rgb, foamCol, foamBand * (1.0 - shoreMask) * 0.92);",
278 302 " float litTop = mix(u_litNW, u_litNE, v_texCoord.x);",
279 303 " float litBottom = mix(u_litSW, u_litSE, v_texCoord.x);",
280 304 " float lit = mix(litTop, litBottom, v_texCoord.y);",
@@ -209,54 +209,76 @@ const WATER_GROUND_FRAG = [
209 " vec2 px = floor(v_texCoord * 16.0) + 0.5;",
209 " vec2 px = floor(v_texCoord * 16.0) + 0.5;",
210 " vec2 puv = px / 16.0;",
210 " vec2 puv = px / 16.0;",
211 " vec2 world = vec2(u_tileX, u_tileY) + puv;",
211 " vec2 world = vec2(u_tileX, u_tileY) + puv;",
212 " float t = u_time * 0.55;",
212 " float t = u_time;",
213 // Pseudo-normals from offset FBM samples + texture distortion.
213 // Scroll XY (flow) + mild Z ripple so the field actually travels.
214 " float eps = 0.09;",
214 " vec2 flow = vec2(t * 0.22, t * 0.14);",
215 " vec3 base = vec3(world * 0.85, t);",
215 " float eps = 0.10;",
216 " vec3 base = vec3(world * 0.85 + flow, t * 0.35);",
216 " float nC = fbm(base);",
217 " float nC = fbm(base);",
217 " float nL = fbm(base + vec3(-eps, 0.0, 0.0));",
218 " float nL = fbm(base + vec3(-eps, 0.0, 0.0));",
218 " float nR = fbm(base + vec3(eps, 0.0, 0.0));",
219 " float nR = fbm(base + vec3(eps, 0.0, 0.0));",
219 " float nD = fbm(base + vec3(0.0, -eps, 0.0));",
220 " float nD = fbm(base + vec3(0.0, -eps, 0.0));",
220 " float nU = fbm(base + vec3(0.0, eps, 0.0));",
221 " float nU = fbm(base + vec3(0.0, eps, 0.0));",
221 " vec2 distort = vec2(nL - nR, nD - nU) * 0.22;",
222 " vec2 distort = vec2(nL - nR, nD - nU) * 0.14;",
222 " float texN = texture2D(u_texture, wrapUv(world * 0.28 + distort + vec2(t * 0.03, -t * 0.02))).r;",
223 " float texN = texture2D(u_texture, wrapUv(world * 0.28 + flow * 0.6 + distort)).r;",
223 " float h = nC * 0.85 + (texN - 0.5) * 0.35;",
224 " float h = nC * 0.9 + (texN - 0.5) * 0.22;",
224 " vec3 normal = normalize(vec3(nL - nR, nD - nU, 0.42));",
225 // Flatter normals + light from top-left (screen: -X, -Y).
225 " float ndotl = clamp(dot(normal, normalize(vec3(0.45, 0.55, 0.7))), 0.0, 1.0);",
226 " vec3 normal = normalize(vec3(nL - nR, nD - nU, 0.85));",
226 " float fresnel = pow(1.0 - clamp(normal.z, 0.0, 1.0), 2.4);",
227 " float ndotl = clamp(dot(normal, normalize(vec3(-0.55, -0.5, 0.75))), 0.0, 1.0);",
227 " float wave = h * 0.5 + 0.5;",
228 " float wave = h * 0.5 + 0.5;",
228 " float glitter = pow(max(0.0, ndotl), 8.0) + pow(fresnel, 3.0) * 0.55;",
229 // Soft diffuse water — crest highlights only, no varnish/fresnel shell.
229 " glitter = clamp(glitter + pow(max(0.0, wave - 0.62), 2.8) * 0.7, 0.0, 1.0);",
230 " float crest = smoothstep(0.58, 0.82, wave);",
230 // Cardinal + diagonal land proximity (inner corners like WWW/WLL).
231 " float glitter = pow(max(0.0, ndotl), 3.5) * crest * 0.45;",
231 " float edgeProx = 0.0;",
232 " float edgeProx = 0.0;",
232 " if (u_edgeN > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.y)); }",
233 " float foamBand = 0.0;",
233 " if (u_edgeS > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.y)); }",
234 " float pxBand = 3.0 / 16.0;",
234 " if (u_edgeW > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.x)); }",
235 " if (u_edgeN > 0.5) {",
235 " if (u_edgeE > 0.5) { edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.x)); }",
236 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.y));",
237 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, puv.y));",
238 " }",
239 " if (u_edgeS > 0.5) {",
240 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.y));",
241 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, 1.0 - puv.y));",
242 " }",
243 " if (u_edgeW > 0.5) {",
244 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, puv.x));",
245 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, puv.x));",
246 " }",
247 " if (u_edgeE > 0.5) {",
248 " edgeProx = max(edgeProx, smoothstep(0.55, 0.0, 1.0 - puv.x));",
249 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, 1.0 - puv.x));",
250 " }",
236 " if (u_edgeNE > 0.5) {",
251 " if (u_edgeNE > 0.5) {",
237 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(1.0 - puv.x, puv.y))));",
252 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(1.0 - puv.x, puv.y))));",
253 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(1.0 - puv.x, puv.y))));",
238 " }",
254 " }",
239 " if (u_edgeNW > 0.5) {",
255 " if (u_edgeNW > 0.5) {",
240 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(puv.x, puv.y))));",
256 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(puv.x, puv.y))));",
257 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(puv.x, puv.y))));",
241 " }",
258 " }",
242 " if (u_edgeSE > 0.5) {",
259 " if (u_edgeSE > 0.5) {",
243 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(1.0 - puv.x, 1.0 - puv.y))));",
260 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(1.0 - puv.x, 1.0 - puv.y))));",
261 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(1.0 - puv.x, 1.0 - puv.y))));",
244 " }",
262 " }",
245 " if (u_edgeSW > 0.5) {",
263 " if (u_edgeSW > 0.5) {",
246 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(puv.x, 1.0 - puv.y))));",
264 " edgeProx = max(edgeProx, smoothstep(0.72, 0.0, length(vec2(puv.x, 1.0 - puv.y))));",
265 " foamBand = max(foamBand, 1.0 - smoothstep(0.0, pxBand, length(vec2(puv.x, 1.0 - puv.y))));",
247 " }",
266 " }",
248 " float waveBody = wave * (1.0 - edgeProx * 0.72);",
267 " float waveBody = wave * (1.0 - edgeProx * 0.72);",
249 " float glitterBody = glitter * (1.0 - edgeProx * 0.85);",
250 " float deepTop = mix(u_deepNW, u_deepNE, puv.x);",
268 " float deepTop = mix(u_deepNW, u_deepNE, puv.x);",
251 " float deepBot = mix(u_deepSW, u_deepSE, puv.x);",
269 " float deepBot = mix(u_deepSW, u_deepSE, puv.x);",
252 " float deepMix = mix(deepTop, deepBot, puv.y);",
270 " float deepMix = mix(deepTop, deepBot, puv.y);",
253 " vec3 deepCol = mix(vec3(0.12, 0.36, 0.56), vec3(0.06, 0.18, 0.34), deepMix);",
271 " vec3 deepCol = mix(vec3(0.12, 0.36, 0.56), vec3(0.03, 0.09, 0.20), deepMix);",
254 " vec3 midCol = mix(vec3(0.22, 0.52, 0.70), vec3(0.12, 0.34, 0.54), deepMix);",
272 " vec3 midCol = mix(vec3(0.22, 0.52, 0.70), vec3(0.07, 0.22, 0.40), deepMix);",
255 " vec3 litCol = mix(vec3(0.55, 0.82, 0.94), vec3(0.34, 0.60, 0.82), deepMix);",
273 " vec3 litCol = mix(vec3(0.48, 0.74, 0.88), vec3(0.22, 0.45, 0.66), deepMix);",
256 " vec3 sparkCol = mix(vec3(0.94, 0.99, 1.0), vec3(0.72, 0.88, 0.98), deepMix);",
274 " vec3 sparkCol = mix(vec3(0.82, 0.92, 0.98), vec3(0.55, 0.74, 0.88), deepMix);",
275 " vec3 foamCol = vec3(0.90, 0.97, 1.0);",
276 // Height-driven body + gentle top-left diffuse (matte, not plastic).
277 " float shade = mix(0.78, 1.08, ndotl);",
257 " vec3 rgb = mix(deepCol, midCol, smoothstep(0.28, 0.58, waveBody));",
278 " vec3 rgb = mix(deepCol, midCol, smoothstep(0.28, 0.58, waveBody));",
258 " rgb = mix(rgb, litCol, smoothstep(0.45, 0.88, waveBody) * (0.35 + 0.65 * ndotl));",
279 " rgb = mix(rgb, litCol, smoothstep(0.48, 0.85, waveBody) * 0.55);",
259 " rgb = mix(rgb, sparkCol, glitterBody * 0.95);",
280 " rgb *= shade;",
281 " rgb = mix(rgb, sparkCol, glitter * (1.0 - edgeProx * 0.85));",
260 " rgb = mix(rgb, deepCol, edgeProx * 0.55);",
282 " rgb = mix(rgb, deepCol, edgeProx * 0.55);",
261 " float shoreW = 0.0;",
283 " float shoreW = 0.0;",
262 " vec3 shoreRgb = rgb;",
284 " vec3 shoreRgb = rgb;",
@@ -275,6 +297,8 @@ const WATER_GROUND_FRAG = [
275 " float darkAmt = 1.0 - smoothstep(0.18, 0.52, waveBody);",
297 " float darkAmt = 1.0 - smoothstep(0.18, 0.52, waveBody);",
276 " float shoreMask = step(0.42, edgeProx * (0.35 + 0.65 * darkAmt)) * shoreW;",
298 " float shoreMask = step(0.42, edgeProx * (0.35 + 0.65 * darkAmt)) * shoreW;",
277 " rgb = mix(rgb, shoreRgb, shoreMask);",
299 " rgb = mix(rgb, shoreRgb, shoreMask);",
300 // Last 2–3 water pixels along the coast → white foam.
301 " rgb = mix(rgb, foamCol, foamBand * (1.0 - shoreMask) * 0.92);",
278 " float litTop = mix(u_litNW, u_litNE, v_texCoord.x);",
302 " float litTop = mix(u_litNW, u_litNE, v_texCoord.x);",
279 " float litBottom = mix(u_litSW, u_litSE, v_texCoord.x);",
303 " float litBottom = mix(u_litSW, u_litSE, v_texCoord.x);",
280 " float lit = mix(litTop, litBottom, v_texCoord.y);",
304 " float lit = mix(litTop, litBottom, v_texCoord.y);",