BlueGit

timfa questward

Fix door Y-sort so S-closed draws above the player.

Widen the y-sort sub-order stride and keep equipment overlays in-band so south-closed doors stay in front on the same tile.

timfa Tim Falken · pushed by timfa

Authored 2026-09-02 · 2 months ago

Hash
b9deccf6e156c35adead4d79a352ec7b46d5769e
Parent
675d8092
5 files changed +36 −10
client/src/render/worldView.js +4 −3
@@ -43,7 +43,8 @@ const LAYER_GROUND = 0;
43 43 const LAYER_EDGE = 900000;
44 44 const SORT_BLOCK = 2;
45 45 const SORT_ENTITY = 3;
46 const SORT_HP_BAR = 4;
46 /** Equipment overlays use SORT_ENTITY + 1 + index (same sortY band). */
47 const SORT_HP_BAR = 14;
47 48 const SORT_FX = 5;
48 49 const RENDER_LAYER_BLOOM = "bloom";
49 50 const SKULL_SPRITE = "fx:skull:skull";
@@ -2558,7 +2559,7 @@ export class WorldView
2558 2559 for (let index = 0; index < (entity.overlays ?? []).length; index++)
2559 2560 {
2560 2561 const overlay = entity.overlays[index];
2561 const overlaySortY = pivotY + 0.5 * (index + 1);
2562 const overlaySort = Math.min(SORT_HP_BAR - 2, SORT_ENTITY + 1 + index);
2562 2563 overlay.transform.rotation = walkTilt;
2563 2564 const dualTint = entity.overlayDualTints?.[index] ?? null;
2564 2565 if (dualTint)
@@ -2581,7 +2582,7 @@ export class WorldView
2581 2582 {
2582 2583 this.#syncLitSprite(overlay, tileShade, flashStrength, wade, entity.overlayTints?.[index] ?? null, flashColor);
2583 2584 }
2584 this.#placePivoted(overlay, pivotX, pivotY, overlaySortY, SORT_ENTITY, entity.visualScale ?? 1, flight);
2585 this.#placePivoted(overlay, pivotX, pivotY, pivotY, overlaySort, entity.visualScale ?? 1, flight);
2585 2586 }
2586 2587 for (let index = 0; index < (entity.bloomOverlays ?? []).length; index++)
2587 2588 {
@@ -43,7 +43,8 @@ const LAYER_GROUND = 0;
43const LAYER_EDGE = 900000;
43const LAYER_EDGE = 900000;
44const SORT_BLOCK = 2;
44const SORT_BLOCK = 2;
45const SORT_ENTITY = 3;
45const SORT_ENTITY = 3;
46const SORT_HP_BAR = 4;
46/** Equipment overlays use SORT_ENTITY + 1 + index (same sortY band). */
47const SORT_HP_BAR = 14;
47const SORT_FX = 5;
48const SORT_FX = 5;
48const RENDER_LAYER_BLOOM = "bloom";
49const RENDER_LAYER_BLOOM = "bloom";
49const SKULL_SPRITE = "fx:skull:skull";
50const SKULL_SPRITE = "fx:skull:skull";
@@ -2558,7 +2559,7 @@ export class WorldView
2558 for (let index = 0; index < (entity.overlays ?? []).length; index++)
2559 for (let index = 0; index < (entity.overlays ?? []).length; index++)
2559 {
2560 {
2560 const overlay = entity.overlays[index];
2561 const overlay = entity.overlays[index];
2561 const overlaySortY = pivotY + 0.5 * (index + 1);
2562 const overlaySort = Math.min(SORT_HP_BAR - 2, SORT_ENTITY + 1 + index);
2562 overlay.transform.rotation = walkTilt;
2563 overlay.transform.rotation = walkTilt;
2563 const dualTint = entity.overlayDualTints?.[index] ?? null;
2564 const dualTint = entity.overlayDualTints?.[index] ?? null;
2564 if (dualTint)
2565 if (dualTint)
@@ -2581,7 +2582,7 @@ export class WorldView
2581 {
2582 {
2582 this.#syncLitSprite(overlay, tileShade, flashStrength, wade, entity.overlayTints?.[index] ?? null, flashColor);
2583 this.#syncLitSprite(overlay, tileShade, flashStrength, wade, entity.overlayTints?.[index] ?? null, flashColor);
2583 }
2584 }
2584 this.#placePivoted(overlay, pivotX, pivotY, overlaySortY, SORT_ENTITY, entity.visualScale ?? 1, flight);
2585 this.#placePivoted(overlay, pivotX, pivotY, pivotY, overlaySort, entity.visualScale ?? 1, flight);
2585 }
2586 }
2586 for (let index = 0; index < (entity.bloomOverlays ?? []).length; index++)
2587 for (let index = 0; index < (entity.bloomOverlays ?? []).length; index++)
2587 {
2588 {
server/tests/doors.test.js +1 −1
@@ -95,7 +95,7 @@ test("light and ranged LoS follow passage-open (flipped from resting), not the o
95 95 test("door sort sub-order puts N-closed behind and S-closed in front", () =>
96 96 {
97 97 assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
98 assert.equal(doorSortSubOrder("pine-s-closed", 3), 4);
98 assert.equal(doorSortSubOrder("pine-s-closed", 3), 12);
99 99 assert.equal(doorSortSubOrder("pine-n-open", 3), 3);
100 100 assert.equal(doorSortSubOrder("pine-s-open", 3), 3);
101 101 });
@@ -95,7 +95,7 @@ test("light and ranged LoS follow passage-open (flipped from resting), not the o
95test("door sort sub-order puts N-closed behind and S-closed in front", () =>
95test("door sort sub-order puts N-closed behind and S-closed in front", () =>
96{
96{
97 assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
97 assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
98 assert.equal(doorSortSubOrder("pine-s-closed", 3), 4);
98 assert.equal(doorSortSubOrder("pine-s-closed", 3), 12);
99 assert.equal(doorSortSubOrder("pine-n-open", 3), 3);
99 assert.equal(doorSortSubOrder("pine-n-open", 3), 3);
100 assert.equal(doorSortSubOrder("pine-s-open", 3), 3);
100 assert.equal(doorSortSubOrder("pine-s-open", 3), 3);
101});
101});
server/tests/pivot.test.js +13 −0
@@ -33,6 +33,19 @@ test("Y-sort puts a southern tile in front of a northern tile", () =>
33 33 assert.ok(ySortLayer(16, 1) > ySortLayer(0, 1));
34 34 });
35 35
36 test("S-closed door stays in front of entity equipment overlays on the same tile", () =>
37 {
38 const sortY = 128;
39 const entityBody = ySortLayer(sortY, 3);
40 const entityOverlay = ySortLayer(sortY, 3 + 1 + 5);
41 const doorFront = ySortLayer(sortY, 12);
42 const doorBehind = ySortLayer(sortY, 1);
43 assert.ok(doorFront > entityOverlay);
44 assert.ok(doorFront > entityBody);
45 assert.ok(entityBody > doorBehind);
46 assert.ok(ySortLayer(sortY, 14) > doorFront);
47 });
48
36 49 test("flight sort stays above any ground y-sort in view", () =>
37 50 {
38 51 const farSouthBlock = ySortLayer(50_000, 3);
@@ -33,6 +33,19 @@ test("Y-sort puts a southern tile in front of a northern tile", () =>
33 assert.ok(ySortLayer(16, 1) > ySortLayer(0, 1));
33 assert.ok(ySortLayer(16, 1) > ySortLayer(0, 1));
34});
34});
35
35
36test("S-closed door stays in front of entity equipment overlays on the same tile", () =>
37{
38 const sortY = 128;
39 const entityBody = ySortLayer(sortY, 3);
40 const entityOverlay = ySortLayer(sortY, 3 + 1 + 5);
41 const doorFront = ySortLayer(sortY, 12);
42 const doorBehind = ySortLayer(sortY, 1);
43 assert.ok(doorFront > entityOverlay);
44 assert.ok(doorFront > entityBody);
45 assert.ok(entityBody > doorBehind);
46 assert.ok(ySortLayer(sortY, 14) > doorFront);
47});
48
36test("flight sort stays above any ground y-sort in view", () =>
49test("flight sort stays above any ground y-sort in view", () =>
37{
50{
38 const farSouthBlock = ySortLayer(50_000, 3);
51 const farSouthBlock = ySortLayer(50_000, 3);
shared/render/pivot.js +10 −2
@@ -25,9 +25,16 @@ export function spriteDrawSize (spriteWidth, spriteHeight, zoom)
25 25 };
26 26 }
27 27
28 /**
29 * Within one rounded sortY, layers occupy [0, Y_SORT_SUBORDER_STRIDE).
30 * Keep door front / HP bar above entity body + equipment overlays.
31 */
32 export const Y_SORT_SUBORDER_STRIDE = 16;
33
28 34 export function ySortLayer (sortY, subOrder)
29 35 {
30 return 10000 + Math.round(sortY) * 4 + subOrder;
36 const slot = Math.max(0, Math.min(Y_SORT_SUBORDER_STRIDE - 1, subOrder | 0));
37 return 10000 + Math.round(sortY) * Y_SORT_SUBORDER_STRIDE + slot;
31 38 }
32 39
33 40 /**
@@ -38,5 +45,6 @@ export const FLIGHT_SORT_BIAS = 2_000_000;
38 45
39 46 export function flightSortLayer (sortY, subOrder = 0)
40 47 {
41 return FLIGHT_SORT_BIAS + Math.round(sortY) * 4 + (subOrder | 0);
48 const slot = Math.max(0, Math.min(Y_SORT_SUBORDER_STRIDE - 1, subOrder | 0));
49 return FLIGHT_SORT_BIAS + Math.round(sortY) * Y_SORT_SUBORDER_STRIDE + slot;
42 50 }
@@ -25,9 +25,16 @@ export function spriteDrawSize (spriteWidth, spriteHeight, zoom)
25 };
25 };
26}
26}
27
27
28/**
29 * Within one rounded sortY, layers occupy [0, Y_SORT_SUBORDER_STRIDE).
30 * Keep door front / HP bar above entity body + equipment overlays.
31 */
32export const Y_SORT_SUBORDER_STRIDE = 16;
33
28export function ySortLayer (sortY, subOrder)
34export function ySortLayer (sortY, subOrder)
29{
35{
30 return 10000 + Math.round(sortY) * 4 + subOrder;
36 const slot = Math.max(0, Math.min(Y_SORT_SUBORDER_STRIDE - 1, subOrder | 0));
37 return 10000 + Math.round(sortY) * Y_SORT_SUBORDER_STRIDE + slot;
31}
38}
32
39
33/**
40/**
@@ -38,5 +45,6 @@ export const FLIGHT_SORT_BIAS = 2_000_000;
38
45
39export function flightSortLayer (sortY, subOrder = 0)
46export function flightSortLayer (sortY, subOrder = 0)
40{
47{
41 return FLIGHT_SORT_BIAS + Math.round(sortY) * 4 + (subOrder | 0);
48 const slot = Math.max(0, Math.min(Y_SORT_SUBORDER_STRIDE - 1, subOrder | 0));
49 return FLIGHT_SORT_BIAS + Math.round(sortY) * Y_SORT_SUBORDER_STRIDE + slot;
42}
50}
shared/world/doors.js +8 −4
@@ -97,19 +97,23 @@ export function isDoorOpenState (state)
97 97 }
98 98
99 99 /**
100 * Y-sort sub-order within the door's tile (see `ySortLayer`).
101 * N-closed draws behind blocks/entities; S-closed in front of them;
100 * Y-sort sub-order within the door's tile (see `ySortLayer` / `Y_SORT_SUBORDER_STRIDE`).
101 * N-closed draws behind blocks/entities; S-closed in front of entity + equipment;
102 102 * still shares the tile's sortY so the row above stays behind.
103 103 * Visual open sprites use the default entity sub-order.
104 104 */
105 export const DOOR_SORT_BEHIND = 1;
106 /** Above entity body (3) and equipment overlays (4…). */
107 export const DOOR_SORT_FRONT = 12;
108
105 109 export function doorSortSubOrder (state, defaultSubOrder = 3)
106 110 {
107 111 const parsed = parseDoorState(state);
108 112 if (!parsed || parsed.open)
109 113 { return defaultSubOrder; }
110 114 if (parsed.facing === DoorFacing.n)
111 { return 1; }
112 return 4;
115 { return DOOR_SORT_BEHIND; }
116 return DOOR_SORT_FRONT;
113 117 }
114 118
115 119 /**
@@ -97,19 +97,23 @@ export function isDoorOpenState (state)
97}
97}
98
98
99/**
99/**
100 * Y-sort sub-order within the door's tile (see `ySortLayer`).
100 * Y-sort sub-order within the door's tile (see `ySortLayer` / `Y_SORT_SUBORDER_STRIDE`).
101 * N-closed draws behind blocks/entities; S-closed in front of them;
101 * N-closed draws behind blocks/entities; S-closed in front of entity + equipment;
102 * still shares the tile's sortY so the row above stays behind.
102 * still shares the tile's sortY so the row above stays behind.
103 * Visual open sprites use the default entity sub-order.
103 * Visual open sprites use the default entity sub-order.
104 */
104 */
105export const DOOR_SORT_BEHIND = 1;
106/** Above entity body (3) and equipment overlays (4…). */
107export const DOOR_SORT_FRONT = 12;
108
105export function doorSortSubOrder (state, defaultSubOrder = 3)
109export function doorSortSubOrder (state, defaultSubOrder = 3)
106{
110{
107 const parsed = parseDoorState(state);
111 const parsed = parseDoorState(state);
108 if (!parsed || parsed.open)
112 if (!parsed || parsed.open)
109 { return defaultSubOrder; }
113 { return defaultSubOrder; }
110 if (parsed.facing === DoorFacing.n)
114 if (parsed.facing === DoorFacing.n)
111 { return 1; }
115 { return DOOR_SORT_BEHIND; }
112 return 4;
116 return DOOR_SORT_FRONT;
113}
117}
114
118
115/**
119/**