Draw the aircraft fleet icons through the draw port

The civil flights and military layers now draw their contacts as one GPU
icon set each from the renderer's draw port instead of a custom primitive.
Each contact is an icon item whose motion is the dead reckoning the layer
plans (interpolation between fixes, warm-up and coast arcs, or a hold),
with its nose gliding onto a new course at the fleet's slew cap. A
contact's item is replanned when its motion runs out, grounded contacts
are pinned with held motion, and focus de-emphasis is written per item.
The near/far image switch follows the renderer's pixel ratio, and writes
made during a fleet tick reach the set before that frame draws.

The aircraft icon layer and the flights icon part no longer touch Cesium
and leave the allow-list. Clicks resolve the draw port's pick ids as well
as the ones the tracked model and entities still carry, so selection,
follow and share-follow work as before.
This commit is contained in:
Sameh Khamis committed 2026-11-07 04:25:24 -08:00
1 parent e94b7ffb01
commit dbd6363e43
30 files changed
+977 -551

No files matched your search

+3 -8
View File
@@ -9,7 +9,7 @@ export function createLifecycle({
resolveAsset,
}) {
const { clearFocusTarget } = services.focus;
const { registerSpriteCollection, restoreSpriteOrder } = services.sprites;
const { registerSpriteSet, restoreSpriteOrder } = services.sprites;
const { holdContinuousRender, releaseContinuousRender } = services.render;
const { ensureGeoidReady } = services.geoid;
const { registerPickOwner, unregisterPickOwner } = services.picking;
@@ -42,7 +42,7 @@ export function createLifecycle({
flightState.lifetime = new AbortController();
clearFocusTarget('militaryFlights');
flightState._viewer = viewer;
registerSpriteCollection('military', parts.icons._createIcons(viewer));
registerSpriteSet('military', parts.icons._createIcons(viewer));
flightState._modelCollection = new Cesium.PrimitiveCollection();
viewer.scene.primitives.add(flightState._modelCollection);
// Warm the glTF cache so the tracked plane's model instantiates instantly when first needed
@@ -242,12 +242,7 @@ export function createLifecycle({
flightState._moveEndRemove = null;
}
parts.rendering._releaseModels();
if (flightState._iconPrimitive) {
viewer.scene.primitives.remove(flightState._iconPrimitive); // removing destroys it
flightState._iconPrimitive = null;
}
flightState._icons?.clear();
flightState._icons = null;
parts.icons._disposeIcons();
if (flightState._modelCollection) {
viewer.scene.primitives.remove(flightState._modelCollection); // removing destroys it + its models
flightState._modelCollection = null;
+7
View File
@@ -25,6 +25,8 @@ import { readEntityRecord } from '../../data/entityRecords.js';
import {
aircraftMotionRegime,
createMotionRegime,
fixEpochMs,
julianAt,
fixSpeedMps,
fixTrackDeg,
} from '../../data/aircraftMotionRegime.js';
@@ -467,9 +469,14 @@ export function createMotion({
flightState._cachedDRHold = false;
flightState._trackedCourseMs = 0;
}
/** The display instant `epochMs` as a JulianDate, for `_motionRegime`. */
const _displayTimeAt = (epochMs, result) => julianAt(epochMs, result);
return {
_deadReckon,
_motionRegime,
_displayTimeAt,
_fixEpochMs: fixEpochMs,
_extrapolateFix,
_isTrackWarmingUp,
_trackedFocusSizePx,
+17 -18
View File
@@ -96,7 +96,8 @@ export function createQueries({
function _describeFlight(icao24) {
const info = flightState.records.data.get(icao24);
const basePos =
parts.motion._deadReckon(icao24) || parts.icons._iconPosition(icao24);
parts.motion._deadReckon(icao24) ||
parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
if (!basePos) return null;
const displayed = displayedKinematics({
derivedSpeedMps: flightState._drSpeedMps,
@@ -352,7 +353,7 @@ export function createQueries({
const icons = flightState._icons;
if (!center || !icons || !icons.show) return [];
const occluder = parts.icons._occluder();
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const scratch = flightState._scratchNearbyPos;
const limit = Number.isFinite(maxCount)
@@ -363,21 +364,19 @@ export function createQueries({
const nearby = [];
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
for (const icao24 of icons.ids()) {
const isTracked = icao24 === flightState._trackedIcao;
const trackedPos = isTracked
? parts.motion._trackedDisplayCached()
: null; // cached, no recompute (anti-jitter)
const drawn = trackedPos || icons.position(row, tau, scratch);
const drawn = trackedPos || icons.position(icao24, t, scratch);
// Keep planes rendered as a 3D model (icon hidden) so proximity counts
// don't drop to zero on the 2D→3D handoff.
if (
!aircraftIncludedInNearby({
isTracked,
billboardShown:
icons.shown(row) &&
parts.icons._aboveHorizon(row, drawn, occluder),
icons.shown(icao24) && parts.icons._aboveHorizon(drawn, occluder),
modelRendering: parts.rendering._modelOwnsVisual(icao24),
includeHidden,
})
@@ -437,11 +436,12 @@ export function createQueries({
const stride = Math.max(1, Math.ceil(icons.count / maxCount));
const start = seed % stride;
const occluder = parts.icons._occluder();
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const result = [];
for (let row = start; row < icons.count; row += stride) {
const icao24 = icons.idAt(row);
const ids = icons.ids();
for (let i = start; i < ids.length; i += stride) {
const icao24 = ids[i];
if (
flightState._cockpitContactMode &&
icao24.toLowerCase() === flightState._cockpitSubjectId
@@ -452,7 +452,7 @@ export function createQueries({
// doesn't vanish on the 2D→3D handoff.
const record = flightState._models.get(icao24);
const modelOwnsVisual = parts.rendering._modelOwnsVisual(icao24);
if (!isTracked && !icons.shown(row) && !modelOwnsVisual) continue;
if (!isTracked && !icons.shown(icao24) && !modelOwnsVisual) continue;
const info = flightState.records.data.get(icao24);
const callsign = info?.callsign?.trim();
const registration = info?.registration?.trim();
@@ -476,7 +476,7 @@ export function createQueries({
: null;
const pos = isTracked
? parts.motion._trackedVisualCached() ||
icons.position(row, tau, object._iconPos)
icons.position(icao24, t, object._iconPos)
: modelOwnsVisual
? modelVisualAnchor(
record.matrix,
@@ -486,13 +486,13 @@ export function createQueries({
: spec.scale,
object._weldPos || (object._weldPos = new Cesium.Cartesian3()),
)
: icons.position(row, tau, object._iconPos);
: icons.position(icao24, t, object._iconPos);
// An icon past the horizon is not drawn, so it is not detectable.
if (
!pos ||
(!isTracked &&
!modelOwnsVisual &&
!parts.icons._aboveHorizon(row, pos, occluder))
!parts.icons._aboveHorizon(pos, occluder))
)
continue;
object.position = pos;
@@ -598,12 +598,11 @@ export function createQueries({
const limit = Number.isFinite(maxCount)
? Math.max(1, Math.floor(maxCount))
: 500;
const tau = parts.icons._displayTau();
const t = parts.icons._displayMs();
const result = [];
for (let row = 0; row < icons.count; row++) {
const icao24 = icons.idAt(row);
const pos = icons.position(row, tau);
for (const icao24 of icons.ids()) {
const pos = icons.position(icao24, t, new Cesium.Cartesian3());
const carto = Cesium.Cartographic.fromCartesian(
pos,
Cesium.Ellipsoid.WGS84,
+1 -2
View File
@@ -205,8 +205,7 @@ export function createMilitarySnapshotRenderer({
// LANDED_MISSING_POLL_LIMIT — their disappearance means "landed", not a
// feed gap, and the full grace left phantom planes parked at airports.
const absentIds = [];
for (let row = 0; row < flightState._icons.count; row++) {
const icao24 = flightState._icons.idAt(row);
for (const icao24 of flightState._icons.ids()) {
if (!currentIcaos.has(icao24)) absentIds.push(icao24);
}
for (const icao24 of absentIds) {
+2 -7
View File
@@ -91,16 +91,11 @@ export function createFlightState({ source, services }) {
// Module-level state
// ---------------------------------------------------------------------------
/** Every contact's icon row (see icons.js); null outside a layer lifetime. */
/** Every contact's icon item as drawn (`createContactIcons`, see icons.js);
* null outside a layer lifetime. */
flightState._icons = null;
/** The primitive drawing `_icons`. */
flightState._iconPrimitive = null;
flightState._scratchIconRenderTime = new Cesium.JulianDate();
/** Rows still away from full focus emphasis after the last focus pass. */
flightState._iconFocusActive = 0;
+5 -6
View File
@@ -1,8 +1,10 @@
import * as Cesium from 'cesium';
import { AMBER_TRANSPARENT, TRACKED_ICON_COLOR } from './policy.js';
import { createModelRecord } from '../../data/modelRecord.js';
import { createIconSet } from '../../data/iconSet.js';
import { aircraftIconTestSeams } from '../../data/aircraftIconLayer.js';
import {
aircraftIconTestSeams,
createContactIcons,
} from '../../data/aircraftIconLayer.js';
export function createTesting({
flightState,
@@ -45,9 +47,7 @@ export function createTesting({
}) {
flightState._viewer = viewer;
flightState._modelCollection = modelCollection;
flightState._icons = createIconSet({
epoch: parts.icons._displayTime(new Cesium.JulianDate()),
});
flightState._icons = createContactIcons();
flightState._icons.show = iconLayer?.show ?? true;
_seedIconForTest(icao24, icon, tracked);
flightState._models.clear();
@@ -148,7 +148,6 @@ export function createTesting({
return parts.rendering._driveFleetModelHandoff(
icao24,
flightState._models.get(icao24),
flightState._icons.row(icao24),
position,
course,
);
+39 -25
View File
@@ -34,6 +34,18 @@ import {
import { roundHeadingDegrees } from '../../data/headingDegrees.js';
import { entityRecord } from '../../data/entityRecords.js';
/**
* The icao a pick carries: a draw-set item's id (the icon sets' rows), a
* string pick id, or a model primitive's id.
*/
function aircraftPickId(picked) {
const id = picked?.id;
if (typeof id === 'string') return id;
if (id && typeof id.set === 'string' && typeof id.id === 'string')
return id.id;
return picked?.primitive?.id;
}
export function createTracking({
flightState,
services,
@@ -68,7 +80,7 @@ export function createTracking({
}
function _publishTrackedSelection(icao24, origin = 'programmatic') {
const position = parts.icons._iconPosition(icao24);
const position = parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
const info = flightState.records.data.get(icao24);
if (!position || !info) return false;
if (flightState._trackedEntity)
@@ -157,11 +169,14 @@ export function createTracking({
const previous = flightState._cockpitNearContacts;
const distancesSquared = [];
const icons = flightState._icons;
const tau = parts.icons._displayTau();
for (let row = 0; row < (icons?.count ?? 0); row++) {
const icao24 = icons.idAt(row);
const t = parts.icons._displayMs();
for (const icao24 of icons?.ids() ?? []) {
if (icao24 === flightState._trackedIcao) continue;
const position = icons.position(row, tau, flightState._scratchCockpitPos);
const position = icons.position(
icao24,
t,
flightState._scratchCockpitPos,
);
distancesSquared.push([
icao24,
Cesium.Cartesian3.distanceSquared(
@@ -198,8 +213,8 @@ export function createTracking({
flightState._trail?.setVisible(!next);
if (flightState._trailHeadEntity) flightState._trailHeadEntity.show = !next;
const icons = flightState._icons;
for (let row = 0; row < (icons?.count ?? 0); row++)
parts.icons._applyIconPresentation(icons.idAt(row));
for (const icao24 of icons?.ids() ?? [])
parts.icons._applyIconPresentation(icao24);
flightState._lastFleetTickMs = 0;
}
@@ -301,9 +316,8 @@ export function createTracking({
if (isTr3b(id)) {
if (flightState._models.has(id) || flightState._modelPending.has(id))
parts.rendering._releaseModel(id);
const row = flightState._icons?.row(id) ?? -1;
if (row >= 0 && id !== flightState._trackedIcao)
flightState._icons.setShown(row, true);
if (flightState._icons?.has(id) && id !== flightState._trackedIcao)
flightState._icons.setShown(id, true);
if (id === flightState._trackedIcao) {
parts.rendering._releaseTrackedModel();
_syncTracked2dRotation();
@@ -418,7 +432,10 @@ export function createTracking({
if (!flightState._trackedIcao || !flightState._viewer) return;
const pos =
parts.motion._trackedDisplayCached() ||
parts.icons._iconPosition(flightState._trackedIcao);
parts.icons._iconPosition(
flightState._trackedIcao,
new Cesium.Cartesian3(),
);
if (!pos) return;
const projected = screenProjectedRotation(
flightState._viewer.scene,
@@ -799,7 +816,7 @@ export function createTracking({
// Hand the contact back to its icon only now, once it no longer reads as
// tracked (the settle plans it as a fleet contact).
if (flightState._icons?.has(clearedIcao)) {
flightState._icons.setShown(flightState._icons.row(clearedIcao), true);
flightState._icons.setShown(clearedIcao, true);
parts.icons._settleIcon(clearedIcao, { fromCourseDeg: trackedCourseDeg });
}
parts.icons._applyIconPresentation(clearedIcao);
@@ -847,15 +864,15 @@ export function createTracking({
_clearTracking(false, { origin }); // switching planes — the new follow-camera takes over
const icons = flightState._icons;
const row = icons?.row(icao24) ?? -1;
const info = flightState.records.data.get(icao24);
if (row < 0 || !info) return;
if (!icons?.has(icao24) || !info) return;
// The tracked limiter continues from the nose the icon was drawn with, and
// the entity starts with the rotation the icon had on screen.
const tau = parts.icons._displayTau();
const iconPosition = icons.position(row, tau);
flightState._displayCourse.set(icao24, icons.course(row, tau));
const t = parts.icons._displayMs();
const iconPosition = icons.position(icao24, t, new Cesium.Cartesian3());
const iconCourse = icons.course(icao24, t);
flightState._displayCourse.set(icao24, iconCourse);
flightState._trackedIcao = icao24;
_resetTrackedSelectionState(); // fresh selection: enter at the ENTER ceiling, full load-retry budget
flightState._cachedDRFrame = -1;
@@ -863,7 +880,7 @@ export function createTracking({
screenProjectedRotation(
flightState._viewer.scene,
iconPosition,
icons.course(row, tau),
iconCourse,
0,
) ?? 0;
// Drop any fleet 3D model for this aircraft — the tracked entity now owns its visual (its
@@ -872,7 +889,7 @@ export function createTracking({
parts.rendering._releaseModel(icao24);
// Hide the icon -- the tracked entity replaces it visually
icons.setShown(row, false);
icons.setShown(icao24, false);
// Helper: smoothed, per-frame-cached tracked position (see _trackedDisplayPosition —
// one computation shared by the position/rotation/trail-head callbacks, with
@@ -880,7 +897,7 @@ export function createTracking({
// aircraft has no fix.
const getTrackedPosition = () =>
parts.motion._trackedDisplayPosition(icao24) ||
parts.icons._iconPosition(icao24) ||
parts.icons._iconPosition(icao24, new Cesium.Cartesian3()) ||
iconPosition;
// Dead-reckoning position property evaluated every render frame.
@@ -1092,8 +1109,7 @@ export function createTracking({
// above. H1: the model used to have no pick id, so this fell through to
// "empty space" and deselected the very plane being tracked.
if (flightState._trackedIcao) {
const rawPick =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
const rawPick = aircraftPickId(picked);
if (
(flightState._trackedModel &&
picked.primitive === flightState._trackedModel.model) ||
@@ -1102,9 +1118,7 @@ export function createTracking({
return;
}
// Icon picks carry the icao on picked.id; models carry it on the primitive.
const pickedIcao =
typeof picked.id === 'string' ? picked.id : picked.primitive?.id;
const pickedIcao = aircraftPickId(picked);
if (pickedIcao && flightState._icons?.has(pickedIcao)) {
_cancelPendingTrackingRestore();
_trackFlight(pickedIcao, { origin: 'user' });