mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
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:
1 parent
e94b7ffb01
commit
dbd6363e43
30 files changed
+977
-551
No files matched your search
@@ -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,
|
||||
@@ -70,7 +82,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)
|
||||
@@ -169,11 +181,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(
|
||||
@@ -210,9 +225,8 @@ export function createTracking({
|
||||
if (flightState._modelCollection) flightState._modelCollection.show = true;
|
||||
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 flightState._icons?.ids() ?? [])
|
||||
parts.icons._applyIconPresentation(icao24);
|
||||
flightState._lastFleetTickMs = 0;
|
||||
}
|
||||
|
||||
@@ -324,7 +338,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,
|
||||
@@ -665,7 +682,7 @@ export function createTracking({
|
||||
// contact, and while it still read as tracked its tracked model owned the
|
||||
// visual, so the floor would have stepped aside.
|
||||
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);
|
||||
@@ -820,9 +837,8 @@ export function createTracking({
|
||||
// an already-loaded model would otherwise linger with the billboard hidden.
|
||||
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();
|
||||
@@ -852,7 +868,7 @@ export function createTracking({
|
||||
|
||||
function _routeIsPlausible(icao24, route) {
|
||||
const info = flightState.records.data.get(icao24);
|
||||
const position = parts.icons._iconPosition(icao24);
|
||||
const position = parts.icons._iconPosition(icao24, new Cesium.Cartesian3());
|
||||
if (!info || !position) return true;
|
||||
const carto = Cesium.Cartographic.fromCartesian(
|
||||
position,
|
||||
@@ -891,15 +907,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;
|
||||
@@ -907,7 +923,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
|
||||
@@ -916,7 +932,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/alignedAxis/rotation/trail-head callbacks,
|
||||
@@ -924,7 +940,7 @@ export function createTracking({
|
||||
// the 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 — smooth continuous motion between API updates.
|
||||
@@ -1100,8 +1116,7 @@ export function createTracking({
|
||||
if (!flightState._viewer || !icons) return;
|
||||
if (active) {
|
||||
const suppressed = [];
|
||||
for (let row = 0; row < icons.count; row++) {
|
||||
const icao24 = icons.idAt(row);
|
||||
for (const icao24 of icons.ids()) {
|
||||
if (isMilitaryIcao(icao24) && icao24 !== flightState._trackedIcao)
|
||||
suppressed.push(icao24);
|
||||
}
|
||||
@@ -1185,8 +1200,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) ||
|
||||
@@ -1195,9 +1209,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' });
|
||||
|
||||
Reference in new issue
Block a user