BlueGit

timfa questward

Perf: cache fluid coasts and skip redundant atlas CPU work.

Coast/shore/deep topology only recomputes after chunk bake; edge uniforms
skip once statics are primed. Atlas layout/NEAREST/hide no longer repeat
every frame. Look unchanged — still full per-frame 16×16 atlas redraw.

timfa Tim Falken · pushed by timfa

Authored 2026-09-13 · 2 months ago

Hash
0e64e1dbd0920126411ba6444df971865fb44d0d
Parent
7dce801a
1 file changed +108 −32
client/src/render/worldView.js +108 −32
@@ -1067,6 +1067,8 @@ export class WorldView
1067 1067 #placeSizeScratch = new vector(0, 0);
1068 1068 /** When true, water/lava shade into per-chunk 16×16 atlases (set false if FBO init fails). */
1069 1069 #useFluidAtlas = true;
1070 /** Bumped on chunk bake / season change — invalidates cached fluid coast topology. */
1071 #fluidCoastEpoch = 0;
1070 1072
1071 1073 constructor(game, scene, catalog = { grounds: {}, blocks: {} })
1072 1074 {
@@ -3692,6 +3694,7 @@ export class WorldView
3692 3694 {
3693 3695 renderer.shaderUniforms = {};
3694 3696 renderer._shaderUniformKind = kind;
3697 renderer._fluidStaticsReady = false;
3695 3698 // Static water/lava tune uniforms — apply once per kind, not every frame.
3696 3699 if (kind === "water")
3697 3700 { Object.assign(renderer.shaderUniforms, waterDebugUniforms()); }
@@ -4100,7 +4103,8 @@ export class WorldView
4100 4103 fallbackLit = 1,
4101 4104 tileX = 0,
4102 4105 tileY = 0,
4103 deepCorners = null
4106 deepCorners = null,
4107 staticsDirty = true
4104 4108 } = {})
4105 4109 {
4106 4110 if (!object?.renderer)
@@ -4112,6 +4116,17 @@ export class WorldView
4112 4116 se: fallbackLit
4113 4117 };
4114 4118 const dark = Math.min(1, Math.max(0, ambientDark ?? 0));
4119 object._lit = true;
4120 const uniforms = this.#ensureUniformBag(object.renderer, getWaterGroundShader(), "water");
4121 // Dynamic every frame: time + lighting.
4122 uniforms.u_ambientDark = dark;
4123 uniforms.u_litNW = lit.nw;
4124 uniforms.u_litNE = lit.ne;
4125 uniforms.u_litSW = lit.sw;
4126 uniforms.u_litSE = lit.se;
4127 uniforms.u_time = timeSec;
4128 if (!staticsDirty && object.renderer._fluidStaticsReady)
4129 { return; }
4115 4130 const shoreSprite = shore?.sprite ?? null;
4116 4131 const shoreUv = shoreSprite?.getUvRect?.(0)
4117 4132 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
@@ -4119,19 +4134,11 @@ export class WorldView
4119 4134 const dNE = deepCorners?.ne ?? 0;
4120 4135 const dSW = deepCorners?.sw ?? 0;
4121 4136 const dSE = deepCorners?.se ?? 0;
4122 object._lit = true;
4123 4137 // Shallow + deep share one noise atlas so texAmp seams don't hard-cut at depth edges.
4124 4138 const sharedNoise = this.game.images[spriteImageName("ground", "water", "water")];
4125 4139 if (sharedNoise)
4126 4140 { object.renderer.sprite = sharedNoise; }
4127 4141 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4128 const uniforms = this.#ensureUniformBag(object.renderer, getWaterGroundShader(), "water");
4129 uniforms.u_ambientDark = dark;
4130 uniforms.u_litNW = lit.nw;
4131 uniforms.u_litNE = lit.ne;
4132 uniforms.u_litSW = lit.sw;
4133 uniforms.u_litSE = lit.se;
4134 uniforms.u_time = timeSec;
4135 4142 uniforms.u_tileX = tileX | 0;
4136 4143 uniforms.u_tileY = tileY | 0;
4137 4144 uniforms.u_deepNW = dNW;
@@ -4156,6 +4163,7 @@ export class WorldView
4156 4163 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4157 4164 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4158 4165 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4166 object.renderer._fluidStaticsReady = true;
4159 4167 }
4160 4168
4161 4169 /** Liquid water gets coast foam; frozen shallow ice uses the normal lit sprite. Lava is procedural heat. */
@@ -4194,19 +4202,19 @@ export class WorldView
4194 4202 else
4195 4203 { litCorners = this.#tileLitCorners(chunkBaked, localX, localY); }
4196 4204 }
4197 objects.waterEdges = this.#waterCoastEdges(objects.tileX, objects.tileY);
4198 const shore = this.#waterCoastShore(objects.tileX, objects.tileY, objects.waterEdges);
4199 const deep = objects.groundTypeId === GroundType.deepWater;
4205 const coast = this.#cachedWaterCoast(objects);
4206 objects.waterEdges = coast.edges;
4200 4207 this.#syncWaterGroundSprite(objects.ground, {
4201 4208 corners: litCorners,
4202 4209 ambientDark,
4203 edges: objects.waterEdges,
4204 shore,
4210 edges: coast.edges,
4211 shore: coast.shore,
4205 4212 timeSec,
4206 4213 fallbackLit,
4207 4214 tileX: objects.tileX,
4208 4215 tileY: objects.tileY,
4209 deepCorners: this.#waterDeepCorners(objects.tileX, objects.tileY, deep)
4216 deepCorners: coast.deepCorners,
4217 staticsDirty: coast.staticsDirty
4210 4218 });
4211 4219 }
4212 4220
@@ -4287,26 +4295,27 @@ export class WorldView
4287 4295 else
4288 4296 { litCorners = this.#tileLitCorners(chunkBaked, localX, localY); }
4289 4297 }
4290 const edges = this.#lavaCoastEdges(objects.tileX, objects.tileY);
4291 const shore = this.#fluidCoastShore(objects.tileX, objects.tileY, edges, { preferWet: false });
4298 const coast = this.#cachedLavaCoast(objects);
4292 4299 this.#syncLavaGroundSprite(objects.ground, {
4293 4300 corners: litCorners,
4294 4301 ambientDark,
4295 edges,
4296 shore,
4302 edges: coast.edges,
4303 shore: coast.shore,
4297 4304 timeSec,
4298 4305 fallbackLit,
4299 4306 tileX: objects.tileX,
4300 tileY: objects.tileY
4307 tileY: objects.tileY,
4308 staticsDirty: coast.staticsDirty
4301 4309 });
4302 4310 const bloom = this.#ensureLavaBloom(objects);
4303 4311 if (bloom)
4304 4312 {
4305 4313 this.#syncLavaBloomSprite(bloom, {
4306 edges,
4314 edges: coast.edges,
4307 4315 timeSec,
4308 4316 tileX: objects.tileX,
4309 tileY: objects.tileY
4317 tileY: objects.tileY,
4318 staticsDirty: coast.staticsDirty
4310 4319 });
4311 4320 }
4312 4321 }
@@ -4319,7 +4328,8 @@ export class WorldView
4319 4328 timeSec = 0,
4320 4329 fallbackLit = 1,
4321 4330 tileX = 0,
4322 tileY = 0
4331 tileY = 0,
4332 staticsDirty = true
4323 4333 } = {})
4324 4334 {
4325 4335 if (!object?.renderer)
@@ -4331,11 +4341,7 @@ export class WorldView
4331 4341 se: fallbackLit
4332 4342 };
4333 4343 const dark = Math.min(1, Math.max(0, ambientDark ?? 0));
4334 const shoreSprite = shore?.sprite ?? null;
4335 const shoreUv = shoreSprite?.getUvRect?.(0)
4336 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4337 4344 object._lit = true;
4338 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4339 4345 const uniforms = this.#ensureUniformBag(object.renderer, getLavaGroundShader(), "lava");
4340 4346 uniforms.u_ambientDark = dark;
4341 4347 uniforms.u_litNW = lit.nw;
@@ -4343,6 +4349,12 @@ export class WorldView
4343 4349 uniforms.u_litSW = lit.sw;
4344 4350 uniforms.u_litSE = lit.se;
4345 4351 uniforms.u_time = timeSec;
4352 if (!staticsDirty && object.renderer._fluidStaticsReady)
4353 { return; }
4354 const shoreSprite = shore?.sprite ?? null;
4355 const shoreUv = shoreSprite?.getUvRect?.(0)
4356 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4357 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4346 4358 uniforms.u_tileX = tileX | 0;
4347 4359 uniforms.u_tileY = tileY | 0;
4348 4360 uniforms.u_edgeN = edges?.n ?? 0;
@@ -4363,19 +4375,23 @@ export class WorldView
4363 4375 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4364 4376 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4365 4377 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4378 object.renderer._fluidStaticsReady = true;
4366 4379 }
4367 4380
4368 4381 #syncLavaBloomSprite (object, {
4369 4382 edges = null,
4370 4383 timeSec = 0,
4371 4384 tileX = 0,
4372 tileY = 0
4385 tileY = 0,
4386 staticsDirty = true
4373 4387 } = {})
4374 4388 {
4375 4389 if (!object?.renderer)
4376 4390 { return; }
4377 4391 const uniforms = this.#ensureUniformBag(object.renderer, getLavaBloomShader(), "lavaBloom");
4378 4392 uniforms.u_time = timeSec;
4393 if (!staticsDirty && object.renderer._fluidStaticsReady)
4394 { return; }
4379 4395 uniforms.u_tileX = tileX | 0;
4380 4396 uniforms.u_tileY = tileY | 0;
4381 4397 uniforms.u_edgeN = edges?.n ?? 0;
@@ -4386,6 +4402,56 @@ export class WorldView
4386 4402 uniforms.u_edgeNW = edges?.nw ?? 0;
4387 4403 uniforms.u_edgeSE = edges?.se ?? 0;
4388 4404 uniforms.u_edgeSW = edges?.sw ?? 0;
4405 object.renderer._fluidStaticsReady = true;
4406 }
4407
4408
4409 #cachedWaterCoast (objects)
4410 {
4411 const epoch = this.#fluidCoastEpoch;
4412 const typeId = objects.groundTypeId;
4413 const season = this.worldSeason;
4414 const cache = objects._fluidCoastCache;
4415 if (
4416 cache
4417 && cache.epoch === epoch
4418 && cache.typeId === typeId
4419 && cache.season === season
4420 && cache.kind === "water"
4421 )
4422 { return { edges: cache.edges, shore: cache.shore, deepCorners: cache.deepCorners, staticsDirty: false }; }
4423 const edges = this.#waterCoastEdges(objects.tileX, objects.tileY);
4424 const shore = this.#waterCoastShore(objects.tileX, objects.tileY, edges);
4425 const deep = typeId === GroundType.deepWater;
4426 const deepCorners = this.#waterDeepCorners(objects.tileX, objects.tileY, deep);
4427 objects._fluidCoastCache = { epoch, typeId, season, kind: "water", edges, shore, deepCorners };
4428 if (objects.ground?.renderer)
4429 { objects.ground.renderer._fluidStaticsReady = false; }
4430 return { edges, shore, deepCorners, staticsDirty: true };
4431 }
4432
4433 #cachedLavaCoast (objects)
4434 {
4435 const epoch = this.#fluidCoastEpoch;
4436 const typeId = objects.groundTypeId;
4437 const season = this.worldSeason;
4438 const cache = objects._fluidCoastCache;
4439 if (
4440 cache
4441 && cache.epoch === epoch
4442 && cache.typeId === typeId
4443 && cache.season === season
4444 && cache.kind === "lava"
4445 )
4446 { return { edges: cache.edges, shore: cache.shore, staticsDirty: false }; }
4447 const edges = this.#lavaCoastEdges(objects.tileX, objects.tileY);
4448 const shore = this.#fluidCoastShore(objects.tileX, objects.tileY, edges, { preferWet: false });
4449 objects._fluidCoastCache = { epoch, typeId, season, kind: "lava", edges, shore, deepCorners: null };
4450 if (objects.ground?.renderer)
4451 { objects.ground.renderer._fluidStaticsReady = false; }
4452 if (objects.lavaBloom?.renderer)
4453 { objects.lavaBloom.renderer._fluidStaticsReady = false; }
4454 return { edges, shore, staticsDirty: true };
4389 4455 }
4390 4456
4391 4457 #tileUsesFluidAtlas (objects)
@@ -4439,6 +4505,10 @@ export class WorldView
4439 4505 if (!object || baked.chunkX == null || baked.chunkY == null)
4440 4506 { return; }
4441 4507 const size = this.tileSize();
4508 const layoutKey = `${baked.chunkX},${baked.chunkY},${size},${kind}`;
4509 if (baked._fluidLayoutKey === layoutKey && object.renderer?.mirrorY)
4510 { return; }
4511 baked._fluidLayoutKey = layoutKey;
4442 4512 const left = baked.chunkX * CHUNK_SIZE * size;
4443 4513 const top = baked.chunkY * CHUNK_SIZE * size;
4444 4514 const chunkPx = CHUNK_SIZE * size;
@@ -4494,8 +4564,12 @@ export class WorldView
4494 4564 if (!this.#tileUsesFluidAtlas(objects))
4495 4565 { continue; }
4496 4566 // Hide per-tile fluid sprites (keep objects + uniforms for atlas + lighting data).
4497 this.#setRendererVisible(objects.ground, false);
4498 this.#setRendererVisible(objects.lavaBloom, false);
4567 if (!objects._fluidAtlasHidden)
4568 {
4569 this.#setRendererVisible(objects.ground, false);
4570 this.#setRendererVisible(objects.lavaBloom, false);
4571 objects._fluidAtlasHidden = true;
4572 }
4499 4573 if (objects._inViewport === false)
4500 4574 { continue; }
4501 4575 const key = `${objects.chunkX},${objects.chunkY}`;
@@ -4533,6 +4607,7 @@ export class WorldView
4533 4607 for (const objects of tileObjects)
4534 4608 {
4535 4609 const vis = objects._inViewport !== false;
4610 objects._fluidAtlasHidden = false;
4536 4611 this.#setRendererVisible(objects.ground, vis);
4537 4612 this.#setRendererVisible(objects.lavaBloom, vis && this.bloomEnabled);
4538 4613 }
@@ -4573,7 +4648,6 @@ export class WorldView
4573 4648 });
4574 4649 this.#layoutFluidAtlasObject(baked, "ground");
4575 4650 this.#setRendererVisible(groundSlot.object, true);
4576 setNearestFilter(this.scene, groundSlot.target.canvas);
4577 4651
4578 4652 if (!bloomTiles.length || !this.bloomEnabled)
4579 4653 {
@@ -4609,7 +4683,6 @@ export class WorldView
4609 4683 });
4610 4684 this.#layoutFluidAtlasObject(baked, "bloom");
4611 4685 this.#setRendererVisible(bloomSlot.object, true);
4612 setNearestFilter(this.scene, bloomSlot.target.canvas);
4613 4686 }
4614 4687
4615 4688 #ambientDarkness ()
@@ -5191,6 +5264,7 @@ export class WorldView
5191 5264
5192 5265 #bakeAndPlaceChunk (snapshot)
5193 5266 {
5267 this.#fluidCoastEpoch = (this.#fluidCoastEpoch + 1) | 0;
5194 5268 const key = `${snapshot.chunkX},${snapshot.chunkY}`;
5195 5269 const atlases = bakeChunkAtlases({
5196 5270 snapshot,
@@ -5711,6 +5785,8 @@ export class WorldView
5711 5785 this.#clearLavaBloom(objects);
5712 5786 objects.groundTypeId = null;
5713 5787 objects.waterEdges = null;
5788 objects._fluidCoastCache = null;
5789 objects._fluidAtlasHidden = false;
5714 5790 }
5715 5791
5716 5792 let blockSource = snapshot.blocks[index];
@@ -1067,6 +1067,8 @@ export class WorldView
1067 #placeSizeScratch = new vector(0, 0);
1067 #placeSizeScratch = new vector(0, 0);
1068 /** When true, water/lava shade into per-chunk 16×16 atlases (set false if FBO init fails). */
1068 /** When true, water/lava shade into per-chunk 16×16 atlases (set false if FBO init fails). */
1069 #useFluidAtlas = true;
1069 #useFluidAtlas = true;
1070 /** Bumped on chunk bake / season change — invalidates cached fluid coast topology. */
1071 #fluidCoastEpoch = 0;
1070
1072
1071 constructor(game, scene, catalog = { grounds: {}, blocks: {} })
1073 constructor(game, scene, catalog = { grounds: {}, blocks: {} })
1072 {
1074 {
@@ -3692,6 +3694,7 @@ export class WorldView
3692 {
3694 {
3693 renderer.shaderUniforms = {};
3695 renderer.shaderUniforms = {};
3694 renderer._shaderUniformKind = kind;
3696 renderer._shaderUniformKind = kind;
3697 renderer._fluidStaticsReady = false;
3695 // Static water/lava tune uniforms — apply once per kind, not every frame.
3698 // Static water/lava tune uniforms — apply once per kind, not every frame.
3696 if (kind === "water")
3699 if (kind === "water")
3697 { Object.assign(renderer.shaderUniforms, waterDebugUniforms()); }
3700 { Object.assign(renderer.shaderUniforms, waterDebugUniforms()); }
@@ -4100,7 +4103,8 @@ export class WorldView
4100 fallbackLit = 1,
4103 fallbackLit = 1,
4101 tileX = 0,
4104 tileX = 0,
4102 tileY = 0,
4105 tileY = 0,
4103 deepCorners = null
4106 deepCorners = null,
4107 staticsDirty = true
4104 } = {})
4108 } = {})
4105 {
4109 {
4106 if (!object?.renderer)
4110 if (!object?.renderer)
@@ -4112,6 +4116,17 @@ export class WorldView
4112 se: fallbackLit
4116 se: fallbackLit
4113 };
4117 };
4114 const dark = Math.min(1, Math.max(0, ambientDark ?? 0));
4118 const dark = Math.min(1, Math.max(0, ambientDark ?? 0));
4119 object._lit = true;
4120 const uniforms = this.#ensureUniformBag(object.renderer, getWaterGroundShader(), "water");
4121 // Dynamic every frame: time + lighting.
4122 uniforms.u_ambientDark = dark;
4123 uniforms.u_litNW = lit.nw;
4124 uniforms.u_litNE = lit.ne;
4125 uniforms.u_litSW = lit.sw;
4126 uniforms.u_litSE = lit.se;
4127 uniforms.u_time = timeSec;
4128 if (!staticsDirty && object.renderer._fluidStaticsReady)
4129 { return; }
4115 const shoreSprite = shore?.sprite ?? null;
4130 const shoreSprite = shore?.sprite ?? null;
4116 const shoreUv = shoreSprite?.getUvRect?.(0)
4131 const shoreUv = shoreSprite?.getUvRect?.(0)
4117 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4132 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
@@ -4119,19 +4134,11 @@ export class WorldView
4119 const dNE = deepCorners?.ne ?? 0;
4134 const dNE = deepCorners?.ne ?? 0;
4120 const dSW = deepCorners?.sw ?? 0;
4135 const dSW = deepCorners?.sw ?? 0;
4121 const dSE = deepCorners?.se ?? 0;
4136 const dSE = deepCorners?.se ?? 0;
4122 object._lit = true;
4123 // Shallow + deep share one noise atlas so texAmp seams don't hard-cut at depth edges.
4137 // Shallow + deep share one noise atlas so texAmp seams don't hard-cut at depth edges.
4124 const sharedNoise = this.game.images[spriteImageName("ground", "water", "water")];
4138 const sharedNoise = this.game.images[spriteImageName("ground", "water", "water")];
4125 if (sharedNoise)
4139 if (sharedNoise)
4126 { object.renderer.sprite = sharedNoise; }
4140 { object.renderer.sprite = sharedNoise; }
4127 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4141 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4128 const uniforms = this.#ensureUniformBag(object.renderer, getWaterGroundShader(), "water");
4129 uniforms.u_ambientDark = dark;
4130 uniforms.u_litNW = lit.nw;
4131 uniforms.u_litNE = lit.ne;
4132 uniforms.u_litSW = lit.sw;
4133 uniforms.u_litSE = lit.se;
4134 uniforms.u_time = timeSec;
4135 uniforms.u_tileX = tileX | 0;
4142 uniforms.u_tileX = tileX | 0;
4136 uniforms.u_tileY = tileY | 0;
4143 uniforms.u_tileY = tileY | 0;
4137 uniforms.u_deepNW = dNW;
4144 uniforms.u_deepNW = dNW;
@@ -4156,6 +4163,7 @@ export class WorldView
4156 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4163 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4157 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4164 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4158 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4165 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4166 object.renderer._fluidStaticsReady = true;
4159 }
4167 }
4160
4168
4161 /** Liquid water gets coast foam; frozen shallow ice uses the normal lit sprite. Lava is procedural heat. */
4169 /** Liquid water gets coast foam; frozen shallow ice uses the normal lit sprite. Lava is procedural heat. */
@@ -4194,19 +4202,19 @@ export class WorldView
4194 else
4202 else
4195 { litCorners = this.#tileLitCorners(chunkBaked, localX, localY); }
4203 { litCorners = this.#tileLitCorners(chunkBaked, localX, localY); }
4196 }
4204 }
4197 objects.waterEdges = this.#waterCoastEdges(objects.tileX, objects.tileY);
4205 const coast = this.#cachedWaterCoast(objects);
4198 const shore = this.#waterCoastShore(objects.tileX, objects.tileY, objects.waterEdges);
4206 objects.waterEdges = coast.edges;
4199 const deep = objects.groundTypeId === GroundType.deepWater;
4200 this.#syncWaterGroundSprite(objects.ground, {
4207 this.#syncWaterGroundSprite(objects.ground, {
4201 corners: litCorners,
4208 corners: litCorners,
4202 ambientDark,
4209 ambientDark,
4203 edges: objects.waterEdges,
4210 edges: coast.edges,
4204 shore,
4211 shore: coast.shore,
4205 timeSec,
4212 timeSec,
4206 fallbackLit,
4213 fallbackLit,
4207 tileX: objects.tileX,
4214 tileX: objects.tileX,
4208 tileY: objects.tileY,
4215 tileY: objects.tileY,
4209 deepCorners: this.#waterDeepCorners(objects.tileX, objects.tileY, deep)
4216 deepCorners: coast.deepCorners,
4217 staticsDirty: coast.staticsDirty
4210 });
4218 });
4211 }
4219 }
4212
4220
@@ -4287,26 +4295,27 @@ export class WorldView
4287 else
4295 else
4288 { litCorners = this.#tileLitCorners(chunkBaked, localX, localY); }
4296 { litCorners = this.#tileLitCorners(chunkBaked, localX, localY); }
4289 }
4297 }
4290 const edges = this.#lavaCoastEdges(objects.tileX, objects.tileY);
4298 const coast = this.#cachedLavaCoast(objects);
4291 const shore = this.#fluidCoastShore(objects.tileX, objects.tileY, edges, { preferWet: false });
4292 this.#syncLavaGroundSprite(objects.ground, {
4299 this.#syncLavaGroundSprite(objects.ground, {
4293 corners: litCorners,
4300 corners: litCorners,
4294 ambientDark,
4301 ambientDark,
4295 edges,
4302 edges: coast.edges,
4296 shore,
4303 shore: coast.shore,
4297 timeSec,
4304 timeSec,
4298 fallbackLit,
4305 fallbackLit,
4299 tileX: objects.tileX,
4306 tileX: objects.tileX,
4300 tileY: objects.tileY
4307 tileY: objects.tileY,
4308 staticsDirty: coast.staticsDirty
4301 });
4309 });
4302 const bloom = this.#ensureLavaBloom(objects);
4310 const bloom = this.#ensureLavaBloom(objects);
4303 if (bloom)
4311 if (bloom)
4304 {
4312 {
4305 this.#syncLavaBloomSprite(bloom, {
4313 this.#syncLavaBloomSprite(bloom, {
4306 edges,
4314 edges: coast.edges,
4307 timeSec,
4315 timeSec,
4308 tileX: objects.tileX,
4316 tileX: objects.tileX,
4309 tileY: objects.tileY
4317 tileY: objects.tileY,
4318 staticsDirty: coast.staticsDirty
4310 });
4319 });
4311 }
4320 }
4312 }
4321 }
@@ -4319,7 +4328,8 @@ export class WorldView
4319 timeSec = 0,
4328 timeSec = 0,
4320 fallbackLit = 1,
4329 fallbackLit = 1,
4321 tileX = 0,
4330 tileX = 0,
4322 tileY = 0
4331 tileY = 0,
4332 staticsDirty = true
4323 } = {})
4333 } = {})
4324 {
4334 {
4325 if (!object?.renderer)
4335 if (!object?.renderer)
@@ -4331,11 +4341,7 @@ export class WorldView
4331 se: fallbackLit
4341 se: fallbackLit
4332 };
4342 };
4333 const dark = Math.min(1, Math.max(0, ambientDark ?? 0));
4343 const dark = Math.min(1, Math.max(0, ambientDark ?? 0));
4334 const shoreSprite = shore?.sprite ?? null;
4335 const shoreUv = shoreSprite?.getUvRect?.(0)
4336 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4337 object._lit = true;
4344 object._lit = true;
4338 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4339 const uniforms = this.#ensureUniformBag(object.renderer, getLavaGroundShader(), "lava");
4345 const uniforms = this.#ensureUniformBag(object.renderer, getLavaGroundShader(), "lava");
4340 uniforms.u_ambientDark = dark;
4346 uniforms.u_ambientDark = dark;
4341 uniforms.u_litNW = lit.nw;
4347 uniforms.u_litNW = lit.nw;
@@ -4343,6 +4349,12 @@ export class WorldView
4343 uniforms.u_litSW = lit.sw;
4349 uniforms.u_litSW = lit.sw;
4344 uniforms.u_litSE = lit.se;
4350 uniforms.u_litSE = lit.se;
4345 uniforms.u_time = timeSec;
4351 uniforms.u_time = timeSec;
4352 if (!staticsDirty && object.renderer._fluidStaticsReady)
4353 { return; }
4354 const shoreSprite = shore?.sprite ?? null;
4355 const shoreUv = shoreSprite?.getUvRect?.(0)
4356 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4357 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4346 uniforms.u_tileX = tileX | 0;
4358 uniforms.u_tileX = tileX | 0;
4347 uniforms.u_tileY = tileY | 0;
4359 uniforms.u_tileY = tileY | 0;
4348 uniforms.u_edgeN = edges?.n ?? 0;
4360 uniforms.u_edgeN = edges?.n ?? 0;
@@ -4363,19 +4375,23 @@ export class WorldView
4363 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4375 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4364 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4376 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4365 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4377 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4378 object.renderer._fluidStaticsReady = true;
4366 }
4379 }
4367
4380
4368 #syncLavaBloomSprite (object, {
4381 #syncLavaBloomSprite (object, {
4369 edges = null,
4382 edges = null,
4370 timeSec = 0,
4383 timeSec = 0,
4371 tileX = 0,
4384 tileX = 0,
4372 tileY = 0
4385 tileY = 0,
4386 staticsDirty = true
4373 } = {})
4387 } = {})
4374 {
4388 {
4375 if (!object?.renderer)
4389 if (!object?.renderer)
4376 { return; }
4390 { return; }
4377 const uniforms = this.#ensureUniformBag(object.renderer, getLavaBloomShader(), "lavaBloom");
4391 const uniforms = this.#ensureUniformBag(object.renderer, getLavaBloomShader(), "lavaBloom");
4378 uniforms.u_time = timeSec;
4392 uniforms.u_time = timeSec;
4393 if (!staticsDirty && object.renderer._fluidStaticsReady)
4394 { return; }
4379 uniforms.u_tileX = tileX | 0;
4395 uniforms.u_tileX = tileX | 0;
4380 uniforms.u_tileY = tileY | 0;
4396 uniforms.u_tileY = tileY | 0;
4381 uniforms.u_edgeN = edges?.n ?? 0;
4397 uniforms.u_edgeN = edges?.n ?? 0;
@@ -4386,6 +4402,56 @@ export class WorldView
4386 uniforms.u_edgeNW = edges?.nw ?? 0;
4402 uniforms.u_edgeNW = edges?.nw ?? 0;
4387 uniforms.u_edgeSE = edges?.se ?? 0;
4403 uniforms.u_edgeSE = edges?.se ?? 0;
4388 uniforms.u_edgeSW = edges?.sw ?? 0;
4404 uniforms.u_edgeSW = edges?.sw ?? 0;
4405 object.renderer._fluidStaticsReady = true;
4406 }
4407
4408
4409 #cachedWaterCoast (objects)
4410 {
4411 const epoch = this.#fluidCoastEpoch;
4412 const typeId = objects.groundTypeId;
4413 const season = this.worldSeason;
4414 const cache = objects._fluidCoastCache;
4415 if (
4416 cache
4417 && cache.epoch === epoch
4418 && cache.typeId === typeId
4419 && cache.season === season
4420 && cache.kind === "water"
4421 )
4422 { return { edges: cache.edges, shore: cache.shore, deepCorners: cache.deepCorners, staticsDirty: false }; }
4423 const edges = this.#waterCoastEdges(objects.tileX, objects.tileY);
4424 const shore = this.#waterCoastShore(objects.tileX, objects.tileY, edges);
4425 const deep = typeId === GroundType.deepWater;
4426 const deepCorners = this.#waterDeepCorners(objects.tileX, objects.tileY, deep);
4427 objects._fluidCoastCache = { epoch, typeId, season, kind: "water", edges, shore, deepCorners };
4428 if (objects.ground?.renderer)
4429 { objects.ground.renderer._fluidStaticsReady = false; }
4430 return { edges, shore, deepCorners, staticsDirty: true };
4431 }
4432
4433 #cachedLavaCoast (objects)
4434 {
4435 const epoch = this.#fluidCoastEpoch;
4436 const typeId = objects.groundTypeId;
4437 const season = this.worldSeason;
4438 const cache = objects._fluidCoastCache;
4439 if (
4440 cache
4441 && cache.epoch === epoch
4442 && cache.typeId === typeId
4443 && cache.season === season
4444 && cache.kind === "lava"
4445 )
4446 { return { edges: cache.edges, shore: cache.shore, staticsDirty: false }; }
4447 const edges = this.#lavaCoastEdges(objects.tileX, objects.tileY);
4448 const shore = this.#fluidCoastShore(objects.tileX, objects.tileY, edges, { preferWet: false });
4449 objects._fluidCoastCache = { epoch, typeId, season, kind: "lava", edges, shore, deepCorners: null };
4450 if (objects.ground?.renderer)
4451 { objects.ground.renderer._fluidStaticsReady = false; }
4452 if (objects.lavaBloom?.renderer)
4453 { objects.lavaBloom.renderer._fluidStaticsReady = false; }
4454 return { edges, shore, staticsDirty: true };
4389 }
4455 }
4390
4456
4391 #tileUsesFluidAtlas (objects)
4457 #tileUsesFluidAtlas (objects)
@@ -4439,6 +4505,10 @@ export class WorldView
4439 if (!object || baked.chunkX == null || baked.chunkY == null)
4505 if (!object || baked.chunkX == null || baked.chunkY == null)
4440 { return; }
4506 { return; }
4441 const size = this.tileSize();
4507 const size = this.tileSize();
4508 const layoutKey = `${baked.chunkX},${baked.chunkY},${size},${kind}`;
4509 if (baked._fluidLayoutKey === layoutKey && object.renderer?.mirrorY)
4510 { return; }
4511 baked._fluidLayoutKey = layoutKey;
4442 const left = baked.chunkX * CHUNK_SIZE * size;
4512 const left = baked.chunkX * CHUNK_SIZE * size;
4443 const top = baked.chunkY * CHUNK_SIZE * size;
4513 const top = baked.chunkY * CHUNK_SIZE * size;
4444 const chunkPx = CHUNK_SIZE * size;
4514 const chunkPx = CHUNK_SIZE * size;
@@ -4494,8 +4564,12 @@ export class WorldView
4494 if (!this.#tileUsesFluidAtlas(objects))
4564 if (!this.#tileUsesFluidAtlas(objects))
4495 { continue; }
4565 { continue; }
4496 // Hide per-tile fluid sprites (keep objects + uniforms for atlas + lighting data).
4566 // Hide per-tile fluid sprites (keep objects + uniforms for atlas + lighting data).
4497 this.#setRendererVisible(objects.ground, false);
4567 if (!objects._fluidAtlasHidden)
4498 this.#setRendererVisible(objects.lavaBloom, false);
4568 {
4569 this.#setRendererVisible(objects.ground, false);
4570 this.#setRendererVisible(objects.lavaBloom, false);
4571 objects._fluidAtlasHidden = true;
4572 }
4499 if (objects._inViewport === false)
4573 if (objects._inViewport === false)
4500 { continue; }
4574 { continue; }
4501 const key = `${objects.chunkX},${objects.chunkY}`;
4575 const key = `${objects.chunkX},${objects.chunkY}`;
@@ -4533,6 +4607,7 @@ export class WorldView
4533 for (const objects of tileObjects)
4607 for (const objects of tileObjects)
4534 {
4608 {
4535 const vis = objects._inViewport !== false;
4609 const vis = objects._inViewport !== false;
4610 objects._fluidAtlasHidden = false;
4536 this.#setRendererVisible(objects.ground, vis);
4611 this.#setRendererVisible(objects.ground, vis);
4537 this.#setRendererVisible(objects.lavaBloom, vis && this.bloomEnabled);
4612 this.#setRendererVisible(objects.lavaBloom, vis && this.bloomEnabled);
4538 }
4613 }
@@ -4573,7 +4648,6 @@ export class WorldView
4573 });
4648 });
4574 this.#layoutFluidAtlasObject(baked, "ground");
4649 this.#layoutFluidAtlasObject(baked, "ground");
4575 this.#setRendererVisible(groundSlot.object, true);
4650 this.#setRendererVisible(groundSlot.object, true);
4576 setNearestFilter(this.scene, groundSlot.target.canvas);
4577
4651
4578 if (!bloomTiles.length || !this.bloomEnabled)
4652 if (!bloomTiles.length || !this.bloomEnabled)
4579 {
4653 {
@@ -4609,7 +4683,6 @@ export class WorldView
4609 });
4683 });
4610 this.#layoutFluidAtlasObject(baked, "bloom");
4684 this.#layoutFluidAtlasObject(baked, "bloom");
4611 this.#setRendererVisible(bloomSlot.object, true);
4685 this.#setRendererVisible(bloomSlot.object, true);
4612 setNearestFilter(this.scene, bloomSlot.target.canvas);
4613 }
4686 }
4614
4687
4615 #ambientDarkness ()
4688 #ambientDarkness ()
@@ -5191,6 +5264,7 @@ export class WorldView
5191
5264
5192 #bakeAndPlaceChunk (snapshot)
5265 #bakeAndPlaceChunk (snapshot)
5193 {
5266 {
5267 this.#fluidCoastEpoch = (this.#fluidCoastEpoch + 1) | 0;
5194 const key = `${snapshot.chunkX},${snapshot.chunkY}`;
5268 const key = `${snapshot.chunkX},${snapshot.chunkY}`;
5195 const atlases = bakeChunkAtlases({
5269 const atlases = bakeChunkAtlases({
5196 snapshot,
5270 snapshot,
@@ -5711,6 +5785,8 @@ export class WorldView
5711 this.#clearLavaBloom(objects);
5785 this.#clearLavaBloom(objects);
5712 objects.groundTypeId = null;
5786 objects.groundTypeId = null;
5713 objects.waterEdges = null;
5787 objects.waterEdges = null;
5788 objects._fluidCoastCache = null;
5789 objects._fluidAtlasHidden = false;
5714 }
5790 }
5715
5791
5716 let blockSource = snapshot.blocks[index];
5792 let blockSource = snapshot.blocks[index];