Delete the billboard and model mirrors; models become layer-held records

Aircraft draw from GPU icon sets, so the billboard mirror, the billboard
treatment and the aircraft visual-state module had no callers left. 3D models
are now records the layer holds under the contact's id (modelRecord.js):
show and placement are written through showModel/placeModel and read back
from the record; renderer-measured values stay on record.model.

The tracked-model click check only matches when a tracked model exists, so
an id-only pick is never mistaken for a click on the tracked plane.
This commit is contained in:
Sameh Khamis committed 2026-11-03 22:36:27 -08:00
1 parent c9f1fcd425
commit 83ec9473b6
35 files changed
+391 -788

No files matched your search

-11
View File
@@ -1,11 +0,0 @@
import { createEntityStore } from '../../data/entityRecords.js';
/**
* What the aircraft layers (flights, military, local ADS-B) remember about the
* models and billboards they draw, kept beside them rather than on them.
* - `specKey`: the model spec a model was loaded for; a class change reloads.
* - `irBoost`: the IR boost a model was loaded with; a flip reloads.
* - `bellyM`: metres from the model origin to its belly, to sit it on the ground.
* - `iconLarge`: whether a billboard shows the large icon raster.
*/
export const aircraftVisuals = createEntityStore();
+6 -7
View File
@@ -32,7 +32,6 @@ import {
DISPLAY_CORRIDOR_CELL_BUDGET,
DISPLAY_CORRIDOR_FAIR_SHARE,
} from './policy.js';
import { modelState } from '../../data/modelMirror.js';
import { readEntityRecord } from '../../data/entityRecords.js';
import {
aircraftMotionRegime,
@@ -476,10 +475,10 @@ export function createMotion({
flightState.records.data.get(flightState._trackedIcao)?.klass,
);
return modelVisualAnchor(
modelState(flightState._trackedModel).modelMatrix,
flightState._trackedModel.matrix,
spec.visualCenterNative,
Number.isFinite(flightState._trackedModel.computedScale)
? flightState._trackedModel.computedScale
Number.isFinite(flightState._trackedModel.model.computedScale)
? flightState._trackedModel.model.computedScale
: spec.scale,
flightState._trackedVisualPos,
);
@@ -505,7 +504,7 @@ export function createMotion({
)
return null;
return Cesium.Matrix4.getTranslation(
modelState(flightState._trackedModel).modelMatrix,
flightState._trackedModel.matrix,
flightState._scratchTrailClip,
);
}
@@ -520,8 +519,8 @@ export function createMotion({
const spec = parts.rendering._modelSpec(
flightState.records.data.get(flightState._trackedIcao)?.klass,
);
const scale = Number.isFinite(flightState._trackedModel.computedScale)
? flightState._trackedModel.computedScale
const scale = Number.isFinite(flightState._trackedModel.model.computedScale)
? flightState._trackedModel.model.computedScale
: spec.scale;
return spec.nativeRadiusM * scale;
}
+8 -6
View File
@@ -16,7 +16,6 @@ import {
FLEET_DR_INTERVAL_MS,
} from './policy.js';
import { emergencyBroadcastPhrase } from '../../data/aircraftEmergency.js';
import { modelState } from '../../data/modelMirror.js';
export function createQueries({
flightState,
@@ -440,8 +439,11 @@ export function createQueries({
const isTracked = icao24 === flightState._trackedIcao;
// Keep planes rendered as a 3D model (icon hidden) so the detection box
// doesn't vanish on the 2D→3D handoff.
const model = flightState._models.get(icao24) ?? null;
const modelOwnsVisual = parts.rendering._modelOwnsVisual(icao24, model);
const record = flightState._models.get(icao24) ?? null;
const modelOwnsVisual = parts.rendering._modelOwnsVisual(
icao24,
record,
);
if (!isTracked && !icons.shown(row) && !modelOwnsVisual) continue;
const info = flightState.records.data.get(icao24);
let object = flightState._detectionObjects.get(icao24);
@@ -470,10 +472,10 @@ export function createQueries({
icons.position(row, tau, object._iconPos)
: modelOwnsVisual
? modelVisualAnchor(
modelState(model).modelMatrix,
record.matrix,
spec.visualCenterNative,
Number.isFinite(model.computedScale)
? model.computedScale
Number.isFinite(record.model.computedScale)
? record.model.computedScale
: spec.scale,
object._weldPos || (object._weldPos = new Cesium.Cartesian3()),
)
+17 -14
View File
@@ -6,7 +6,11 @@ import { createRendering } from './rendering.js';
import { createIcons } from './icons.js';
import { createIconSet } from '../../data/iconSet.js';
import { writeHoldSegment } from '../../data/iconSegment.js';
import { mirrorModel, setModel } from '../../data/modelMirror.js';
import {
createModelRecord,
placeModel,
showModel,
} from '../../data/modelRecord.js';
function fixture() {
const info = {
@@ -109,7 +113,7 @@ test('candidate collection resolves models once and keeps handoffs live', (t) =>
const get = t.mock.method(f.flightState._models, 'get');
const [candidate] = f.queries.getDetectableObjects();
assert.equal(get.mock.callCount(), 1);
const model = mirrorModel({
const record = createModelRecord({
ready: false,
show: true,
modelMatrix: Cesium.Matrix4.fromTranslation(
@@ -120,25 +124,24 @@ test('candidate collection resolves models once and keeps handoffs live', (t) =>
visualCenterNative: Cesium.Cartesian3.ZERO,
scale: 1,
});
f.flightState._models.set('abc123', model);
f.flightState._models.set('abc123', record);
f.show(false);
assert.deepEqual(f.queries.getDetectableObjects(), []);
model.ready = true;
record.model.ready = true;
assert.equal(f.queries.getDetectableObjects()[0], candidate);
assert.deepEqual(candidate.position, new Cesium.Cartesian3(10, 20, 30));
setModel(
model,
'modelMatrix',
placeModel(
record,
Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(40, 50, 60)),
);
f.queries.getDetectableObjects();
assert.deepEqual(candidate.position, new Cesium.Cartesian3(40, 50, 60));
setModel(model, 'show', false);
showModel(record, false);
assert.deepEqual(f.queries.getDetectableObjects(), []);
f.show(true);
assert.deepEqual(f.queries.getDetectableObjects()[0].position, f.drawn());
assert.equal(get.mock.callCount(), 6);
setModel(model, 'show', true);
showModel(record, true);
assert.equal(f.parts.rendering._modelOwnsVisual('abc123'), true);
assert.equal(get.mock.callCount(), 7);
});
@@ -146,7 +149,7 @@ test('candidate collection resolves models once and keeps handoffs live', (t) =>
test('tracked ownership and live anchors remain independent of fleet models', () => {
const f = fixture();
f.flightState._trackedIcao = 'abc123';
f.flightState._trackedModel = mirrorModel({ ready: true, show: true });
f.flightState._trackedModel = createModelRecord({ ready: true, show: true });
f.parts.rendering._modelSpec = () => ({});
let anchor = new Cesium.Cartesian3(10, 20, 30);
f.parts.motion._trackedVisualCached = () => anchor;
@@ -158,16 +161,16 @@ test('tracked ownership and live anchors remain independent of fleet models', ()
assert.equal(f.queries.getDetectableObjects()[0].position, anchor);
for (const tracked of [
null,
mirrorModel({ ready: false, show: true }),
mirrorModel({ ready: true, show: false }),
createModelRecord({ ready: false, show: true }),
createModelRecord({ ready: true, show: false }),
]) {
f.flightState._trackedModel = tracked;
assert.equal(
f.parts.rendering._modelOwnsVisual('abc123', mirrorModel({ ready: true, show: true })),
f.parts.rendering._modelOwnsVisual('abc123', createModelRecord({ ready: true, show: true })),
false,
);
}
f.flightState._trackedModel = mirrorModel({ ready: true, show: true });
f.flightState._trackedModel = createModelRecord({ ready: true, show: true });
f.parts.tracking._trackedModelRegimeActive = () => false;
assert.equal(f.parts.rendering._modelOwnsVisual('abc123', null), false);
});
+2 -2
View File
@@ -239,8 +239,8 @@ export function createFlightSnapshotRenderer({
sampleMeshFloorCells(flightState._viewer?.scene, floorWarmPoints, {
excludeObjects: [
...icons._iconIds(),
...flightState._models.values(),
flightState._trackedModel,
...[...flightState._models.values()].map((record) => record.model),
flightState._trackedModel?.model,
].filter(Boolean),
viewerLat: viewerLatDeg,
viewerLon: viewerLonDeg,
+11 -11
View File
@@ -1,6 +1,6 @@
import * as Cesium from 'cesium';
import { CYAN_TRANSPARENT } from './policy.js';
import { mirrorModel } from '../../data/modelMirror.js';
import { createModelRecord } from '../../data/modelRecord.js';
import { createIconSet } from '../../data/iconSet.js';
import { aircraftIconTestSeams } from '../../data/aircraftIconLayer.js';
@@ -49,9 +49,9 @@ export function createTesting({
* @param {string} state.icao24
* @param {object} state.entity
* @param {object} state.meta
* @param {{position?: Cesium.Cartesian3, show?: boolean}} [state.billboard]
* @param {{position?: Cesium.Cartesian3, show?: boolean}} [state.icon]
* Where the contact's icon is held, and whether it is shown.
* @param {{show?: boolean}} [state.billboardCollection] Layer visibility.
* @param {{show?: boolean}} [state.iconLayer] Layer visibility.
* @param {object} state.viewer
* @param {Array<Object>} [state.history=[]]
* @param {boolean} [state.tracked=true]
@@ -63,8 +63,8 @@ export function createTesting({
icao24,
entity,
meta,
billboard,
billboardCollection,
icon,
iconLayer,
viewer,
history = [],
tracked = true,
@@ -76,13 +76,13 @@ export function createTesting({
flightState._icons = createIconSet({
epoch: parts.icons._displayTime(new Cesium.JulianDate()),
});
flightState._icons.show = billboardCollection?.show ?? true;
flightState._icons.show = iconLayer?.show ?? true;
flightState._grounded.clear();
flightState._floorPinned.clear();
_seedIconForTest(icao24, billboard, tracked);
_seedIconForTest(icao24, icon, tracked);
flightState._models.clear();
for (const [key, model] of models)
flightState._models.set(key, mirrorModel(model));
flightState._models.set(key, createModelRecord(model));
flightState._detectionObjects = new Map();
flightState.records.data = new Map([[icao24, meta]]);
flightState._positionHistory = new Map([[icao24, history]]);
@@ -125,10 +125,10 @@ export function createTesting({
function _addFlightTrackingCandidateForTest({
icao24,
meta,
billboard,
icon,
history = [],
}) {
_seedIconForTest(icao24, billboard, false);
_seedIconForTest(icao24, icon, false);
flightState.records.data.set(icao24, meta);
flightState._positionHistory.set(icao24, history);
}
@@ -205,7 +205,7 @@ export function createTesting({
async function _ensureFleetModelForTest(icao24) {
await parts.rendering._ensureModel(icao24);
return flightState._models.get(icao24) || null;
return flightState._models.get(icao24)?.model ?? null;
}
/** Run the fleet tick's grounded floor pass once, at `renderTime`. */
+2 -1
View File
@@ -1193,7 +1193,8 @@ export function createTracking({
const rawPick =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
if (
picked.primitive === flightState._trackedModel ||
(flightState._trackedModel &&
picked.primitive === flightState._trackedModel.model) ||
rawPick === flightState._trackedIcao
)
return;
+27 -24
View File
@@ -15,8 +15,11 @@ import {
MODEL_PROX_KEEP_M,
} from '../flights/policy.js';
import { AIRCRAFT_ENVIRONMENT_MAP_OPTIONS } from '../../data/aircraftModelLighting.js';
import { aircraftVisuals } from '../aircraft/visualState.js';
import { setModel } from '../../data/modelMirror.js';
import {
createModelRecord,
placeModel,
showModel,
} from '../../data/modelRecord.js';
const specKey = (spec) => `${spec.url}@${spec.scale}`;
@@ -48,7 +51,7 @@ export function createLocalAdsbModels({
}) {
const collection = new Cesium.PrimitiveCollection();
viewer.scene.primitives.add(collection);
/** @type {Map<string, object>} id -> admitted model */
/** @type {Map<string, import('../../data/modelRecord.js').ModelRecord>} id -> admitted model */
const models = new Map();
/** @type {Map<string, number>} id -> generation of an in-flight load */
const pending = new Map();
@@ -64,10 +67,10 @@ export function createLocalAdsbModels({
function release(id) {
pending.delete(id);
const model = models.get(id);
if (!model) return;
const record = models.get(id);
if (!record) return;
models.delete(id);
if (!collection.isDestroyed()) collection.remove(model);
if (!collection.isDestroyed()) collection.remove(record.model);
groundSnap?.forget?.(id);
}
@@ -81,7 +84,7 @@ export function createLocalAdsbModels({
const spec = civilAircraftModelSpec(marker.klass);
const key = specKey(spec);
const current = models.get(id);
if (current && aircraftVisuals.read(current)?.specKey === key) return;
if (current?.specKey === key) return;
if (current) release(id);
if (pending.has(id) || models.size + pending.size >= cap) return;
const loadGeneration = generation;
@@ -116,13 +119,14 @@ export function createLocalAdsbModels({
return;
}
model.id = id;
const visual = aircraftVisuals.write(model);
visual.specKey = key;
visual.bellyM = spec.bellyM;
const record = createModelRecord(model, {
specKey: key,
bellyM: spec.bellyM,
});
// Admitted, not yet the visual: placement turns it on.
setModel(model, 'show', false);
showModel(record, false);
collection.add(model);
models.set(id, model);
models.set(id, record);
}
function regime(preferences) {
@@ -171,11 +175,11 @@ export function createLocalAdsbModels({
function placement(id, marker) {
if (!marker.onGround) return marker.position;
const model = models.get(id);
const record = models.get(id);
// The vertical sample must hit the tile skin, not this aircraft's own
// billboard or model.
const height = groundSnap?.heightFor?.(viewer, id, marker.position, () =>
[marker.entity, model].filter(Boolean),
[marker.entity, record?.model].filter(Boolean),
);
if (!Number.isFinite(height)) return null;
const carto = Cesium.Cartographic.fromCartesian(
@@ -186,7 +190,7 @@ export function createLocalAdsbModels({
return Cesium.Cartesian3.fromRadians(
carto.longitude,
carto.latitude,
height + (aircraftVisuals.read(model)?.bellyM || 0),
height + (record?.bellyM || 0),
Cesium.Ellipsoid.WGS84,
scratchGround,
);
@@ -221,12 +225,12 @@ export function createLocalAdsbModels({
}
const occluder = horizonOccluder(viewer.camera);
for (const [id, marker] of markers) {
const model = models.get(id);
const record = models.get(id);
marker.modelOwnsVisual = false;
if (!model || !marker.position) continue;
if (!record || !marker.position) continue;
const position = placement(id, marker);
if (!position || !occluder.isPointVisible(marker.position)) {
setModel(model, 'show', false);
showModel(record, false);
continue;
}
scratchHpr.heading = Cesium.Math.toRadians(
@@ -234,9 +238,8 @@ export function createLocalAdsbModels({
);
scratchHpr.pitch = 0;
scratchHpr.roll = 0;
setModel(
model,
'modelMatrix',
placeModel(
record,
Cesium.Transforms.headingPitchRollToFixedFrame(
position,
scratchHpr,
@@ -245,11 +248,11 @@ export function createLocalAdsbModels({
scratchMatrix,
),
);
if (!model.ready) {
setModel(model, 'show', false);
if (!record.model.ready) {
showModel(record, false);
continue;
}
setModel(model, 'show', true);
showModel(record, true);
marker.modelOwnsVisual = true;
}
for (const id of [...models.keys()]) if (!markers.has(id)) release(id);
+6 -7
View File
@@ -21,7 +21,6 @@ import {
COURSE_SLEW_DT_MAX_SEC,
COURSE_MAX_DPS,
} from './policy.js';
import { modelState } from '../../data/modelMirror.js';
import { readEntityRecord } from '../../data/entityRecords.js';
import {
aircraftMotionRegime,
@@ -340,10 +339,10 @@ export function createMotion({
flightState.records.data.get(flightState._trackedIcao)?.klass,
);
return modelVisualAnchor(
modelState(flightState._trackedModel).modelMatrix,
flightState._trackedModel.matrix,
spec.visualCenterNative,
Number.isFinite(flightState._trackedModel.computedScale)
? flightState._trackedModel.computedScale
Number.isFinite(flightState._trackedModel.model.computedScale)
? flightState._trackedModel.model.computedScale
: spec.scale,
flightState._trackedVisualPos,
);
@@ -367,7 +366,7 @@ export function createMotion({
)
return null;
return Cesium.Matrix4.getTranslation(
modelState(flightState._trackedModel).modelMatrix,
flightState._trackedModel.matrix,
flightState._scratchTrailClip,
);
}
@@ -382,8 +381,8 @@ export function createMotion({
const spec = parts.rendering._modelSpec(
flightState.records.data.get(flightState._trackedIcao)?.klass,
);
const scale = Number.isFinite(flightState._trackedModel.computedScale)
? flightState._trackedModel.computedScale
const scale = Number.isFinite(flightState._trackedModel.model.computedScale)
? flightState._trackedModel.model.computedScale
: spec.scale;
return spec.nativeRadiusM * scale;
}
+4 -4
View File
@@ -181,11 +181,11 @@ test('a newly seen military contact appears at its delayed position, not ahead o
icao24: 'seed00',
entity: null,
meta: { rawLat: 0, rawLon: 0, onGround: false },
billboard: {
icon: {
show: false,
position: Cesium.Cartesian3.fromDegrees(0, 0, 0),
},
billboardCollection: { show: false },
iconLayer: { show: false },
viewer: { camera: { positionCartographic: null }, scene: {} },
tracked: false,
});
@@ -246,8 +246,8 @@ test('a vanished military contact fades while position-less rows keep theirs', a
icao24: 'seed00',
entity: null,
meta: { rawLat: 0, rawLon: 0, onGround: false },
billboard: { show: false, position: Cesium.Cartesian3.fromDegrees(0, 0) },
billboardCollection: { show: true, add: (options) => ({ ...options }) },
icon: { show: false, position: Cesium.Cartesian3.fromDegrees(0, 0) },
iconLayer: { show: true, add: (options) => ({ ...options }) },
viewer,
tracked: false,
});
+4 -5
View File
@@ -11,7 +11,6 @@ import {
} from '../../data/contactMatch.js';
import { LANDED_ALT_MAX_FT, LANDED_SPEED_MAX_MPS } from './policy.js';
import { emergencyBroadcastPhrase } from '../../data/aircraftEmergency.js';
import { modelState } from '../../data/modelMirror.js';
export function createQueries({
flightState,
@@ -450,7 +449,7 @@ export function createQueries({
const isTracked = icao24 === flightState._trackedIcao;
// Keep planes rendered as a 3D model (icon hidden) so the detection box
// doesn't vanish on the 2D→3D handoff.
const model = flightState._models.get(icao24);
const record = flightState._models.get(icao24);
const modelOwnsVisual = parts.rendering._modelOwnsVisual(icao24);
if (!isTracked && !icons.shown(row) && !modelOwnsVisual) continue;
const info = flightState.records.data.get(icao24);
@@ -479,10 +478,10 @@ export function createQueries({
icons.position(row, tau, object._iconPos)
: modelOwnsVisual
? modelVisualAnchor(
modelState(model).modelMatrix,
record.matrix,
spec.visualCenterNative,
Number.isFinite(model.computedScale)
? model.computedScale
Number.isFinite(record.model.computedScale)
? record.model.computedScale
: spec.scale,
object._weldPos || (object._weldPos = new Cesium.Cartesian3()),
)
+2 -2
View File
@@ -186,8 +186,8 @@ export function createMilitarySnapshotRenderer({
sampleMeshFloorCells(flightState._viewer?.scene, _floorWarmPoints, {
excludeObjects: [
...icons._iconIds(),
...flightState._models.values(),
flightState._trackedModel,
...[...flightState._models.values()].map((record) => record.model),
flightState._trackedModel?.model,
].filter(Boolean),
viewerLat: viewerCarto
? Cesium.Math.toDegrees(viewerCarto.latitude)
+11 -11
View File
@@ -1,6 +1,6 @@
import * as Cesium from 'cesium';
import { AMBER_TRANSPARENT, TRACKED_ICON_COLOR } from './policy.js';
import { mirrorModel } from '../../data/modelMirror.js';
import { createModelRecord } from '../../data/modelRecord.js';
import { createIconSet } from '../../data/iconSet.js';
import { aircraftIconTestSeams } from '../../data/aircraftIconLayer.js';
@@ -21,9 +21,9 @@ export function createTesting({
* @param {string} state.icao24
* @param {object} state.entity
* @param {object} state.meta
* @param {{position?: Cesium.Cartesian3, show?: boolean}} [state.billboard]
* @param {{position?: Cesium.Cartesian3, show?: boolean}} [state.icon]
* Where the contact's icon is held, and whether it is shown.
* @param {{show?: boolean}} [state.billboardCollection] Layer visibility.
* @param {{show?: boolean}} [state.iconLayer] Layer visibility.
* @param {object} state.viewer
* @param {Array<Object>} [state.history=[]]
* @param {boolean} [state.tracked=true]
@@ -35,8 +35,8 @@ export function createTesting({
icao24,
entity,
meta,
billboard,
billboardCollection,
icon,
iconLayer,
viewer,
history = [],
tracked = true,
@@ -48,11 +48,11 @@ export function createTesting({
flightState._icons = createIconSet({
epoch: parts.icons._displayTime(new Cesium.JulianDate()),
});
flightState._icons.show = billboardCollection?.show ?? true;
_seedIconForTest(icao24, billboard, tracked);
flightState._icons.show = iconLayer?.show ?? true;
_seedIconForTest(icao24, icon, tracked);
flightState._models.clear();
for (const [key, model] of models)
flightState._models.set(key, mirrorModel(model));
flightState._models.set(key, createModelRecord(model));
flightState._detectionObjects = new Map();
flightState.records.data = new Map([[icao24, meta]]);
flightState._positionHistory = new Map([[icao24, history]]);
@@ -93,10 +93,10 @@ export function createTesting({
function _addMilitaryTrackingCandidateForTest({
icao24,
meta,
billboard,
icon,
history = [],
}) {
_seedIconForTest(icao24, billboard, false);
_seedIconForTest(icao24, icon, false);
flightState.records.data.set(icao24, meta);
flightState._positionHistory.set(icao24, history);
}
@@ -158,7 +158,7 @@ export function createTesting({
async function _ensureFleetModelForTest(icao24) {
await parts.rendering._ensureModel(icao24);
return flightState._models.get(icao24) || null;
return flightState._models.get(icao24)?.model ?? null;
}
return {
+2 -1
View File
@@ -1098,7 +1098,8 @@ export function createTracking({
const rawPick =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
if (
picked.primitive === flightState._trackedModel ||
(flightState._trackedModel &&
picked.primitive === flightState._trackedModel.model) ||
rawPick === flightState._trackedIcao
)
return;