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

+17 -18
View File
@@ -135,7 +135,8 @@ export function createQueries({
// `_trackedDisplayPosition`). If that ever changes, floor this path too.
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,
@@ -428,11 +429,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
@@ -446,7 +448,7 @@ export function createQueries({
icao24,
record,
);
if (!isTracked && !icons.shown(row) && !modelOwnsVisual) continue;
if (!isTracked && !icons.shown(icao24) && !modelOwnsVisual) continue;
const info = flightState.records.data.get(icao24);
let object = flightState._detectionObjects.get(icao24);
if (!object) {
@@ -471,7 +473,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,
@@ -481,13 +483,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;
@@ -579,7 +581,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)
@@ -590,21 +592,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,
})
@@ -678,12 +678,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,