BlueGit

timfa questward

Reuse shader uniform bags across lit sprite syncs.

Mutate per-renderer uniform objects and vector arrays in place instead of allocating a new bag every shade pass.

timfa Tim Falken · pushed by timfa

Authored 2026-09-06 · 2 months ago

Hash
bf3d5678394e743787186637232be3c23ba87d82
Parent
2899a47f
1 file changed +191 −156
client/src/render/worldView.js +191 −156
@@ -3569,9 +3569,69 @@ export class WorldView
3569 3569 object._lit = false;
3570 3570 object.renderer.shader = null;
3571 3571 object.renderer.shaderUniforms = null;
3572 object.renderer._shaderUniformKind = null;
3572 3573 object.renderer.secondaryMap = null;
3573 3574 }
3574 3575
3576 #ensureUniformBag (renderer, shader, kind)
3577 {
3578 renderer.shader = shader;
3579 if (!renderer.shaderUniforms || renderer._shaderUniformKind !== kind)
3580 {
3581 renderer.shaderUniforms = {};
3582 renderer._shaderUniformKind = kind;
3583 }
3584 return renderer.shaderUniforms;
3585 }
3586
3587 #writeUniformVec3 (uniforms, key, src)
3588 {
3589 let arr = uniforms[key];
3590 if (!Array.isArray(arr) || arr.length !== 3)
3591 {
3592 arr = [0, 0, 0];
3593 uniforms[key] = arr;
3594 }
3595 if (Array.isArray(src))
3596 {
3597 arr[0] = src[0];
3598 arr[1] = src[1];
3599 arr[2] = src[2];
3600 }
3601 else
3602 {
3603 arr[0] = src.r;
3604 arr[1] = src.g;
3605 arr[2] = src.b;
3606 }
3607 }
3608
3609 #writeUniformVec2 (uniforms, key, a, b)
3610 {
3611 let arr = uniforms[key];
3612 if (!Array.isArray(arr) || arr.length !== 2)
3613 {
3614 arr = [0, 0];
3615 uniforms[key] = arr;
3616 }
3617 arr[0] = a;
3618 arr[1] = b;
3619 }
3620
3621 #writeUniformVec4 (uniforms, key, a, b, c, d)
3622 {
3623 let arr = uniforms[key];
3624 if (!Array.isArray(arr) || arr.length !== 4)
3625 {
3626 arr = [0, 0, 0, 0];
3627 uniforms[key] = arr;
3628 }
3629 arr[0] = a;
3630 arr[1] = b;
3631 arr[2] = c;
3632 arr[3] = d;
3633 }
3634
3575 3635 /** Bloom / unlit overlays that still need magenta channel tint (e.g. elemental sprites). */
3576 3636 #syncUnlitTintSprite (object, tintColor)
3577 3637 {
@@ -3579,16 +3639,14 @@ export class WorldView
3579 3639 { return; }
3580 3640 const tint = normalizeRgb(tintColor);
3581 3641 const height = object.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3582 object.renderer.shader = getTintLitSpriteShader();
3583 object.renderer.shaderUniforms = {
3584 u_darkness: 0,
3585 u_strength: 0,
3586 u_flashColor: FLASH_COLOR_DAMAGE,
3587 u_wade: 0,
3588 u_spriteHeight: height,
3589 u_useTint: 1,
3590 u_tintColor: [tint.r, tint.g, tint.b]
3591 };
3642 const uniforms = this.#ensureUniformBag(object.renderer, getTintLitSpriteShader(), "unlitTint");
3643 uniforms.u_darkness = 0;
3644 uniforms.u_strength = 0;
3645 this.#writeUniformVec3(uniforms, "u_flashColor", FLASH_COLOR_DAMAGE);
3646 uniforms.u_wade = 0;
3647 uniforms.u_spriteHeight = height;
3648 uniforms.u_useTint = 1;
3649 this.#writeUniformVec3(uniforms, "u_tintColor", tint);
3592 3650 object.renderer.secondaryMap = null;
3593 3651 }
3594 3652
@@ -3604,27 +3662,23 @@ export class WorldView
3604 3662 const tint = tintColor ? normalizeRgb(tintColor) : null;
3605 3663 if (tint)
3606 3664 {
3607 object.renderer.shader = getTintLitSpriteShader();
3608 object.renderer.shaderUniforms = {
3609 u_darkness: dark,
3610 u_strength: flash,
3611 u_flashColor: flashRgb,
3612 u_wade: wade ? 1 : 0,
3613 u_spriteHeight: height,
3614 u_useTint: 1,
3615 u_tintColor: [tint.r, tint.g, tint.b]
3616 };
3665 const uniforms = this.#ensureUniformBag(object.renderer, getTintLitSpriteShader(), "tintLit");
3666 uniforms.u_darkness = dark;
3667 uniforms.u_strength = flash;
3668 this.#writeUniformVec3(uniforms, "u_flashColor", flashRgb);
3669 uniforms.u_wade = wade ? 1 : 0;
3670 uniforms.u_spriteHeight = height;
3671 uniforms.u_useTint = 1;
3672 this.#writeUniformVec3(uniforms, "u_tintColor", tint);
3617 3673 }
3618 3674 else
3619 3675 {
3620 object.renderer.shader = getSpriteLightingShader();
3621 object.renderer.shaderUniforms = {
3622 u_darkness: dark,
3623 u_strength: flash,
3624 u_flashColor: flashRgb,
3625 u_wade: wade ? 1 : 0,
3626 u_spriteHeight: height
3627 };
3676 const uniforms = this.#ensureUniformBag(object.renderer, getSpriteLightingShader(), "lit");
3677 uniforms.u_darkness = dark;
3678 uniforms.u_strength = flash;
3679 this.#writeUniformVec3(uniforms, "u_flashColor", flashRgb);
3680 uniforms.u_wade = wade ? 1 : 0;
3681 uniforms.u_spriteHeight = height;
3628 3682 }
3629 3683 object.renderer.secondaryMap = null;
3630 3684 }
@@ -3634,7 +3688,7 @@ export class WorldView
3634 3688 return entity?.object?.renderer?.sprite?.g_image ?? null;
3635 3689 }
3636 3690
3637 #tightFitMaskUniforms (overlay, entity)
3691 #tightFitMaskUniforms (overlay, entity, into = null)
3638 3692 {
3639 3693 const bodyRenderer = entity?.object?.renderer;
3640 3694 const clothRenderer = overlay?.renderer;
@@ -3646,13 +3700,13 @@ export class WorldView
3646 3700 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3647 3701 const bodyUv = bodySprite.getUvRect?.(bodyRenderer.subImage | 0)
3648 3702 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3649 return {
3650 u_clothSize: [clothSprite.width || SPRITE_SIZE_PX, clothSprite.height || SPRITE_SIZE_PX],
3651 u_bodySize: [bodySprite.width || SPRITE_SIZE_PX, bodySprite.height || SPRITE_SIZE_PX],
3652 u_pivotFromBottom: PIVOT_FROM_BOTTOM_PX,
3653 u_clothUvRect: [clothUv.u0, clothUv.v0, clothUv.u1, clothUv.v1],
3654 u_bodyUvRect: [bodyUv.u0, bodyUv.v0, bodyUv.u1, bodyUv.v1]
3655 };
3703 const uniforms = into ?? {};
3704 this.#writeUniformVec2(uniforms, "u_clothSize", clothSprite.width || SPRITE_SIZE_PX, clothSprite.height || SPRITE_SIZE_PX);
3705 this.#writeUniformVec2(uniforms, "u_bodySize", bodySprite.width || SPRITE_SIZE_PX, bodySprite.height || SPRITE_SIZE_PX);
3706 uniforms.u_pivotFromBottom = PIVOT_FROM_BOTTOM_PX;
3707 this.#writeUniformVec4(uniforms, "u_clothUvRect", clothUv.u0, clothUv.v0, clothUv.u1, clothUv.v1);
3708 this.#writeUniformVec4(uniforms, "u_bodyUvRect", bodyUv.u0, bodyUv.v0, bodyUv.u1, bodyUv.v1);
3709 return uniforms;
3656 3710 }
3657 3711
3658 3712 #syncTightFitLitSprite (overlay, entity, darkness, flashStrength = 0, wade = false, tintColor = null, flashColor = null)
@@ -3660,9 +3714,8 @@ export class WorldView
3660 3714 if (!overlay?.renderer || entity?.object?.renderer == null)
3661 3715 { return; }
3662 3716 const bodyMap = this.#bodySecondaryMap(entity);
3663 const maskUniforms = this.#tightFitMaskUniforms(overlay, entity);
3664 3717 const flashRgb = flashColor ?? FLASH_COLOR_DAMAGE;
3665 if (!bodyMap || !maskUniforms)
3718 if (!bodyMap)
3666 3719 {
3667 3720 this.#syncLitSprite(overlay, darkness, flashStrength, wade, tintColor, flashRgb);
3668 3721 return;
@@ -3673,31 +3726,23 @@ export class WorldView
3673 3726 const height = overlay.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3674 3727 const tint = tintColor ? normalizeRgb(tintColor) : null;
3675 3728 overlay.renderer.secondaryMap = bodyMap;
3676 if (tint)
3729 const kind = tint ? "tightFitTint" : "tightFit";
3730 const shader = tint ? getTightFitTintLitSpriteShader() : getTightFitLitSpriteShader();
3731 const uniforms = this.#ensureUniformBag(overlay.renderer, shader, kind);
3732 if (!this.#tightFitMaskUniforms(overlay, entity, uniforms))
3677 3733 {
3678 overlay.renderer.shader = getTightFitTintLitSpriteShader();
3679 overlay.renderer.shaderUniforms = {
3680 u_darkness: dark,
3681 u_strength: flash,
3682 u_flashColor: flashRgb,
3683 u_wade: wade ? 1 : 0,
3684 u_spriteHeight: height,
3685 u_useTint: 1,
3686 u_tintColor: [tint.r, tint.g, tint.b],
3687 ...maskUniforms
3688 };
3734 this.#syncLitSprite(overlay, darkness, flashStrength, wade, tintColor, flashRgb);
3735 return;
3689 3736 }
3690 else
3737 uniforms.u_darkness = dark;
3738 uniforms.u_strength = flash;
3739 this.#writeUniformVec3(uniforms, "u_flashColor", flashRgb);
3740 uniforms.u_wade = wade ? 1 : 0;
3741 uniforms.u_spriteHeight = height;
3742 if (tint)
3691 3743 {
3692 overlay.renderer.shader = getTightFitLitSpriteShader();
3693 overlay.renderer.shaderUniforms = {
3694 u_darkness: dark,
3695 u_strength: flash,
3696 u_flashColor: flashRgb,
3697 u_wade: wade ? 1 : 0,
3698 u_spriteHeight: height,
3699 ...maskUniforms
3700 };
3744 uniforms.u_useTint = 1;
3745 this.#writeUniformVec3(uniforms, "u_tintColor", tint);
3701 3746 }
3702 3747 }
3703 3748
@@ -3715,18 +3760,16 @@ export class WorldView
3715 3760 { object._lit = true; }
3716 3761 const flash = Math.min(1, Math.max(0, flashStrength ?? 0));
3717 3762 const height = object.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3718 object.renderer.shader = getDualTintLitSpriteShader();
3719 object.renderer.shaderUniforms = {
3720 u_darkness: dark,
3721 u_strength: flash,
3722 u_flashColor: flashColor ?? FLASH_COLOR_DAMAGE,
3723 u_wade: wade ? 1 : 0,
3724 u_spriteHeight: height,
3725 u_shaftTint: [shaft.r, shaft.g, shaft.b],
3726 u_tipTint: [tip.r, tip.g, tip.b],
3727 u_coatTint: coat ? [coat.r, coat.g, coat.b] : [0, 0, 0],
3728 u_hasCoat: coat ? 1 : 0
3729 };
3763 const uniforms = this.#ensureUniformBag(object.renderer, getDualTintLitSpriteShader(), "dualTint");
3764 uniforms.u_darkness = dark;
3765 uniforms.u_strength = flash;
3766 this.#writeUniformVec3(uniforms, "u_flashColor", flashColor ?? FLASH_COLOR_DAMAGE);
3767 uniforms.u_wade = wade ? 1 : 0;
3768 uniforms.u_spriteHeight = height;
3769 this.#writeUniformVec3(uniforms, "u_shaftTint", shaft);
3770 this.#writeUniformVec3(uniforms, "u_tipTint", tip);
3771 this.#writeUniformVec3(uniforms, "u_coatTint", coat ?? { r: 0, g: 0, b: 0 });
3772 uniforms.u_hasCoat = coat ? 1 : 0;
3730 3773 object.renderer.secondaryMap = null;
3731 3774 }
3732 3775
@@ -3952,45 +3995,43 @@ export class WorldView
3952 3995 const dSW = deepCorners?.sw ?? 0;
3953 3996 const dSE = deepCorners?.se ?? 0;
3954 3997 object._lit = true;
3955 object.renderer.shader = getWaterGroundShader();
3956 3998 // Shallow + deep share one noise atlas so texAmp seams don't hard-cut at depth edges.
3957 3999 const sharedNoise = this.game.images[spriteImageName("ground", "water", "water")];
3958 4000 if (sharedNoise)
3959 4001 { object.renderer.sprite = sharedNoise; }
3960 4002 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
3961 object.renderer.shaderUniforms = {
3962 u_ambientDark: dark,
3963 u_litNW: lit.nw,
3964 u_litNE: lit.ne,
3965 u_litSW: lit.sw,
3966 u_litSE: lit.se,
3967 u_time: timeSec,
3968 u_tileX: tileX | 0,
3969 u_tileY: tileY | 0,
3970 u_deepNW: dNW,
3971 u_deepNE: dNE,
3972 u_deepSW: dSW,
3973 u_deepSE: dSE,
3974 u_edgeN: edges?.n ?? 0,
3975 u_edgeE: edges?.e ?? 0,
3976 u_edgeS: edges?.s ?? 0,
3977 u_edgeW: edges?.w ?? 0,
3978 u_edgeNE: edges?.ne ?? 0,
3979 u_edgeNW: edges?.nw ?? 0,
3980 u_edgeSE: edges?.se ?? 0,
3981 u_edgeSW: edges?.sw ?? 0,
3982 u_hasShore: shoreSprite ? 1 : 0,
3983 u_shoreEdgeN: shore?.edgeN ?? 0,
3984 u_shoreEdgeE: shore?.edgeE ?? 0,
3985 u_shoreEdgeS: shore?.edgeS ?? 0,
3986 u_shoreEdgeW: shore?.edgeW ?? 0,
3987 u_shoreEdgeNE: shore?.edgeNE ?? 0,
3988 u_shoreEdgeNW: shore?.edgeNW ?? 0,
3989 u_shoreEdgeSE: shore?.edgeSE ?? 0,
3990 u_shoreEdgeSW: shore?.edgeSW ?? 0,
3991 u_shoreUvRect: [shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1],
3992 ...waterDebugUniforms()
3993 };
4003 const uniforms = this.#ensureUniformBag(object.renderer, getWaterGroundShader(), "water");
4004 uniforms.u_ambientDark = dark;
4005 uniforms.u_litNW = lit.nw;
4006 uniforms.u_litNE = lit.ne;
4007 uniforms.u_litSW = lit.sw;
4008 uniforms.u_litSE = lit.se;
4009 uniforms.u_time = timeSec;
4010 uniforms.u_tileX = tileX | 0;
4011 uniforms.u_tileY = tileY | 0;
4012 uniforms.u_deepNW = dNW;
4013 uniforms.u_deepNE = dNE;
4014 uniforms.u_deepSW = dSW;
4015 uniforms.u_deepSE = dSE;
4016 uniforms.u_edgeN = edges?.n ?? 0;
4017 uniforms.u_edgeE = edges?.e ?? 0;
4018 uniforms.u_edgeS = edges?.s ?? 0;
4019 uniforms.u_edgeW = edges?.w ?? 0;
4020 uniforms.u_edgeNE = edges?.ne ?? 0;
4021 uniforms.u_edgeNW = edges?.nw ?? 0;
4022 uniforms.u_edgeSE = edges?.se ?? 0;
4023 uniforms.u_edgeSW = edges?.sw ?? 0;
4024 uniforms.u_hasShore = shoreSprite ? 1 : 0;
4025 uniforms.u_shoreEdgeN = shore?.edgeN ?? 0;
4026 uniforms.u_shoreEdgeE = shore?.edgeE ?? 0;
4027 uniforms.u_shoreEdgeS = shore?.edgeS ?? 0;
4028 uniforms.u_shoreEdgeW = shore?.edgeW ?? 0;
4029 uniforms.u_shoreEdgeNE = shore?.edgeNE ?? 0;
4030 uniforms.u_shoreEdgeNW = shore?.edgeNW ?? 0;
4031 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4032 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4033 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4034 Object.assign(uniforms, waterDebugUniforms());
3994 4035 }
3995 4036
3996 4037 /** Liquid water gets coast foam; frozen shallow ice uses the normal lit sprite. Lava is procedural heat. */
@@ -4170,37 +4211,35 @@ export class WorldView
4170 4211 const shoreUv = shoreSprite?.getUvRect?.(0)
4171 4212 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4172 4213 object._lit = true;
4173 object.renderer.shader = getLavaGroundShader();
4174 4214 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4175 object.renderer.shaderUniforms = {
4176 u_ambientDark: dark,
4177 u_litNW: lit.nw,
4178 u_litNE: lit.ne,
4179 u_litSW: lit.sw,
4180 u_litSE: lit.se,
4181 u_time: timeSec,
4182 u_tileX: tileX | 0,
4183 u_tileY: tileY | 0,
4184 u_edgeN: edges?.n ?? 0,
4185 u_edgeE: edges?.e ?? 0,
4186 u_edgeS: edges?.s ?? 0,
4187 u_edgeW: edges?.w ?? 0,
4188 u_edgeNE: edges?.ne ?? 0,
4189 u_edgeNW: edges?.nw ?? 0,
4190 u_edgeSE: edges?.se ?? 0,
4191 u_edgeSW: edges?.sw ?? 0,
4192 u_hasShore: shoreSprite ? 1 : 0,
4193 u_shoreEdgeN: shore?.edgeN ?? 0,
4194 u_shoreEdgeE: shore?.edgeE ?? 0,
4195 u_shoreEdgeS: shore?.edgeS ?? 0,
4196 u_shoreEdgeW: shore?.edgeW ?? 0,
4197 u_shoreEdgeNE: shore?.edgeNE ?? 0,
4198 u_shoreEdgeNW: shore?.edgeNW ?? 0,
4199 u_shoreEdgeSE: shore?.edgeSE ?? 0,
4200 u_shoreEdgeSW: shore?.edgeSW ?? 0,
4201 u_shoreUvRect: [shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1],
4202 ...lavaDebugUniforms()
4203 };
4215 const uniforms = this.#ensureUniformBag(object.renderer, getLavaGroundShader(), "lava");
4216 uniforms.u_ambientDark = dark;
4217 uniforms.u_litNW = lit.nw;
4218 uniforms.u_litNE = lit.ne;
4219 uniforms.u_litSW = lit.sw;
4220 uniforms.u_litSE = lit.se;
4221 uniforms.u_time = timeSec;
4222 uniforms.u_tileX = tileX | 0;
4223 uniforms.u_tileY = tileY | 0;
4224 uniforms.u_edgeN = edges?.n ?? 0;
4225 uniforms.u_edgeE = edges?.e ?? 0;
4226 uniforms.u_edgeS = edges?.s ?? 0;
4227 uniforms.u_edgeW = edges?.w ?? 0;
4228 uniforms.u_edgeNE = edges?.ne ?? 0;
4229 uniforms.u_edgeNW = edges?.nw ?? 0;
4230 uniforms.u_edgeSE = edges?.se ?? 0;
4231 uniforms.u_edgeSW = edges?.sw ?? 0;
4232 uniforms.u_hasShore = shoreSprite ? 1 : 0;
4233 uniforms.u_shoreEdgeN = shore?.edgeN ?? 0;
4234 uniforms.u_shoreEdgeE = shore?.edgeE ?? 0;
4235 uniforms.u_shoreEdgeS = shore?.edgeS ?? 0;
4236 uniforms.u_shoreEdgeW = shore?.edgeW ?? 0;
4237 uniforms.u_shoreEdgeNE = shore?.edgeNE ?? 0;
4238 uniforms.u_shoreEdgeNW = shore?.edgeNW ?? 0;
4239 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4240 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4241 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4242 Object.assign(uniforms, lavaDebugUniforms());
4204 4243 }
4205 4244
4206 4245 #syncLavaBloomSprite (object, {
@@ -4212,21 +4251,19 @@ export class WorldView
4212 4251 {
4213 4252 if (!object?.renderer)
4214 4253 { return; }
4215 object.renderer.shader = getLavaBloomShader();
4216 object.renderer.shaderUniforms = {
4217 u_time: timeSec,
4218 u_tileX: tileX | 0,
4219 u_tileY: tileY | 0,
4220 u_edgeN: edges?.n ?? 0,
4221 u_edgeE: edges?.e ?? 0,
4222 u_edgeS: edges?.s ?? 0,
4223 u_edgeW: edges?.w ?? 0,
4224 u_edgeNE: edges?.ne ?? 0,
4225 u_edgeNW: edges?.nw ?? 0,
4226 u_edgeSE: edges?.se ?? 0,
4227 u_edgeSW: edges?.sw ?? 0,
4228 ...lavaDebugUniforms()
4229 };
4254 const uniforms = this.#ensureUniformBag(object.renderer, getLavaBloomShader(), "lavaBloom");
4255 uniforms.u_time = timeSec;
4256 uniforms.u_tileX = tileX | 0;
4257 uniforms.u_tileY = tileY | 0;
4258 uniforms.u_edgeN = edges?.n ?? 0;
4259 uniforms.u_edgeE = edges?.e ?? 0;
4260 uniforms.u_edgeS = edges?.s ?? 0;
4261 uniforms.u_edgeW = edges?.w ?? 0;
4262 uniforms.u_edgeNE = edges?.ne ?? 0;
4263 uniforms.u_edgeNW = edges?.nw ?? 0;
4264 uniforms.u_edgeSE = edges?.se ?? 0;
4265 uniforms.u_edgeSW = edges?.sw ?? 0;
4266 Object.assign(uniforms, lavaDebugUniforms());
4230 4267 }
4231 4268
4232 4269 #ambientDarkness ()
@@ -5048,13 +5085,11 @@ export class WorldView
5048 5085 { return; }
5049 5086 object._lit = true;
5050 5087 const dark = Math.min(1, Math.max(0, darkness ?? 0));
5051 object.renderer.shader = getCliffGroundTopShader();
5052 5088 object.renderer.bumpMap = groundImage ?? null;
5053 5089 object.renderer.secondaryMap = null;
5054 object.renderer.shaderUniforms = {
5055 u_darkness: dark,
5056 u_tileLocal: [localX, localY]
5057 };
5090 const uniforms = this.#ensureUniformBag(object.renderer, getCliffGroundTopShader(), "cliffTop");
5091 uniforms.u_darkness = dark;
5092 this.#writeUniformVec2(uniforms, "u_tileLocal", localX, localY);
5058 5093 }
5059 5094
5060 5095 #layoutBakedChunk (snapshot)
@@ -3569,9 +3569,69 @@ export class WorldView
3569 object._lit = false;
3569 object._lit = false;
3570 object.renderer.shader = null;
3570 object.renderer.shader = null;
3571 object.renderer.shaderUniforms = null;
3571 object.renderer.shaderUniforms = null;
3572 object.renderer._shaderUniformKind = null;
3572 object.renderer.secondaryMap = null;
3573 object.renderer.secondaryMap = null;
3573 }
3574 }
3574
3575
3576 #ensureUniformBag (renderer, shader, kind)
3577 {
3578 renderer.shader = shader;
3579 if (!renderer.shaderUniforms || renderer._shaderUniformKind !== kind)
3580 {
3581 renderer.shaderUniforms = {};
3582 renderer._shaderUniformKind = kind;
3583 }
3584 return renderer.shaderUniforms;
3585 }
3586
3587 #writeUniformVec3 (uniforms, key, src)
3588 {
3589 let arr = uniforms[key];
3590 if (!Array.isArray(arr) || arr.length !== 3)
3591 {
3592 arr = [0, 0, 0];
3593 uniforms[key] = arr;
3594 }
3595 if (Array.isArray(src))
3596 {
3597 arr[0] = src[0];
3598 arr[1] = src[1];
3599 arr[2] = src[2];
3600 }
3601 else
3602 {
3603 arr[0] = src.r;
3604 arr[1] = src.g;
3605 arr[2] = src.b;
3606 }
3607 }
3608
3609 #writeUniformVec2 (uniforms, key, a, b)
3610 {
3611 let arr = uniforms[key];
3612 if (!Array.isArray(arr) || arr.length !== 2)
3613 {
3614 arr = [0, 0];
3615 uniforms[key] = arr;
3616 }
3617 arr[0] = a;
3618 arr[1] = b;
3619 }
3620
3621 #writeUniformVec4 (uniforms, key, a, b, c, d)
3622 {
3623 let arr = uniforms[key];
3624 if (!Array.isArray(arr) || arr.length !== 4)
3625 {
3626 arr = [0, 0, 0, 0];
3627 uniforms[key] = arr;
3628 }
3629 arr[0] = a;
3630 arr[1] = b;
3631 arr[2] = c;
3632 arr[3] = d;
3633 }
3634
3575 /** Bloom / unlit overlays that still need magenta channel tint (e.g. elemental sprites). */
3635 /** Bloom / unlit overlays that still need magenta channel tint (e.g. elemental sprites). */
3576 #syncUnlitTintSprite (object, tintColor)
3636 #syncUnlitTintSprite (object, tintColor)
3577 {
3637 {
@@ -3579,16 +3639,14 @@ export class WorldView
3579 { return; }
3639 { return; }
3580 const tint = normalizeRgb(tintColor);
3640 const tint = normalizeRgb(tintColor);
3581 const height = object.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3641 const height = object.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3582 object.renderer.shader = getTintLitSpriteShader();
3642 const uniforms = this.#ensureUniformBag(object.renderer, getTintLitSpriteShader(), "unlitTint");
3583 object.renderer.shaderUniforms = {
3643 uniforms.u_darkness = 0;
3584 u_darkness: 0,
3644 uniforms.u_strength = 0;
3585 u_strength: 0,
3645 this.#writeUniformVec3(uniforms, "u_flashColor", FLASH_COLOR_DAMAGE);
3586 u_flashColor: FLASH_COLOR_DAMAGE,
3646 uniforms.u_wade = 0;
3587 u_wade: 0,
3647 uniforms.u_spriteHeight = height;
3588 u_spriteHeight: height,
3648 uniforms.u_useTint = 1;
3589 u_useTint: 1,
3649 this.#writeUniformVec3(uniforms, "u_tintColor", tint);
3590 u_tintColor: [tint.r, tint.g, tint.b]
3591 };
3592 object.renderer.secondaryMap = null;
3650 object.renderer.secondaryMap = null;
3593 }
3651 }
3594
3652
@@ -3604,27 +3662,23 @@ export class WorldView
3604 const tint = tintColor ? normalizeRgb(tintColor) : null;
3662 const tint = tintColor ? normalizeRgb(tintColor) : null;
3605 if (tint)
3663 if (tint)
3606 {
3664 {
3607 object.renderer.shader = getTintLitSpriteShader();
3665 const uniforms = this.#ensureUniformBag(object.renderer, getTintLitSpriteShader(), "tintLit");
3608 object.renderer.shaderUniforms = {
3666 uniforms.u_darkness = dark;
3609 u_darkness: dark,
3667 uniforms.u_strength = flash;
3610 u_strength: flash,
3668 this.#writeUniformVec3(uniforms, "u_flashColor", flashRgb);
3611 u_flashColor: flashRgb,
3669 uniforms.u_wade = wade ? 1 : 0;
3612 u_wade: wade ? 1 : 0,
3670 uniforms.u_spriteHeight = height;
3613 u_spriteHeight: height,
3671 uniforms.u_useTint = 1;
3614 u_useTint: 1,
3672 this.#writeUniformVec3(uniforms, "u_tintColor", tint);
3615 u_tintColor: [tint.r, tint.g, tint.b]
3616 };
3617 }
3673 }
3618 else
3674 else
3619 {
3675 {
3620 object.renderer.shader = getSpriteLightingShader();
3676 const uniforms = this.#ensureUniformBag(object.renderer, getSpriteLightingShader(), "lit");
3621 object.renderer.shaderUniforms = {
3677 uniforms.u_darkness = dark;
3622 u_darkness: dark,
3678 uniforms.u_strength = flash;
3623 u_strength: flash,
3679 this.#writeUniformVec3(uniforms, "u_flashColor", flashRgb);
3624 u_flashColor: flashRgb,
3680 uniforms.u_wade = wade ? 1 : 0;
3625 u_wade: wade ? 1 : 0,
3681 uniforms.u_spriteHeight = height;
3626 u_spriteHeight: height
3627 };
3628 }
3682 }
3629 object.renderer.secondaryMap = null;
3683 object.renderer.secondaryMap = null;
3630 }
3684 }
@@ -3634,7 +3688,7 @@ export class WorldView
3634 return entity?.object?.renderer?.sprite?.g_image ?? null;
3688 return entity?.object?.renderer?.sprite?.g_image ?? null;
3635 }
3689 }
3636
3690
3637 #tightFitMaskUniforms (overlay, entity)
3691 #tightFitMaskUniforms (overlay, entity, into = null)
3638 {
3692 {
3639 const bodyRenderer = entity?.object?.renderer;
3693 const bodyRenderer = entity?.object?.renderer;
3640 const clothRenderer = overlay?.renderer;
3694 const clothRenderer = overlay?.renderer;
@@ -3646,13 +3700,13 @@ export class WorldView
3646 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3700 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3647 const bodyUv = bodySprite.getUvRect?.(bodyRenderer.subImage | 0)
3701 const bodyUv = bodySprite.getUvRect?.(bodyRenderer.subImage | 0)
3648 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3702 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
3649 return {
3703 const uniforms = into ?? {};
3650 u_clothSize: [clothSprite.width || SPRITE_SIZE_PX, clothSprite.height || SPRITE_SIZE_PX],
3704 this.#writeUniformVec2(uniforms, "u_clothSize", clothSprite.width || SPRITE_SIZE_PX, clothSprite.height || SPRITE_SIZE_PX);
3651 u_bodySize: [bodySprite.width || SPRITE_SIZE_PX, bodySprite.height || SPRITE_SIZE_PX],
3705 this.#writeUniformVec2(uniforms, "u_bodySize", bodySprite.width || SPRITE_SIZE_PX, bodySprite.height || SPRITE_SIZE_PX);
3652 u_pivotFromBottom: PIVOT_FROM_BOTTOM_PX,
3706 uniforms.u_pivotFromBottom = PIVOT_FROM_BOTTOM_PX;
3653 u_clothUvRect: [clothUv.u0, clothUv.v0, clothUv.u1, clothUv.v1],
3707 this.#writeUniformVec4(uniforms, "u_clothUvRect", clothUv.u0, clothUv.v0, clothUv.u1, clothUv.v1);
3654 u_bodyUvRect: [bodyUv.u0, bodyUv.v0, bodyUv.u1, bodyUv.v1]
3708 this.#writeUniformVec4(uniforms, "u_bodyUvRect", bodyUv.u0, bodyUv.v0, bodyUv.u1, bodyUv.v1);
3655 };
3709 return uniforms;
3656 }
3710 }
3657
3711
3658 #syncTightFitLitSprite (overlay, entity, darkness, flashStrength = 0, wade = false, tintColor = null, flashColor = null)
3712 #syncTightFitLitSprite (overlay, entity, darkness, flashStrength = 0, wade = false, tintColor = null, flashColor = null)
@@ -3660,9 +3714,8 @@ export class WorldView
3660 if (!overlay?.renderer || entity?.object?.renderer == null)
3714 if (!overlay?.renderer || entity?.object?.renderer == null)
3661 { return; }
3715 { return; }
3662 const bodyMap = this.#bodySecondaryMap(entity);
3716 const bodyMap = this.#bodySecondaryMap(entity);
3663 const maskUniforms = this.#tightFitMaskUniforms(overlay, entity);
3664 const flashRgb = flashColor ?? FLASH_COLOR_DAMAGE;
3717 const flashRgb = flashColor ?? FLASH_COLOR_DAMAGE;
3665 if (!bodyMap || !maskUniforms)
3718 if (!bodyMap)
3666 {
3719 {
3667 this.#syncLitSprite(overlay, darkness, flashStrength, wade, tintColor, flashRgb);
3720 this.#syncLitSprite(overlay, darkness, flashStrength, wade, tintColor, flashRgb);
3668 return;
3721 return;
@@ -3673,31 +3726,23 @@ export class WorldView
3673 const height = overlay.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3726 const height = overlay.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3674 const tint = tintColor ? normalizeRgb(tintColor) : null;
3727 const tint = tintColor ? normalizeRgb(tintColor) : null;
3675 overlay.renderer.secondaryMap = bodyMap;
3728 overlay.renderer.secondaryMap = bodyMap;
3676 if (tint)
3729 const kind = tint ? "tightFitTint" : "tightFit";
3730 const shader = tint ? getTightFitTintLitSpriteShader() : getTightFitLitSpriteShader();
3731 const uniforms = this.#ensureUniformBag(overlay.renderer, shader, kind);
3732 if (!this.#tightFitMaskUniforms(overlay, entity, uniforms))
3677 {
3733 {
3678 overlay.renderer.shader = getTightFitTintLitSpriteShader();
3734 this.#syncLitSprite(overlay, darkness, flashStrength, wade, tintColor, flashRgb);
3679 overlay.renderer.shaderUniforms = {
3735 return;
3680 u_darkness: dark,
3681 u_strength: flash,
3682 u_flashColor: flashRgb,
3683 u_wade: wade ? 1 : 0,
3684 u_spriteHeight: height,
3685 u_useTint: 1,
3686 u_tintColor: [tint.r, tint.g, tint.b],
3687 ...maskUniforms
3688 };
3689 }
3736 }
3690 else
3737 uniforms.u_darkness = dark;
3738 uniforms.u_strength = flash;
3739 this.#writeUniformVec3(uniforms, "u_flashColor", flashRgb);
3740 uniforms.u_wade = wade ? 1 : 0;
3741 uniforms.u_spriteHeight = height;
3742 if (tint)
3691 {
3743 {
3692 overlay.renderer.shader = getTightFitLitSpriteShader();
3744 uniforms.u_useTint = 1;
3693 overlay.renderer.shaderUniforms = {
3745 this.#writeUniformVec3(uniforms, "u_tintColor", tint);
3694 u_darkness: dark,
3695 u_strength: flash,
3696 u_flashColor: flashRgb,
3697 u_wade: wade ? 1 : 0,
3698 u_spriteHeight: height,
3699 ...maskUniforms
3700 };
3701 }
3746 }
3702 }
3747 }
3703
3748
@@ -3715,18 +3760,16 @@ export class WorldView
3715 { object._lit = true; }
3760 { object._lit = true; }
3716 const flash = Math.min(1, Math.max(0, flashStrength ?? 0));
3761 const flash = Math.min(1, Math.max(0, flashStrength ?? 0));
3717 const height = object.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3762 const height = object.renderer.sprite?.height ?? SPRITE_SIZE_PX;
3718 object.renderer.shader = getDualTintLitSpriteShader();
3763 const uniforms = this.#ensureUniformBag(object.renderer, getDualTintLitSpriteShader(), "dualTint");
3719 object.renderer.shaderUniforms = {
3764 uniforms.u_darkness = dark;
3720 u_darkness: dark,
3765 uniforms.u_strength = flash;
3721 u_strength: flash,
3766 this.#writeUniformVec3(uniforms, "u_flashColor", flashColor ?? FLASH_COLOR_DAMAGE);
3722 u_flashColor: flashColor ?? FLASH_COLOR_DAMAGE,
3767 uniforms.u_wade = wade ? 1 : 0;
3723 u_wade: wade ? 1 : 0,
3768 uniforms.u_spriteHeight = height;
3724 u_spriteHeight: height,
3769 this.#writeUniformVec3(uniforms, "u_shaftTint", shaft);
3725 u_shaftTint: [shaft.r, shaft.g, shaft.b],
3770 this.#writeUniformVec3(uniforms, "u_tipTint", tip);
3726 u_tipTint: [tip.r, tip.g, tip.b],
3771 this.#writeUniformVec3(uniforms, "u_coatTint", coat ?? { r: 0, g: 0, b: 0 });
3727 u_coatTint: coat ? [coat.r, coat.g, coat.b] : [0, 0, 0],
3772 uniforms.u_hasCoat = coat ? 1 : 0;
3728 u_hasCoat: coat ? 1 : 0
3729 };
3730 object.renderer.secondaryMap = null;
3773 object.renderer.secondaryMap = null;
3731 }
3774 }
3732
3775
@@ -3952,45 +3995,43 @@ export class WorldView
3952 const dSW = deepCorners?.sw ?? 0;
3995 const dSW = deepCorners?.sw ?? 0;
3953 const dSE = deepCorners?.se ?? 0;
3996 const dSE = deepCorners?.se ?? 0;
3954 object._lit = true;
3997 object._lit = true;
3955 object.renderer.shader = getWaterGroundShader();
3956 // Shallow + deep share one noise atlas so texAmp seams don't hard-cut at depth edges.
3998 // Shallow + deep share one noise atlas so texAmp seams don't hard-cut at depth edges.
3957 const sharedNoise = this.game.images[spriteImageName("ground", "water", "water")];
3999 const sharedNoise = this.game.images[spriteImageName("ground", "water", "water")];
3958 if (sharedNoise)
4000 if (sharedNoise)
3959 { object.renderer.sprite = sharedNoise; }
4001 { object.renderer.sprite = sharedNoise; }
3960 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4002 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
3961 object.renderer.shaderUniforms = {
4003 const uniforms = this.#ensureUniformBag(object.renderer, getWaterGroundShader(), "water");
3962 u_ambientDark: dark,
4004 uniforms.u_ambientDark = dark;
3963 u_litNW: lit.nw,
4005 uniforms.u_litNW = lit.nw;
3964 u_litNE: lit.ne,
4006 uniforms.u_litNE = lit.ne;
3965 u_litSW: lit.sw,
4007 uniforms.u_litSW = lit.sw;
3966 u_litSE: lit.se,
4008 uniforms.u_litSE = lit.se;
3967 u_time: timeSec,
4009 uniforms.u_time = timeSec;
3968 u_tileX: tileX | 0,
4010 uniforms.u_tileX = tileX | 0;
3969 u_tileY: tileY | 0,
4011 uniforms.u_tileY = tileY | 0;
3970 u_deepNW: dNW,
4012 uniforms.u_deepNW = dNW;
3971 u_deepNE: dNE,
4013 uniforms.u_deepNE = dNE;
3972 u_deepSW: dSW,
4014 uniforms.u_deepSW = dSW;
3973 u_deepSE: dSE,
4015 uniforms.u_deepSE = dSE;
3974 u_edgeN: edges?.n ?? 0,
4016 uniforms.u_edgeN = edges?.n ?? 0;
3975 u_edgeE: edges?.e ?? 0,
4017 uniforms.u_edgeE = edges?.e ?? 0;
3976 u_edgeS: edges?.s ?? 0,
4018 uniforms.u_edgeS = edges?.s ?? 0;
3977 u_edgeW: edges?.w ?? 0,
4019 uniforms.u_edgeW = edges?.w ?? 0;
3978 u_edgeNE: edges?.ne ?? 0,
4020 uniforms.u_edgeNE = edges?.ne ?? 0;
3979 u_edgeNW: edges?.nw ?? 0,
4021 uniforms.u_edgeNW = edges?.nw ?? 0;
3980 u_edgeSE: edges?.se ?? 0,
4022 uniforms.u_edgeSE = edges?.se ?? 0;
3981 u_edgeSW: edges?.sw ?? 0,
4023 uniforms.u_edgeSW = edges?.sw ?? 0;
3982 u_hasShore: shoreSprite ? 1 : 0,
4024 uniforms.u_hasShore = shoreSprite ? 1 : 0;
3983 u_shoreEdgeN: shore?.edgeN ?? 0,
4025 uniforms.u_shoreEdgeN = shore?.edgeN ?? 0;
3984 u_shoreEdgeE: shore?.edgeE ?? 0,
4026 uniforms.u_shoreEdgeE = shore?.edgeE ?? 0;
3985 u_shoreEdgeS: shore?.edgeS ?? 0,
4027 uniforms.u_shoreEdgeS = shore?.edgeS ?? 0;
3986 u_shoreEdgeW: shore?.edgeW ?? 0,
4028 uniforms.u_shoreEdgeW = shore?.edgeW ?? 0;
3987 u_shoreEdgeNE: shore?.edgeNE ?? 0,
4029 uniforms.u_shoreEdgeNE = shore?.edgeNE ?? 0;
3988 u_shoreEdgeNW: shore?.edgeNW ?? 0,
4030 uniforms.u_shoreEdgeNW = shore?.edgeNW ?? 0;
3989 u_shoreEdgeSE: shore?.edgeSE ?? 0,
4031 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
3990 u_shoreEdgeSW: shore?.edgeSW ?? 0,
4032 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
3991 u_shoreUvRect: [shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1],
4033 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
3992 ...waterDebugUniforms()
4034 Object.assign(uniforms, waterDebugUniforms());
3993 };
3994 }
4035 }
3995
4036
3996 /** Liquid water gets coast foam; frozen shallow ice uses the normal lit sprite. Lava is procedural heat. */
4037 /** Liquid water gets coast foam; frozen shallow ice uses the normal lit sprite. Lava is procedural heat. */
@@ -4170,37 +4211,35 @@ export class WorldView
4170 const shoreUv = shoreSprite?.getUvRect?.(0)
4211 const shoreUv = shoreSprite?.getUvRect?.(0)
4171 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4212 ?? { u0: 0, v0: 0, u1: 1, v1: 1 };
4172 object._lit = true;
4213 object._lit = true;
4173 object.renderer.shader = getLavaGroundShader();
4174 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4214 object.renderer.secondaryMap = shoreSprite?.g_image ?? null;
4175 object.renderer.shaderUniforms = {
4215 const uniforms = this.#ensureUniformBag(object.renderer, getLavaGroundShader(), "lava");
4176 u_ambientDark: dark,
4216 uniforms.u_ambientDark = dark;
4177 u_litNW: lit.nw,
4217 uniforms.u_litNW = lit.nw;
4178 u_litNE: lit.ne,
4218 uniforms.u_litNE = lit.ne;
4179 u_litSW: lit.sw,
4219 uniforms.u_litSW = lit.sw;
4180 u_litSE: lit.se,
4220 uniforms.u_litSE = lit.se;
4181 u_time: timeSec,
4221 uniforms.u_time = timeSec;
4182 u_tileX: tileX | 0,
4222 uniforms.u_tileX = tileX | 0;
4183 u_tileY: tileY | 0,
4223 uniforms.u_tileY = tileY | 0;
4184 u_edgeN: edges?.n ?? 0,
4224 uniforms.u_edgeN = edges?.n ?? 0;
4185 u_edgeE: edges?.e ?? 0,
4225 uniforms.u_edgeE = edges?.e ?? 0;
4186 u_edgeS: edges?.s ?? 0,
4226 uniforms.u_edgeS = edges?.s ?? 0;
4187 u_edgeW: edges?.w ?? 0,
4227 uniforms.u_edgeW = edges?.w ?? 0;
4188 u_edgeNE: edges?.ne ?? 0,
4228 uniforms.u_edgeNE = edges?.ne ?? 0;
4189 u_edgeNW: edges?.nw ?? 0,
4229 uniforms.u_edgeNW = edges?.nw ?? 0;
4190 u_edgeSE: edges?.se ?? 0,
4230 uniforms.u_edgeSE = edges?.se ?? 0;
4191 u_edgeSW: edges?.sw ?? 0,
4231 uniforms.u_edgeSW = edges?.sw ?? 0;
4192 u_hasShore: shoreSprite ? 1 : 0,
4232 uniforms.u_hasShore = shoreSprite ? 1 : 0;
4193 u_shoreEdgeN: shore?.edgeN ?? 0,
4233 uniforms.u_shoreEdgeN = shore?.edgeN ?? 0;
4194 u_shoreEdgeE: shore?.edgeE ?? 0,
4234 uniforms.u_shoreEdgeE = shore?.edgeE ?? 0;
4195 u_shoreEdgeS: shore?.edgeS ?? 0,
4235 uniforms.u_shoreEdgeS = shore?.edgeS ?? 0;
4196 u_shoreEdgeW: shore?.edgeW ?? 0,
4236 uniforms.u_shoreEdgeW = shore?.edgeW ?? 0;
4197 u_shoreEdgeNE: shore?.edgeNE ?? 0,
4237 uniforms.u_shoreEdgeNE = shore?.edgeNE ?? 0;
4198 u_shoreEdgeNW: shore?.edgeNW ?? 0,
4238 uniforms.u_shoreEdgeNW = shore?.edgeNW ?? 0;
4199 u_shoreEdgeSE: shore?.edgeSE ?? 0,
4239 uniforms.u_shoreEdgeSE = shore?.edgeSE ?? 0;
4200 u_shoreEdgeSW: shore?.edgeSW ?? 0,
4240 uniforms.u_shoreEdgeSW = shore?.edgeSW ?? 0;
4201 u_shoreUvRect: [shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1],
4241 this.#writeUniformVec4(uniforms, "u_shoreUvRect", shoreUv.u0, shoreUv.v0, shoreUv.u1, shoreUv.v1);
4202 ...lavaDebugUniforms()
4242 Object.assign(uniforms, lavaDebugUniforms());
4203 };
4204 }
4243 }
4205
4244
4206 #syncLavaBloomSprite (object, {
4245 #syncLavaBloomSprite (object, {
@@ -4212,21 +4251,19 @@ export class WorldView
4212 {
4251 {
4213 if (!object?.renderer)
4252 if (!object?.renderer)
4214 { return; }
4253 { return; }
4215 object.renderer.shader = getLavaBloomShader();
4254 const uniforms = this.#ensureUniformBag(object.renderer, getLavaBloomShader(), "lavaBloom");
4216 object.renderer.shaderUniforms = {
4255 uniforms.u_time = timeSec;
4217 u_time: timeSec,
4256 uniforms.u_tileX = tileX | 0;
4218 u_tileX: tileX | 0,
4257 uniforms.u_tileY = tileY | 0;
4219 u_tileY: tileY | 0,
4258 uniforms.u_edgeN = edges?.n ?? 0;
4220 u_edgeN: edges?.n ?? 0,
4259 uniforms.u_edgeE = edges?.e ?? 0;
4221 u_edgeE: edges?.e ?? 0,
4260 uniforms.u_edgeS = edges?.s ?? 0;
4222 u_edgeS: edges?.s ?? 0,
4261 uniforms.u_edgeW = edges?.w ?? 0;
4223 u_edgeW: edges?.w ?? 0,
4262 uniforms.u_edgeNE = edges?.ne ?? 0;
4224 u_edgeNE: edges?.ne ?? 0,
4263 uniforms.u_edgeNW = edges?.nw ?? 0;
4225 u_edgeNW: edges?.nw ?? 0,
4264 uniforms.u_edgeSE = edges?.se ?? 0;
4226 u_edgeSE: edges?.se ?? 0,
4265 uniforms.u_edgeSW = edges?.sw ?? 0;
4227 u_edgeSW: edges?.sw ?? 0,
4266 Object.assign(uniforms, lavaDebugUniforms());
4228 ...lavaDebugUniforms()
4229 };
4230 }
4267 }
4231
4268
4232 #ambientDarkness ()
4269 #ambientDarkness ()
@@ -5048,13 +5085,11 @@ export class WorldView
5048 { return; }
5085 { return; }
5049 object._lit = true;
5086 object._lit = true;
5050 const dark = Math.min(1, Math.max(0, darkness ?? 0));
5087 const dark = Math.min(1, Math.max(0, darkness ?? 0));
5051 object.renderer.shader = getCliffGroundTopShader();
5052 object.renderer.bumpMap = groundImage ?? null;
5088 object.renderer.bumpMap = groundImage ?? null;
5053 object.renderer.secondaryMap = null;
5089 object.renderer.secondaryMap = null;
5054 object.renderer.shaderUniforms = {
5090 const uniforms = this.#ensureUniformBag(object.renderer, getCliffGroundTopShader(), "cliffTop");
5055 u_darkness: dark,
5091 uniforms.u_darkness = dark;
5056 u_tileLocal: [localX, localY]
5092 this.#writeUniformVec2(uniforms, "u_tileLocal", localX, localY);
5057 };
5058 }
5093 }
5059
5094
5060 #layoutBakedChunk (snapshot)
5095 #layoutBakedChunk (snapshot)