BlueGit

timfa questward

Polish procedural water: more Gerstner angles, shallow-deep blend, cleaner coasts.

Skip soft-terrain bake into liquid/procedural water so land no longer samples the noise sheet; coast foam travels shore-normal instead of along-edge dots.

timfa Tim Falken · pushed by timfa

Authored 2026-09-04 · 2 months ago

Hash
925fc84f5518f956ed3b581df10c6f1907295591
Parent
4055253a
3 files changed +102 −23
client/src/render/chunkBake.js +5 −0
@@ -493,6 +493,11 @@ function blitBlendedGround (
493 493 { continue; }
494 494 if (groundVisualKey(catalog, neighborGround, season) === selfKey)
495 495 { continue; }
496 // Never soft-blend land into procedural/liquid water — that pulls the noise sheet into the rim.
497 const nbrTypeId = normalizeGround(neighborGround).typeId;
498 const nbrDef = GROUND_DEFINITIONS[nbrTypeId];
499 if (nbrDef?.proceduralWaves || isLiquidWaterGround(nbrTypeId, season))
500 { continue; }
496 501 const neighborName = groundSpriteName(catalog, neighborGround, season);
497 502 const pixels = spritePixels(images[neighborName], pixelCache);
498 503 if (!pixels)
@@ -493,6 +493,11 @@ function blitBlendedGround (
493 { continue; }
493 { continue; }
494 if (groundVisualKey(catalog, neighborGround, season) === selfKey)
494 if (groundVisualKey(catalog, neighborGround, season) === selfKey)
495 { continue; }
495 { continue; }
496 // Never soft-blend land into procedural/liquid water — that pulls the noise sheet into the rim.
497 const nbrTypeId = normalizeGround(neighborGround).typeId;
498 const nbrDef = GROUND_DEFINITIONS[nbrTypeId];
499 if (nbrDef?.proceduralWaves || isLiquidWaterGround(nbrTypeId, season))
500 { continue; }
496 const neighborName = groundSpriteName(catalog, neighborGround, season);
501 const neighborName = groundSpriteName(catalog, neighborGround, season);
497 const pixels = spritePixels(images[neighborName], pixelCache);
502 const pixels = spritePixels(images[neighborName], pixelCache);
498 if (!pixels)
503 if (!pixels)
client/src/render/worldView.js +93 −23
@@ -116,6 +116,14 @@ const WATER_GROUND_FRAG = [
116 116 "uniform float u_tileX;",
117 117 "uniform float u_tileY;",
118 118 "uniform float u_deep;",
119 "uniform float u_nbrDeepN;",
120 "uniform float u_nbrDeepE;",
121 "uniform float u_nbrDeepS;",
122 "uniform float u_nbrDeepW;",
123 "uniform float u_blendDeepN;",
124 "uniform float u_blendDeepE;",
125 "uniform float u_blendDeepS;",
126 "uniform float u_blendDeepW;",
119 127 "uniform float u_edgeN;",
120 128 "uniform float u_edgeE;",
121 129 "uniform float u_edgeS;",
@@ -154,23 +162,22 @@ const WATER_GROUND_FRAG = [
154 162 " dx -= d.x * qak * s;",
155 163 " dy -= d.y * qak * s;",
156 164 "}",
165 // Shore-normal traveling crest (foam line parallel to coast), not along-shore dots.
157 166 "void coastEdge(",
158 167 " float enabled, float dist, float along, float phaseOff, float useShore,",
159 168 " vec2 shoreNu, inout float foam, inout float shoreMix, inout vec3 shoreRgb",
160 169 ") {",
161 170 " 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) {",
171 " float n = vnoise(vec2(along * 1.1 + phaseOff, floor(u_time * 0.2) + phaseOff));",
172 " float frontWobble = 0.035 * sin(along * 6.28318 * 0.85 + phaseOff + u_time * 0.35);",
173 " float travel = fract(u_time * 0.32 + along * 0.12 + phaseOff * 0.07 + n * 0.25);",
174 " float crestDist = mix(0.30, 0.015, smoothstep(0.0, 0.72, travel)) + frontWobble;",
175 " float wash = smoothstep(0.72, 1.0, travel);",
176 " float line = exp(-pow((dist - crestDist) * 26.0, 2.0));",
177 " float sheet = (1.0 - smoothstep(0.0, crestDist + 0.05, dist)) * (1.0 - wash) * 0.22;",
178 " foam = max(foam, line * (0.75 + 0.25 * (1.0 - wash)) + sheet);",
179 " float retreat = wash * smoothstep(0.11, 0.0, dist);",
180 " if (retreat > 0.04 && useShore > 0.5 && u_hasShore > 0.5) {",
174 181 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
175 182 " vec4 shore = texture2D(u_secondary, shoreUv);",
176 183 " if (shore.a > 0.1) {",
@@ -190,17 +197,47 @@ const WATER_GROUND_FRAG = [
190 197 " float h = 0.0;",
191 198 " float dx = 0.0;",
192 199 " 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;",
200 // Cardinal + diagonal crossings so no single oval stretch dominates.
201 " gerstner(world, vec2(1.0, 0.0), 0.42, 0.20, 2.8, 1.05, t, h, dx, dy);",
202 " gerstner(world, vec2(0.0, 1.0), 0.42, 0.18, 2.6, 1.12, t, h, dx, dy);",
203 " gerstner(world, vec2(1.0, 0.35), 0.50, 0.16, 3.1, 1.18, t, h, dx, dy);",
204 " gerstner(world, vec2(-0.55, 1.0), 0.52, 0.15, 1.9, 1.48, t, h, dx, dy);",
205 " gerstner(world, vec2(0.75, -0.85), 0.40, 0.11, 1.1, 2.05, t, h, dx, dy);",
206 " gerstner(world, vec2(-0.95, -0.35), 0.45, 0.12, 1.55, 1.72, t, h, dx, dy);",
207 " gerstner(world, vec2(0.4, -1.0), 0.38, 0.09, 0.95, 2.25, t, h, dx, dy);",
208 " h += (nSlow - 0.5) * 0.10 + (nFine - 0.5) * 0.05 + (texN - 0.5) * 0.04;",
197 209 " float slopeLit = clamp(0.55 + dx * 0.55 + dy * 0.28, 0.0, 1.0);",
198 210 " float crest = smoothstep(0.12, 0.72, h);",
199 211 " 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);",
212 // Soft shallow↔deep blend toward water neighbors (full half-tile ramp).
213 " float deepMix = u_deep;",
214 " float blendW = 0.0;",
215 " float blendAcc = 0.0;",
216 " if (u_blendDeepN > 0.5) {",
217 " float w = smoothstep(0.5, 0.0, puv.y);",
218 " blendAcc += w * u_nbrDeepN; blendW += w;",
219 " }",
220 " if (u_blendDeepS > 0.5) {",
221 " float w = smoothstep(0.5, 0.0, 1.0 - puv.y);",
222 " blendAcc += w * u_nbrDeepS; blendW += w;",
223 " }",
224 " if (u_blendDeepW > 0.5) {",
225 " float w = smoothstep(0.5, 0.0, puv.x);",
226 " blendAcc += w * u_nbrDeepW; blendW += w;",
227 " }",
228 " if (u_blendDeepE > 0.5) {",
229 " float w = smoothstep(0.5, 0.0, 1.0 - puv.x);",
230 " blendAcc += w * u_nbrDeepE; blendW += w;",
231 " }",
232 " if (blendW > 0.001) {",
233 " float nbrDeep = clamp(blendAcc / blendW, 0.0, 1.0);",
234 " float w = clamp(blendW, 0.0, 1.0);",
235 " deepMix = mix(u_deep, nbrDeep, w);",
236 " }",
237 " vec3 shallowDeep = mix(vec3(0.16, 0.42, 0.62), vec3(0.09, 0.24, 0.40), deepMix);",
238 " vec3 shallowLit = mix(vec3(0.34, 0.66, 0.82), vec3(0.20, 0.45, 0.66), deepMix);",
239 " vec3 troughCol = mix(vec3(0.10, 0.28, 0.44), vec3(0.05, 0.14, 0.28), deepMix);",
240 " vec3 crestCol = mix(vec3(0.72, 0.88, 0.96), vec3(0.48, 0.70, 0.88), deepMix);",
204 241 " vec3 rgb = mix(shallowDeep, shallowLit, slopeLit);",
205 242 " rgb = mix(rgb, troughCol, trough * 0.85);",
206 243 " rgb = mix(rgb, crestCol, crest * (0.35 + 0.55 * slopeLit));",
@@ -3267,6 +3304,27 @@ export class WorldView
3267 3304 };
3268 3305 }
3269 3306
3307 /** Shallow↔deep edge blend: neighbor deepness only when both tiles are liquid water of different depth. */
3308 #waterDeepBlend (tileX, tileY, selfDeep)
3309 {
3310 const season = this.worldSeason;
3311 const self = selfDeep ? 1 : 0;
3312 const side = (x, y) =>
3313 {
3314 const typeId = this.#groundTypeAt(x, y);
3315 if (!isLiquidWaterGround(typeId, season))
3316 { return { deep: self, blend: 0 }; }
3317 const deep = typeId === GroundType.deepWater ? 1 : 0;
3318 return { deep, blend: deep !== self ? 1 : 0 };
3319 };
3320 return {
3321 n: side(tileX, tileY - 1),
3322 e: side(tileX + 1, tileY),
3323 s: side(tileX, tileY + 1),
3324 w: side(tileX - 1, tileY)
3325 };
3326 }
3327
3270 3328 /**
3271 3329 * Prefer a wet-shore (sand-wet) neighbor sprite for coast retreat peeks.
3272 3330 * @returns {{ sprite: object|null, edgeN: number, edgeE: number, edgeS: number, edgeW: number }}
@@ -3346,7 +3404,8 @@ export class WorldView
3346 3404 fallbackLit = 1,
3347 3405 tileX = 0,
3348 3406 tileY = 0,
3349 deep = false
3407 deep = false,
3408 deepBlend = null
3350 3409 } = {})
3351 3410 {
3352 3411 if (!object?.renderer)
@@ -3361,6 +3420,7 @@ export class WorldView
3361 3420 const shoreSprite = shore?.sprite ?? null;
3362 3421 const shoreUv = shoreSprite?.getUvRect?.(0)
3363 3422 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3423 const selfDeep = deep ? 1 : 0;
3364 3424 object._lit = true;
3365 3425 object.renderer.shader = getWaterGroundShader();
3366 3426 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
@@ -3373,7 +3433,15 @@ export class WorldView
3373 3433 u_time: timeSec,
3374 3434 u_tileX: tileX | 0,
3375 3435 u_tileY: tileY | 0,
3376 u_deep: deep ? 1 : 0,
3436 u_deep: selfDeep,
3437 u_nbrDeepN: deepBlend?.n?.deep ?? selfDeep,
3438 u_nbrDeepE: deepBlend?.e?.deep ?? selfDeep,
3439 u_nbrDeepS: deepBlend?.s?.deep ?? selfDeep,
3440 u_nbrDeepW: deepBlend?.w?.deep ?? selfDeep,
3441 u_blendDeepN: deepBlend?.n?.blend ?? 0,
3442 u_blendDeepE: deepBlend?.e?.blend ?? 0,
3443 u_blendDeepS: deepBlend?.s?.blend ?? 0,
3444 u_blendDeepW: deepBlend?.w?.blend ?? 0,
3377 3445 u_edgeN: edges?.n ?? 0,
3378 3446 u_edgeE: edges?.e ?? 0,
3379 3447 u_edgeS: edges?.s ?? 0,
@@ -3418,6 +3486,7 @@ export class WorldView
3418 3486 }
3419 3487 objects.waterEdges = this.#waterCoastEdges(objects.tileX, objects.tileY);
3420 3488 const shore = this.#waterCoastShore(objects.tileX, objects.tileY, objects.waterEdges);
3489 const deep = objects.groundTypeId === GroundType.deepWater;
3421 3490 this.#syncWaterGroundSprite(objects.ground, {
3422 3491 corners: litCorners,
3423 3492 ambientDark,
@@ -3427,7 +3496,8 @@ export class WorldView
3427 3496 fallbackLit,
3428 3497 tileX: objects.tileX,
3429 3498 tileY: objects.tileY,
3430 deep: objects.groundTypeId === GroundType.deepWater
3499 deep,
3500 deepBlend: this.#waterDeepBlend(objects.tileX, objects.tileY, deep)
3431 3501 });
3432 3502 }
3433 3503
@@ -116,6 +116,14 @@ const WATER_GROUND_FRAG = [
116 "uniform float u_tileX;",
116 "uniform float u_tileX;",
117 "uniform float u_tileY;",
117 "uniform float u_tileY;",
118 "uniform float u_deep;",
118 "uniform float u_deep;",
119 "uniform float u_nbrDeepN;",
120 "uniform float u_nbrDeepE;",
121 "uniform float u_nbrDeepS;",
122 "uniform float u_nbrDeepW;",
123 "uniform float u_blendDeepN;",
124 "uniform float u_blendDeepE;",
125 "uniform float u_blendDeepS;",
126 "uniform float u_blendDeepW;",
119 "uniform float u_edgeN;",
127 "uniform float u_edgeN;",
120 "uniform float u_edgeE;",
128 "uniform float u_edgeE;",
121 "uniform float u_edgeS;",
129 "uniform float u_edgeS;",
@@ -154,23 +162,22 @@ const WATER_GROUND_FRAG = [
154 " dx -= d.x * qak * s;",
162 " dx -= d.x * qak * s;",
155 " dy -= d.y * qak * s;",
163 " dy -= d.y * qak * s;",
156 "}",
164 "}",
165 // Shore-normal traveling crest (foam line parallel to coast), not along-shore dots.
157 "void coastEdge(",
166 "void coastEdge(",
158 " float enabled, float dist, float along, float phaseOff, float useShore,",
167 " float enabled, float dist, float along, float phaseOff, float useShore,",
159 " vec2 shoreNu, inout float foam, inout float shoreMix, inout vec3 shoreRgb",
168 " vec2 shoreNu, inout float foam, inout float shoreMix, inout vec3 shoreRgb",
160 ") {",
169 ") {",
161 " if (enabled < 0.5) { return; }",
170 " if (enabled < 0.5) { return; }",
162 " float n = vnoise(vec2(along * 3.0 + phaseOff, u_time * 0.15 + phaseOff * 0.2));",
171 " float n = vnoise(vec2(along * 1.1 + phaseOff, floor(u_time * 0.2) + phaseOff));",
163 " float k = 7.5;",
172 " float frontWobble = 0.035 * sin(along * 6.28318 * 0.85 + phaseOff + u_time * 0.35);",
164 " float theta = along * k - u_time * 2.15 + phaseOff + n * 1.8;",
173 " float travel = fract(u_time * 0.32 + along * 0.12 + phaseOff * 0.07 + n * 0.25);",
165 " float c = cos(theta);",
174 " float crestDist = mix(0.30, 0.015, smoothstep(0.0, 0.72, travel)) + frontWobble;",
166 " float steep = 0.72;",
175 " float wash = smoothstep(0.72, 1.0, travel);",
167 " float crest = (c + steep * c * c) / (1.0 + steep);",
176 " float line = exp(-pow((dist - crestDist) * 26.0, 2.0));",
168 " float runup = 0.08 + 0.14 * crest;",
177 " float sheet = (1.0 - smoothstep(0.0, crestDist + 0.05, dist)) * (1.0 - wash) * 0.22;",
169 " float front = smoothstep(runup + 0.05, runup - 0.02, dist);",
178 " foam = max(foam, line * (0.75 + 0.25 * (1.0 - wash)) + sheet);",
170 " float foamCrest = pow(max(0.0, crest), 2.2) * front;",
179 " float retreat = wash * smoothstep(0.11, 0.0, dist);",
171 " foam = max(foam, foamCrest * 0.95);",
180 " if (retreat > 0.04 && useShore > 0.5 && u_hasShore > 0.5) {",
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);",
181 " vec2 shoreUv = u_shoreUvRect.xy + shoreNu * (u_shoreUvRect.zw - u_shoreUvRect.xy);",
175 " vec4 shore = texture2D(u_secondary, shoreUv);",
182 " vec4 shore = texture2D(u_secondary, shoreUv);",
176 " if (shore.a > 0.1) {",
183 " if (shore.a > 0.1) {",
@@ -190,17 +197,47 @@ const WATER_GROUND_FRAG = [
190 " float h = 0.0;",
197 " float h = 0.0;",
191 " float dx = 0.0;",
198 " float dx = 0.0;",
192 " float dy = 0.0;",
199 " float dy = 0.0;",
193 " gerstner(world, vec2(1.0, 0.35), 0.55, 0.38, 3.2, 1.15, t, h, dx, dy);",
200 // Cardinal + diagonal crossings so no single oval stretch dominates.
194 " gerstner(world, vec2(-0.55, 1.0), 0.62, 0.26, 1.7, 1.55, t, h, dx, dy);",
201 " gerstner(world, vec2(1.0, 0.0), 0.42, 0.20, 2.8, 1.05, t, h, dx, dy);",
195 " gerstner(world, vec2(0.75, -0.85), 0.48, 0.14, 0.85, 2.35, t, h, dx, dy);",
202 " gerstner(world, vec2(0.0, 1.0), 0.42, 0.18, 2.6, 1.12, t, h, dx, dy);",
196 " h += (nSlow - 0.5) * 0.12 + (nFine - 0.5) * 0.06 + (texN - 0.5) * 0.05;",
203 " gerstner(world, vec2(1.0, 0.35), 0.50, 0.16, 3.1, 1.18, t, h, dx, dy);",
204 " gerstner(world, vec2(-0.55, 1.0), 0.52, 0.15, 1.9, 1.48, t, h, dx, dy);",
205 " gerstner(world, vec2(0.75, -0.85), 0.40, 0.11, 1.1, 2.05, t, h, dx, dy);",
206 " gerstner(world, vec2(-0.95, -0.35), 0.45, 0.12, 1.55, 1.72, t, h, dx, dy);",
207 " gerstner(world, vec2(0.4, -1.0), 0.38, 0.09, 0.95, 2.25, t, h, dx, dy);",
208 " h += (nSlow - 0.5) * 0.10 + (nFine - 0.5) * 0.05 + (texN - 0.5) * 0.04;",
197 " float slopeLit = clamp(0.55 + dx * 0.55 + dy * 0.28, 0.0, 1.0);",
209 " float slopeLit = clamp(0.55 + dx * 0.55 + dy * 0.28, 0.0, 1.0);",
198 " float crest = smoothstep(0.12, 0.72, h);",
210 " float crest = smoothstep(0.12, 0.72, h);",
199 " float trough = smoothstep(-0.05, -0.65, h);",
211 " 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);",
212 // Soft shallow↔deep blend toward water neighbors (full half-tile ramp).
201 " vec3 shallowLit = mix(vec3(0.34, 0.66, 0.82), vec3(0.20, 0.45, 0.66), u_deep);",
213 " float deepMix = u_deep;",
202 " vec3 troughCol = mix(vec3(0.10, 0.28, 0.44), vec3(0.05, 0.14, 0.28), u_deep);",
214 " float blendW = 0.0;",
203 " vec3 crestCol = mix(vec3(0.72, 0.88, 0.96), vec3(0.48, 0.70, 0.88), u_deep);",
215 " float blendAcc = 0.0;",
216 " if (u_blendDeepN > 0.5) {",
217 " float w = smoothstep(0.5, 0.0, puv.y);",
218 " blendAcc += w * u_nbrDeepN; blendW += w;",
219 " }",
220 " if (u_blendDeepS > 0.5) {",
221 " float w = smoothstep(0.5, 0.0, 1.0 - puv.y);",
222 " blendAcc += w * u_nbrDeepS; blendW += w;",
223 " }",
224 " if (u_blendDeepW > 0.5) {",
225 " float w = smoothstep(0.5, 0.0, puv.x);",
226 " blendAcc += w * u_nbrDeepW; blendW += w;",
227 " }",
228 " if (u_blendDeepE > 0.5) {",
229 " float w = smoothstep(0.5, 0.0, 1.0 - puv.x);",
230 " blendAcc += w * u_nbrDeepE; blendW += w;",
231 " }",
232 " if (blendW > 0.001) {",
233 " float nbrDeep = clamp(blendAcc / blendW, 0.0, 1.0);",
234 " float w = clamp(blendW, 0.0, 1.0);",
235 " deepMix = mix(u_deep, nbrDeep, w);",
236 " }",
237 " vec3 shallowDeep = mix(vec3(0.16, 0.42, 0.62), vec3(0.09, 0.24, 0.40), deepMix);",
238 " vec3 shallowLit = mix(vec3(0.34, 0.66, 0.82), vec3(0.20, 0.45, 0.66), deepMix);",
239 " vec3 troughCol = mix(vec3(0.10, 0.28, 0.44), vec3(0.05, 0.14, 0.28), deepMix);",
240 " vec3 crestCol = mix(vec3(0.72, 0.88, 0.96), vec3(0.48, 0.70, 0.88), deepMix);",
204 " vec3 rgb = mix(shallowDeep, shallowLit, slopeLit);",
241 " vec3 rgb = mix(shallowDeep, shallowLit, slopeLit);",
205 " rgb = mix(rgb, troughCol, trough * 0.85);",
242 " rgb = mix(rgb, troughCol, trough * 0.85);",
206 " rgb = mix(rgb, crestCol, crest * (0.35 + 0.55 * slopeLit));",
243 " rgb = mix(rgb, crestCol, crest * (0.35 + 0.55 * slopeLit));",
@@ -3267,6 +3304,27 @@ export class WorldView
3267 };
3304 };
3268 }
3305 }
3269
3306
3307 /** Shallow↔deep edge blend: neighbor deepness only when both tiles are liquid water of different depth. */
3308 #waterDeepBlend (tileX, tileY, selfDeep)
3309 {
3310 const season = this.worldSeason;
3311 const self = selfDeep ? 1 : 0;
3312 const side = (x, y) =>
3313 {
3314 const typeId = this.#groundTypeAt(x, y);
3315 if (!isLiquidWaterGround(typeId, season))
3316 { return { deep: self, blend: 0 }; }
3317 const deep = typeId === GroundType.deepWater ? 1 : 0;
3318 return { deep, blend: deep !== self ? 1 : 0 };
3319 };
3320 return {
3321 n: side(tileX, tileY - 1),
3322 e: side(tileX + 1, tileY),
3323 s: side(tileX, tileY + 1),
3324 w: side(tileX - 1, tileY)
3325 };
3326 }
3327
3270 /**
3328 /**
3271 * Prefer a wet-shore (sand-wet) neighbor sprite for coast retreat peeks.
3329 * Prefer a wet-shore (sand-wet) neighbor sprite for coast retreat peeks.
3272 * @returns {{ sprite: object|null, edgeN: number, edgeE: number, edgeS: number, edgeW: number }}
3330 * @returns {{ sprite: object|null, edgeN: number, edgeE: number, edgeS: number, edgeW: number }}
@@ -3346,7 +3404,8 @@ export class WorldView
3346 fallbackLit = 1,
3404 fallbackLit = 1,
3347 tileX = 0,
3405 tileX = 0,
3348 tileY = 0,
3406 tileY = 0,
3349 deep = false
3407 deep = false,
3408 deepBlend = null
3350 } = {})
3409 } = {})
3351 {
3410 {
3352 if (!object?.renderer)
3411 if (!object?.renderer)
@@ -3361,6 +3420,7 @@ export class WorldView
3361 const shoreSprite = shore?.sprite ?? null;
3420 const shoreSprite = shore?.sprite ?? null;
3362 const shoreUv = shoreSprite?.getUvRect?.(0)
3421 const shoreUv = shoreSprite?.getUvRect?.(0)
3363 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3422 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3423 const selfDeep = deep ? 1 : 0;
3364 object._lit = true;
3424 object._lit = true;
3365 object.renderer.shader = getWaterGroundShader();
3425 object.renderer.shader = getWaterGroundShader();
3366 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
3426 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
@@ -3373,7 +3433,15 @@ export class WorldView
3373 u_time: timeSec,
3433 u_time: timeSec,
3374 u_tileX: tileX | 0,
3434 u_tileX: tileX | 0,
3375 u_tileY: tileY | 0,
3435 u_tileY: tileY | 0,
3376 u_deep: deep ? 1 : 0,
3436 u_deep: selfDeep,
3437 u_nbrDeepN: deepBlend?.n?.deep ?? selfDeep,
3438 u_nbrDeepE: deepBlend?.e?.deep ?? selfDeep,
3439 u_nbrDeepS: deepBlend?.s?.deep ?? selfDeep,
3440 u_nbrDeepW: deepBlend?.w?.deep ?? selfDeep,
3441 u_blendDeepN: deepBlend?.n?.blend ?? 0,
3442 u_blendDeepE: deepBlend?.e?.blend ?? 0,
3443 u_blendDeepS: deepBlend?.s?.blend ?? 0,
3444 u_blendDeepW: deepBlend?.w?.blend ?? 0,
3377 u_edgeN: edges?.n ?? 0,
3445 u_edgeN: edges?.n ?? 0,
3378 u_edgeE: edges?.e ?? 0,
3446 u_edgeE: edges?.e ?? 0,
3379 u_edgeS: edges?.s ?? 0,
3447 u_edgeS: edges?.s ?? 0,
@@ -3418,6 +3486,7 @@ export class WorldView
3418 }
3486 }
3419 objects.waterEdges = this.#waterCoastEdges(objects.tileX, objects.tileY);
3487 objects.waterEdges = this.#waterCoastEdges(objects.tileX, objects.tileY);
3420 const shore = this.#waterCoastShore(objects.tileX, objects.tileY, objects.waterEdges);
3488 const shore = this.#waterCoastShore(objects.tileX, objects.tileY, objects.waterEdges);
3489 const deep = objects.groundTypeId === GroundType.deepWater;
3421 this.#syncWaterGroundSprite(objects.ground, {
3490 this.#syncWaterGroundSprite(objects.ground, {
3422 corners: litCorners,
3491 corners: litCorners,
3423 ambientDark,
3492 ambientDark,
@@ -3427,7 +3496,8 @@ export class WorldView
3427 fallbackLit,
3496 fallbackLit,
3428 tileX: objects.tileX,
3497 tileX: objects.tileX,
3429 tileY: objects.tileY,
3498 tileY: objects.tileY,
3430 deep: objects.groundTypeId === GroundType.deepWater
3499 deep,
3500 deepBlend: this.#waterDeepBlend(objects.tileX, objects.tileY, deep)
3431 });
3501 });
3432 }
3502 }
3433
3503
shared/render/chunkAtlasKeys.js +4 −0
@@ -223,6 +223,10 @@ function softBorderGroundFingerprint ({
223 223 const neighborKey = groundVisualKey(catalog, neighbor, season);
224 224 if (neighborKey === selfKey)
225 225 { continue; }
226 const nbrTypeId = normalizeGround(neighbor).typeId;
227 const nbrDef = GROUND_DEFINITIONS[nbrTypeId];
228 if (nbrDef?.proceduralWaves || isLiquidWaterGround(nbrTypeId, season))
229 { continue; }
226 230 parts.push(`${tileX},${tileY}:${ndx},${ndy}:${neighborKey}`);
227 231 }
228 232 }
@@ -223,6 +223,10 @@ function softBorderGroundFingerprint ({
223 const neighborKey = groundVisualKey(catalog, neighbor, season);
223 const neighborKey = groundVisualKey(catalog, neighbor, season);
224 if (neighborKey === selfKey)
224 if (neighborKey === selfKey)
225 { continue; }
225 { continue; }
226 const nbrTypeId = normalizeGround(neighbor).typeId;
227 const nbrDef = GROUND_DEFINITIONS[nbrTypeId];
228 if (nbrDef?.proceduralWaves || isLiquidWaterGround(nbrTypeId, season))
229 { continue; }
226 parts.push(`${tileX},${tileY}:${ndx},${ndy}:${neighborKey}`);
230 parts.push(`${tileX},${tileY}:${ndx},${ndy}:${neighborKey}`);
227 }
231 }
228 }
232 }