mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Stack sprite layers by draw order, flights on top
Each sprite layer's icon or dot set is now made at a draw order taken from SPRITE_LAYER_ORDER through the renderer's per-set drawOrder: flights over military, vessels, directions, transit, bikeshare, FIRMS and CCTV, whichever layer was turned on first. Picks name the topmost first. The orders are negative, so selection highlights, route endpoints, the tracked plane and every other set at the default order still draw over all sprite layers, as they did before. The raise-to-top restorer, the sprite registry and the primitive-name lookups are gone, which takes spriteOrder.js off the viewer-access list. Before, the restorer raised the layers to the bottom of the scene in the order they were enabled, so flights usually ended up under the others.
This commit is contained in:
1 parent
657ef94f77
commit
c073064507
40 files changed
+271
-562
No files matched your search
+93
-116
@@ -1,121 +1,98 @@
|
||||
import { createRendering as createFirmsRendering } from '../layers/firms/rendering.js';
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import {
|
||||
registerSpriteCollection,
|
||||
restoreSpriteOrder,
|
||||
restoreSpriteOrderOnEnable,
|
||||
unregisterSpriteCollection,
|
||||
} from './spriteOrder.js';
|
||||
import flightsLayer from './flights.js';
|
||||
import aisLiveVesselsLayer from './aisLiveVessels.js';
|
||||
import { createFirmsHeatmapLayer } from './firmsHeatmap.js';
|
||||
import * as sprites from './spriteOrder.js';
|
||||
import { SPRITE_LAYER_ORDER, spriteDrawOrder } from './spriteOrder.js';
|
||||
import { createAircraftIcons } from './aircraftIconLayer.js';
|
||||
import { createRendering as createBikeshareRendering } from '../layers/bikeshare/rendering.js';
|
||||
import { createRendering as createCctvRendering } from '../layers/cctv/rendering.js';
|
||||
import { createRendering as createFirmsRendering } from '../layers/firms/rendering.js';
|
||||
import { bindFakeDraw } from '../testSupport/fakeDrawPort.mjs';
|
||||
|
||||
const ORDER = ['cctv', 'firms', 'bikeshare', 'ais', 'military', 'flights'];
|
||||
|
||||
function makePrimitives(initial = []) {
|
||||
return {
|
||||
items: [...initial],
|
||||
calls: [],
|
||||
contains(collection) { return this.items.includes(collection); },
|
||||
raiseToTop(collection) {
|
||||
this.calls.push(collection.id);
|
||||
const index = this.items.indexOf(collection);
|
||||
if (index >= 0) this.items.splice(index, 1);
|
||||
this.items.push(collection);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function makeCollection(id, destroyed = false) {
|
||||
return { id, isDestroyed: () => destroyed };
|
||||
}
|
||||
|
||||
test('restoreSpriteOrder raises live collections bottom-to-top and skips destroyed entries', () => {
|
||||
const collections = Object.fromEntries(ORDER.map((id) => [id, makeCollection(id)]));
|
||||
const destroyedFirms = makeCollection('firms', true);
|
||||
for (const id of ORDER) {
|
||||
registerSpriteCollection(id, id === 'firms' ? destroyedFirms : collections[id]);
|
||||
}
|
||||
const primitives = makePrimitives([
|
||||
collections.flights,
|
||||
collections.ais,
|
||||
collections.cctv,
|
||||
collections.bikeshare,
|
||||
collections.military,
|
||||
]);
|
||||
|
||||
restoreSpriteOrder({ scene: { primitives } });
|
||||
|
||||
assert.deepEqual(primitives.calls, ['cctv', 'bikeshare', 'ais', 'military', 'flights']);
|
||||
assert.deepEqual(primitives.items.map((item) => item.id), [
|
||||
'cctv', 'bikeshare', 'ais', 'military', 'flights',
|
||||
]);
|
||||
|
||||
for (const id of ORDER) unregisterSpriteCollection(id);
|
||||
});
|
||||
|
||||
test('late CCTV registration still restores flights above the ambient collection', () => {
|
||||
const flights = makeCollection('flights');
|
||||
const cctv = makeCollection('cctv');
|
||||
const primitives = makePrimitives([flights]);
|
||||
const viewer = { scene: { primitives } };
|
||||
|
||||
registerSpriteCollection('flights', flights);
|
||||
restoreSpriteOrder(viewer);
|
||||
primitives.items.push(cctv); // CCTV enabled after flights: it starts on top.
|
||||
registerSpriteCollection('cctv', cctv);
|
||||
primitives.calls.length = 0;
|
||||
|
||||
restoreSpriteOrder(viewer);
|
||||
|
||||
assert.deepEqual(primitives.calls, ['cctv', 'flights']);
|
||||
assert.deepEqual(primitives.items.map((item) => item.id), ['cctv', 'flights']);
|
||||
|
||||
unregisterSpriteCollection('cctv', cctv);
|
||||
unregisterSpriteCollection('flights', flights);
|
||||
});
|
||||
|
||||
test('restoreSpriteOrder is inert for destroyed viewers and primitive collections', () => {
|
||||
const flights = makeCollection('flights');
|
||||
const primitives = makePrimitives([flights]);
|
||||
registerSpriteCollection('flights', flights);
|
||||
|
||||
restoreSpriteOrder({ isDestroyed: () => true, scene: { primitives } });
|
||||
restoreSpriteOrder({ scene: { primitives: { ...primitives, isDestroyed: () => true } } });
|
||||
|
||||
assert.deepEqual(primitives.calls, []);
|
||||
unregisterSpriteCollection('flights', flights);
|
||||
});
|
||||
|
||||
test('restoreSpriteOrder never raises a registered collection absent from scene primitives', () => {
|
||||
const flights = makeCollection('flights');
|
||||
const primitives = makePrimitives([]);
|
||||
registerSpriteCollection('flights', flights);
|
||||
|
||||
restoreSpriteOrder({ scene: { primitives } });
|
||||
|
||||
assert.deepEqual(primitives.calls, []);
|
||||
assert.deepEqual(primitives.items, []);
|
||||
unregisterSpriteCollection('flights', flights);
|
||||
});
|
||||
|
||||
test('flights, AIS, and FIRMS enable paths are wired through the shared sprite restorer', () => {
|
||||
const viewer = { id: 'viewer' };
|
||||
const calls = [];
|
||||
const restoreSpy = (value) => calls.push(value);
|
||||
for (const layerId of ['flights', 'ais', 'firms']) {
|
||||
restoreSpriteOrderOnEnable(layerId, viewer, restoreSpy);
|
||||
}
|
||||
assert.deepEqual(calls, [viewer, viewer, viewer]);
|
||||
|
||||
const firmsLayer = createFirmsHeatmapLayer({ id: 'firms', name: 'FIRMS' });
|
||||
assert.match(flightsLayer.enable.toString(), /restoreSpriteOrderOnEnable\('flights', viewer\)/);
|
||||
assert.match(aisLiveVesselsLayer.enable.toString(), /restoreSpriteOrderOnEnable\('ais', activeViewer\)/);
|
||||
assert.match(firmsLayer.enable.toString(), /restoreSpriteOrderOnEnable\('firms', viewer\)/);
|
||||
assert.match(
|
||||
createFirmsRendering.toString(),
|
||||
/spriteEntry = registerSpriteSet\('firms', set\.id\);\s*restoreSpriteOrder\(layerState\._viewer\);/,
|
||||
'lazy FIRMS registration must restore order immediately',
|
||||
test('each sprite layer draws at its place in the order, flights on top', () => {
|
||||
assert.deepEqual(
|
||||
SPRITE_LAYER_ORDER.map(spriteDrawOrder),
|
||||
SPRITE_LAYER_ORDER.map((_, i) => i - SPRITE_LAYER_ORDER.length),
|
||||
);
|
||||
assert.equal(
|
||||
Math.max(...SPRITE_LAYER_ORDER.map(spriteDrawOrder)),
|
||||
spriteDrawOrder('flights'),
|
||||
);
|
||||
assert.ok(spriteDrawOrder('military') > spriteDrawOrder('ais'));
|
||||
assert.ok(spriteDrawOrder('ais') > spriteDrawOrder('transit'));
|
||||
assert.ok(spriteDrawOrder('transit') > spriteDrawOrder('cctv'));
|
||||
// Any other layer stays at the default, over every sprite layer.
|
||||
assert.equal(spriteDrawOrder('flights'), -1);
|
||||
assert.equal(spriteDrawOrder('street-level:marker'), 0);
|
||||
assert.equal(spriteDrawOrder(undefined), 0);
|
||||
});
|
||||
|
||||
/** A viewer double with a fake draw port, unbound after the test. */
|
||||
function drawnViewer(t) {
|
||||
const viewer = {};
|
||||
const { draw, unbind } = bindFakeDraw(viewer);
|
||||
t.after(unbind);
|
||||
return { viewer, draw };
|
||||
}
|
||||
|
||||
test('flights and military make their icon sets at their draw orders', (t) => {
|
||||
const { viewer, draw } = drawnViewer(t);
|
||||
for (const layerId of ['flights', 'military']) {
|
||||
const icons = createAircraftIcons({
|
||||
state: {},
|
||||
services: { focus: { focusPassIsNeeded: () => false }, sprites },
|
||||
parts: {},
|
||||
layerId,
|
||||
renderDelaySec: 0,
|
||||
courseMaxDps: 1,
|
||||
cockpitContactSizePx: 4,
|
||||
});
|
||||
const id = icons._createIcons(viewer);
|
||||
assert.equal(draw.set(id).spec.drawOrder, spriteDrawOrder(layerId));
|
||||
icons._disposeIcons();
|
||||
}
|
||||
});
|
||||
|
||||
test('CCTV, FIRMS and bikeshare make their sprite sets at their draw orders', (t) => {
|
||||
const { viewer, draw } = drawnViewer(t);
|
||||
const cctv = createCctvRendering({
|
||||
state: {},
|
||||
services: { focus: {}, sprites },
|
||||
parts: {},
|
||||
source: {},
|
||||
});
|
||||
const cctvId = cctv.createCameraIcons(viewer);
|
||||
assert.equal(draw.set(cctvId).spec.drawOrder, spriteDrawOrder('cctv'));
|
||||
cctv.destroyCameraIcons();
|
||||
|
||||
const layerState = { _viewer: viewer, _enabled: true };
|
||||
const firms = createFirmsRendering({
|
||||
layerState,
|
||||
services: { anchors: {}, sprites },
|
||||
components: {},
|
||||
config: {
|
||||
overlayHost: { setVisible() {}, clearSource() {} },
|
||||
},
|
||||
});
|
||||
firms.ensureDetectionCollections();
|
||||
assert.equal(
|
||||
draw.set(layerState._icons.id).spec.drawOrder,
|
||||
spriteDrawOrder('firms'),
|
||||
);
|
||||
firms.removeDetectionCollections();
|
||||
|
||||
const bikeState = {};
|
||||
const bikeshare = createBikeshareRendering({
|
||||
state: bikeState,
|
||||
services: { render: {}, sprites },
|
||||
parts: {},
|
||||
source: {},
|
||||
});
|
||||
bikeshare.attachSets(viewer);
|
||||
assert.equal(
|
||||
draw.set(bikeState._stationSet.id).spec.drawOrder,
|
||||
spriteDrawOrder('bikeshare'),
|
||||
);
|
||||
// The selected station's highlight is not a sprite layer.
|
||||
assert.equal(draw.set(bikeState._selectedSet.id).spec.drawOrder, undefined);
|
||||
bikeshare.detachSets();
|
||||
});
|
||||
Reference in new issue
Block a user