mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Read flight and military billboard state from Core's mirror
Flights and military now add their billboards through addBillboard and write show, position, scale, rotation, size and distance scaling through setBillboard, which keeps Core's copy in src/data/billboardMirror.js. Their reads go to billboardState instead of the Cesium billboard, so the layers no longer read back what they pushed to the renderer. A mirrored billboard needs an explicit width and height, because unset Cesium reports the loaded image's size. Colour is not mirrored yet: the cyber-sonar theme writes it too and tells the writers apart by the live value, so it moves with the effects port.
This commit is contained in:
1 parent
a40e5c334c
commit
1cfff5803a
23 files changed
+424
-172
No files matched your search
@@ -9,6 +9,7 @@ import {
|
||||
ENRICH_AMBIENT_REFILL_WINDOW_MS,
|
||||
ENRICH_AMBIENT_PER_SWEEP,
|
||||
} from './policy.js';
|
||||
import { billboardState } from '../../data/billboardMirror.js';
|
||||
|
||||
export function createEnrichment({
|
||||
flightState,
|
||||
@@ -199,11 +200,9 @@ export function createEnrichment({
|
||||
if (flightState._enrichSeen.has(`t:${icao24}`)) continue; // answered / queued / negative this session
|
||||
if (!/^[0-9a-f]{6}$/i.test(icao24)) continue; // adsbdb keys are 6-char hex only
|
||||
if (flightState.records.data.get(icao24)?.onGround) continue; // ground traffic never spends ambient budget (click-to-enrich still works)
|
||||
if (!bb.position || !occluder.isPointVisible(bb.position)) continue; // beyond the limb
|
||||
Cesium.Cartesian3.clone(
|
||||
bb.position,
|
||||
flightState._scratchModelBS.center,
|
||||
);
|
||||
const { position } = billboardState(bb);
|
||||
if (!position || !occluder.isPointVisible(position)) continue; // beyond the limb
|
||||
Cesium.Cartesian3.clone(position, flightState._scratchModelBS.center);
|
||||
if (
|
||||
cull.computeVisibility(flightState._scratchModelBS) ===
|
||||
Cesium.Intersect.OUTSIDE
|
||||
@@ -211,7 +210,7 @@ export function createEnrichment({
|
||||
continue; // off-screen
|
||||
cand.push([
|
||||
icao24,
|
||||
Cesium.Cartesian3.distanceSquared(camPos, bb.position),
|
||||
Cesium.Cartesian3.distanceSquared(camPos, position),
|
||||
]);
|
||||
}
|
||||
cand.sort((a, b) => a[1] - b[1]); // nearest first — what the user is looking at resolves first
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
import * as Cesium from 'cesium';
|
||||
import { aircraftIcon } from '../../data/aircraftIcons.js';
|
||||
import { FOCUS_EVIDENCE_DEV } from './policy.js';
|
||||
import {
|
||||
addBillboard,
|
||||
billboardState,
|
||||
setBillboard,
|
||||
} from '../../data/billboardMirror.js';
|
||||
|
||||
export function createEvidence({
|
||||
flightState,
|
||||
@@ -83,7 +88,7 @@ export function createEvidence({
|
||||
flightState.records.data.set(id, meta);
|
||||
flightState._cullPositions.delete(id);
|
||||
flightState._focusEvidenceIds.add(id);
|
||||
const bb = flightState._billboardCollection.add({
|
||||
const bb = addBillboard(flightState._billboardCollection, {
|
||||
position,
|
||||
image: aircraftIcon(parts.rendering._iconKind(id, klass)),
|
||||
width: 20,
|
||||
@@ -119,7 +124,7 @@ export function createEvidence({
|
||||
const position = _focusEvidencePosition(record);
|
||||
const bb = flightState._billboards.get(id);
|
||||
if (!position || !bb) continue;
|
||||
bb.position = position;
|
||||
setBillboard(bb, 'position', position);
|
||||
const meta = flightState.records.data.get(id);
|
||||
if (meta) {
|
||||
if (Number.isFinite(record.trackDeg)) meta.true_track = record.trackDeg;
|
||||
@@ -139,23 +144,23 @@ export function createEvidence({
|
||||
if (!FOCUS_EVIDENCE_DEV || !flightState._viewer) return [];
|
||||
return [...flightState._focusEvidenceIds].map((id) => {
|
||||
const bb = flightState._billboards.get(id);
|
||||
const screen = bb?.position
|
||||
const screen = billboardState(bb)?.position
|
||||
? Cesium.SceneTransforms.worldToWindowCoordinates(
|
||||
flightState._viewer.scene,
|
||||
bb.position,
|
||||
billboardState(bb).position,
|
||||
)
|
||||
: null;
|
||||
return {
|
||||
id,
|
||||
show: bb?.show === true,
|
||||
scale: bb?.scale ?? null,
|
||||
show: billboardState(bb)?.show === true,
|
||||
scale: billboardState(bb)?.scale ?? null,
|
||||
alpha: bb?.color?.alpha ?? null,
|
||||
x: screen?.x ?? null,
|
||||
y: screen?.y ?? null,
|
||||
cameraDistanceM: bb?.position
|
||||
cameraDistanceM: billboardState(bb)?.position
|
||||
? Cesium.Cartesian3.distance(
|
||||
flightState._viewer.camera.positionWC,
|
||||
bb.position,
|
||||
billboardState(bb).position,
|
||||
)
|
||||
: null,
|
||||
};
|
||||
|
||||
@@ -35,6 +35,7 @@ import {
|
||||
DISPLAY_CORRIDOR_CELL_BUDGET,
|
||||
DISPLAY_CORRIDOR_FAIR_SHARE,
|
||||
} from './policy.js';
|
||||
import { billboardState, setBillboard } from '../../data/billboardMirror.js';
|
||||
|
||||
export function createMotion({
|
||||
flightState,
|
||||
@@ -109,7 +110,7 @@ export function createMotion({
|
||||
if (newest)
|
||||
newest.position = Cesium.Cartesian3.clone(position, newest.position);
|
||||
const bb = flightState._billboards.get(icao24);
|
||||
if (bb) bb.position = position;
|
||||
if (bb) setBillboard(bb, 'position', position);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,7 +132,9 @@ export function createMotion({
|
||||
function _deadReckon(icao24, result, sampledRenderTime) {
|
||||
const info = flightState.records.data.get(icao24);
|
||||
if (FOCUS_EVIDENCE_DEV && flightState._focusEvidenceIds.has(icao24)) {
|
||||
const position = flightState._billboards.get(icao24)?.position;
|
||||
const position = billboardState(
|
||||
flightState._billboards.get(icao24),
|
||||
)?.position;
|
||||
flightState._drCourseDeg = info?.true_track || 0;
|
||||
flightState._drSpeedMps = info?.velocity || 0;
|
||||
flightState._drCourseHold =
|
||||
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
FLEET_DR_INTERVAL_MS,
|
||||
} from './policy.js';
|
||||
import { emergencyBroadcastPhrase } from '../../data/aircraftEmergency.js';
|
||||
import { billboardState, setBillboard } from '../../data/billboardMirror.js';
|
||||
|
||||
export function createQueries({
|
||||
flightState,
|
||||
@@ -134,7 +135,8 @@ export function createQueries({
|
||||
const info = flightState.records.data.get(icao24);
|
||||
const bb = flightState._billboards.get(icao24);
|
||||
const basePos =
|
||||
parts.motion._deadReckon(icao24) || (bb ? bb.position : null);
|
||||
parts.motion._deadReckon(icao24) ||
|
||||
(bb ? billboardState(bb).position : null);
|
||||
if (!basePos) return null;
|
||||
const displayed = displayedKinematics({
|
||||
derivedSpeedMps: flightState._drSpeedMps,
|
||||
@@ -336,7 +338,8 @@ export function createQueries({
|
||||
// here would double-image the tracked plane when 3D is turned off mid-track.
|
||||
if (flightState._billboardCollection)
|
||||
for (const [icao, bb] of flightState._billboards) {
|
||||
if (icao !== flightState._trackedIcao) bb.show = true;
|
||||
if (icao !== flightState._trackedIcao)
|
||||
setBillboard(bb, 'show', true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -454,7 +457,8 @@ export function createQueries({
|
||||
// doesn't vanish on the 2D→3D handoff; bb.position stays current while hidden.
|
||||
const model = flightState._models.get(icao24) ?? null;
|
||||
const modelOwnsVisual = parts.rendering._modelOwnsVisual(icao24, model);
|
||||
if (!isTracked && !bb.show && !modelOwnsVisual) continue;
|
||||
if (!isTracked && !billboardState(bb).show && !modelOwnsVisual)
|
||||
continue;
|
||||
const info = flightState.records.data.get(icao24);
|
||||
let object = flightState._detectionObjects.get(icao24);
|
||||
if (!object) {
|
||||
@@ -476,7 +480,7 @@ export function createQueries({
|
||||
? parts.rendering._modelSpec(info?.klass)
|
||||
: null;
|
||||
const pos = isTracked
|
||||
? parts.motion._trackedVisualCached() || bb.position
|
||||
? parts.motion._trackedVisualCached() || billboardState(bb).position
|
||||
: modelOwnsVisual
|
||||
? modelVisualAnchor(
|
||||
model.modelMatrix,
|
||||
@@ -486,7 +490,7 @@ export function createQueries({
|
||||
: spec.scale,
|
||||
object._weldPos || (object._weldPos = new Cesium.Cartesian3()),
|
||||
)
|
||||
: bb.position;
|
||||
: billboardState(bb).position;
|
||||
if (!pos) continue;
|
||||
object.position = pos;
|
||||
object.skipLabel = isTracked;
|
||||
@@ -600,7 +604,7 @@ export function createQueries({
|
||||
if (
|
||||
!aircraftIncludedInNearby({
|
||||
isTracked,
|
||||
billboardShown: bb.show,
|
||||
billboardShown: billboardState(bb).show,
|
||||
modelRendering: parts.rendering._modelOwnsVisual(icao24),
|
||||
includeHidden,
|
||||
})
|
||||
@@ -610,7 +614,7 @@ export function createQueries({
|
||||
const trackedPos = isTracked
|
||||
? parts.motion._trackedDisplayCached()
|
||||
: null; // cached, no recompute (anti-jitter)
|
||||
const pos = trackedPos || bb.position;
|
||||
const pos = trackedPos || billboardState(bb).position;
|
||||
if (!pos) continue;
|
||||
|
||||
const distance = Cesium.Cartesian3.distance(center, pos);
|
||||
@@ -692,7 +696,7 @@ export function createQueries({
|
||||
|
||||
const result = [];
|
||||
for (const [icao24, bb] of flightState._billboards) {
|
||||
const pos = bb.position;
|
||||
const pos = billboardState(bb).position;
|
||||
if (!pos) continue;
|
||||
const carto = Cesium.Cartographic.fromCartesian(
|
||||
pos,
|
||||
|
||||
@@ -3,6 +3,11 @@ import assert from 'node:assert/strict';
|
||||
import * as Cesium from 'cesium';
|
||||
import { createQueries } from './queries.js';
|
||||
import { createRendering } from './rendering.js';
|
||||
import {
|
||||
billboardState,
|
||||
mirrorBillboard,
|
||||
setBillboard,
|
||||
} from '../../data/billboardMirror.js';
|
||||
|
||||
function fixture() {
|
||||
const info = {
|
||||
@@ -10,7 +15,10 @@ function fixture() {
|
||||
registration: ' N123 ',
|
||||
altitude: 1000,
|
||||
};
|
||||
const bb = { show: true, position: new Cesium.Cartesian3(1, 2, 3) };
|
||||
const bb = mirrorBillboard({
|
||||
show: true,
|
||||
position: new Cesium.Cartesian3(1, 2, 3),
|
||||
});
|
||||
const flightState = {
|
||||
feed: {},
|
||||
_billboardCollection: { show: true },
|
||||
@@ -48,9 +56,10 @@ test('candidate text follows in-place enrichment without freezing identity or po
|
||||
const [first] = f.queries.getDetectableObjects();
|
||||
assert.equal(first.id, 'TEST123');
|
||||
assert.equal(first.sourceId, 'abc123');
|
||||
f.bb.position = new Cesium.Cartesian3(4, 5, 6);
|
||||
setBillboard(f.bb, 'position', new Cesium.Cartesian3(4, 5, 6));
|
||||
assert.equal(f.queries.getDetectableObjects()[0], first);
|
||||
assert.equal(first.position, f.bb.position);
|
||||
assert.equal(first.position, billboardState(f.bb).position);
|
||||
assert.deepEqual(first.position, new Cesium.Cartesian3(4, 5, 6));
|
||||
assert.equal(f.formats(), 1);
|
||||
f.info.callsign = ' NEW456 ';
|
||||
assert.equal(f.queries.getDetectableObjects()[0].id, 'NEW456');
|
||||
@@ -97,7 +106,7 @@ test('candidate collection resolves models once and keeps handoffs live', (t) =>
|
||||
scale: 1,
|
||||
});
|
||||
f.flightState._models.set('abc123', model);
|
||||
f.bb.show = false;
|
||||
setBillboard(f.bb, 'show', false);
|
||||
assert.deepEqual(f.queries.getDetectableObjects(), []);
|
||||
model.ready = true;
|
||||
assert.equal(f.queries.getDetectableObjects()[0], candidate);
|
||||
@@ -111,8 +120,11 @@ test('candidate collection resolves models once and keeps handoffs live', (t) =>
|
||||
assert.deepEqual(candidate.position, new Cesium.Cartesian3(40, 50, 60));
|
||||
model.show = false;
|
||||
assert.deepEqual(f.queries.getDetectableObjects(), []);
|
||||
f.bb.show = true;
|
||||
assert.equal(f.queries.getDetectableObjects()[0].position, f.bb.position);
|
||||
setBillboard(f.bb, 'show', true);
|
||||
assert.equal(
|
||||
f.queries.getDetectableObjects()[0].position,
|
||||
billboardState(f.bb).position,
|
||||
);
|
||||
assert.equal(get.mock.callCount(), 6);
|
||||
model.show = true;
|
||||
assert.equal(f.parts.rendering._modelOwnsVisual('abc123'), true);
|
||||
|
||||
@@ -39,6 +39,7 @@ import {
|
||||
} from './policy.js';
|
||||
import { AIRCRAFT_ENVIRONMENT_MAP_OPTIONS } from '../../data/aircraftModelLighting.js';
|
||||
import { aircraftVisuals } from '../aircraft/visualState.js';
|
||||
import { billboardState, setBillboard } from '../../data/billboardMirror.js';
|
||||
|
||||
export function createRendering({
|
||||
flightState,
|
||||
@@ -151,12 +152,12 @@ export function createRendering({
|
||||
if (isCockpitContact && !isCockpitNear) {
|
||||
const freshnessAlpha = cyberSonarBaseAlpha(bb);
|
||||
bb.image = cockpitContactDotImage();
|
||||
bb.width = COCKPIT_CONTACT_SIZE_PX;
|
||||
bb.height = COCKPIT_CONTACT_SIZE_PX;
|
||||
bb.scale = limbScale;
|
||||
bb.scaleByDistance = _cockpitBillboardScaleByDistance();
|
||||
setBillboard(bb, 'width', COCKPIT_CONTACT_SIZE_PX);
|
||||
setBillboard(bb, 'height', COCKPIT_CONTACT_SIZE_PX);
|
||||
setBillboard(bb, 'scale', limbScale);
|
||||
setBillboard(bb, 'scaleByDistance', _cockpitBillboardScaleByDistance());
|
||||
bb.color = _cockpitContactColor(icao24).withAlpha(freshnessAlpha);
|
||||
bb.rotation = 0;
|
||||
setBillboard(bb, 'rotation', 0);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -165,10 +166,14 @@ export function createRendering({
|
||||
_iconKind(icao24, meta?.klass),
|
||||
aircraftVisuals.read(bb)?.iconLarge ? TRACKED_ICON_PX : undefined,
|
||||
);
|
||||
bb.width = icao24 === flightState._trackedIcao ? 24 : 20;
|
||||
bb.height = icao24 === flightState._trackedIcao ? 24 : 20;
|
||||
bb.scale = _fleetBillboardScale(icao24, meta?.klass) * limbScale;
|
||||
bb.scaleByDistance = _normalBillboardScaleByDistance();
|
||||
setBillboard(bb, 'width', icao24 === flightState._trackedIcao ? 24 : 20);
|
||||
setBillboard(bb, 'height', icao24 === flightState._trackedIcao ? 24 : 20);
|
||||
setBillboard(
|
||||
bb,
|
||||
'scale',
|
||||
_fleetBillboardScale(icao24, meta?.klass) * limbScale,
|
||||
);
|
||||
setBillboard(bb, 'scaleByDistance', _normalBillboardScaleByDistance());
|
||||
bb.color = _fleetBillboardColor(icao24).withAlpha(cyberSonarBaseAlpha(bb));
|
||||
}
|
||||
|
||||
@@ -324,7 +329,7 @@ export function createRendering({
|
||||
|
||||
function _driveFleetModelHandoff(icao24, model, bb, pos, course, beforeShow) {
|
||||
if (!model) {
|
||||
bb.show = true;
|
||||
setBillboard(bb, 'show', true);
|
||||
return false;
|
||||
}
|
||||
const displayPos = _modelDisplayPosition(
|
||||
@@ -334,7 +339,7 @@ export function createRendering({
|
||||
);
|
||||
if (!displayPos) {
|
||||
model.show = false; // no ground evidence → nothing safe to place a depth-tested model at
|
||||
bb.show = true;
|
||||
setBillboard(bb, 'show', true);
|
||||
return false;
|
||||
}
|
||||
// The matrix is written BEFORE the readiness test on purpose: a model can flip
|
||||
@@ -343,12 +348,12 @@ export function createRendering({
|
||||
_modelMatrix(displayPos, course, model.modelMatrix);
|
||||
if (!model.ready) {
|
||||
model.show = false; // not loaded yet → keep the 2D icon, no half-model flash
|
||||
bb.show = true;
|
||||
setBillboard(bb, 'show', true);
|
||||
return false;
|
||||
}
|
||||
beforeShow?.();
|
||||
if (!model.show) model.show = true;
|
||||
if (bb.show) bb.show = false; // hand off ONLY once the model renders
|
||||
if (billboardState(bb).show) setBillboard(bb, 'show', false); // hand off ONLY once the model renders
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -437,7 +442,8 @@ export function createRendering({
|
||||
(!current && flightState._modelPending.has(icao24))
|
||||
) {
|
||||
const bb = flightState._billboards.get(icao24);
|
||||
if (bb && icao24 !== flightState._trackedIcao) bb.show = true;
|
||||
if (bb && icao24 !== flightState._trackedIcao)
|
||||
setBillboard(bb, 'show', true);
|
||||
_releaseModel(icao24);
|
||||
}
|
||||
if (
|
||||
@@ -472,7 +478,8 @@ export function createRendering({
|
||||
)
|
||||
continue; // already right state
|
||||
const bb = flightState._billboards.get(icao);
|
||||
if (bb && icao !== flightState._trackedIcao) bb.show = true;
|
||||
if (bb && icao !== flightState._trackedIcao)
|
||||
setBillboard(bb, 'show', true);
|
||||
_releaseModel(icao);
|
||||
}
|
||||
if (flightState._irReloadQueue.length === 0)
|
||||
@@ -699,7 +706,8 @@ export function createRendering({
|
||||
// readout consumers then reuse that exact cached position.
|
||||
const pos =
|
||||
parts.motion._trackedDisplayPosition(flightState._trackedIcao) ||
|
||||
flightState._billboards.get(flightState._trackedIcao)?.position;
|
||||
billboardState(flightState._billboards.get(flightState._trackedIcao))
|
||||
?.position;
|
||||
if (!pos) {
|
||||
if (flightState._trackedModel) flightState._trackedModel.show = false;
|
||||
return;
|
||||
@@ -777,7 +785,9 @@ export function createRendering({
|
||||
// default here produces a one-frame jump to the Earth's center.
|
||||
const currentPos =
|
||||
parts.motion._trackedDisplayCached() ||
|
||||
flightState._billboards.get(flightState._trackedIcao)?.position;
|
||||
billboardState(
|
||||
flightState._billboards.get(flightState._trackedIcao),
|
||||
)?.position;
|
||||
if (currentPos) {
|
||||
const displayPos = _modelDisplayPosition(
|
||||
flightState._trackedIcao,
|
||||
@@ -938,12 +948,10 @@ export function createRendering({
|
||||
// ground or in the air — no distinction"). The cap + nearest-first ordering
|
||||
// below already bound airport clusters; grounded placement is handled by the
|
||||
// one-shot ground snap in _modelDisplayPosition.
|
||||
const d2 = Cesium.Cartesian3.distanceSquared(camPos, bb.position);
|
||||
const { position } = billboardState(bb);
|
||||
const d2 = Cesium.Cartesian3.distanceSquared(camPos, position);
|
||||
if (d2 > keepDistSq) continue; // beyond the keep radius → never eligible
|
||||
Cesium.Cartesian3.clone(
|
||||
bb.position,
|
||||
flightState._scratchModelBS.center,
|
||||
);
|
||||
Cesium.Cartesian3.clone(position, flightState._scratchModelBS.center);
|
||||
cand.push([
|
||||
icao,
|
||||
d2,
|
||||
@@ -973,6 +981,7 @@ export function createRendering({
|
||||
|
||||
for (const [icao24, bb] of flightState._billboards) {
|
||||
if (icao24 === flightState._trackedIcao) continue; // tracked entity owns its own motion
|
||||
const icon = billboardState(bb);
|
||||
|
||||
const info = flightState.records.data.get(icao24);
|
||||
|
||||
@@ -996,9 +1005,9 @@ export function createRendering({
|
||||
// collection's vertex buffer, so skip sub-meter moves.
|
||||
if (
|
||||
display &&
|
||||
Cesium.Cartesian3.distanceSquared(display, bb.position) > 1.0
|
||||
Cesium.Cartesian3.distanceSquared(display, icon.position) > 1.0
|
||||
) {
|
||||
bb.position = display;
|
||||
setBillboard(bb, 'position', display);
|
||||
}
|
||||
|
||||
// Round 6: occlusion-test a LIFTED point for contacts rendering below
|
||||
@@ -1007,15 +1016,15 @@ export function createRendering({
|
||||
// pass would hide a plane that is really just low over high-N terrain
|
||||
// waiting for its floor to warm (ATL grounded contacts at geoid −31 m).
|
||||
const beyondHorizon = !occluder.isPointVisible(
|
||||
flightState._cullPositions.get(icao24) || bb.position,
|
||||
flightState._cullPositions.get(icao24) || icon.position,
|
||||
);
|
||||
// A billboard flipping INTO view (horizon reveal while the camera idles)
|
||||
// gets its rotation refreshed THIS tick even without a pose change —
|
||||
// otherwise it reappears wearing its stale (often creation-north) nose for
|
||||
// up to ROTATION_REFRESH_MS. (Model-handed-off planes also read show=false
|
||||
// here; harmless — the model branch below `continue`s past the rotation.)
|
||||
const revealed = !beyondHorizon && !bb.show;
|
||||
if (bb.show === beyondHorizon) bb.show = !beyondHorizon;
|
||||
const revealed = !beyondHorizon && !icon.show;
|
||||
if (icon.show === beyondHorizon) setBillboard(bb, 'show', !beyondHorizon);
|
||||
if (beyondHorizon) {
|
||||
// Also hide any 3D model — otherwise a model that crossed the limb would keep
|
||||
// rendering through the hidden globe at its last matrix.
|
||||
@@ -1031,22 +1040,22 @@ export function createRendering({
|
||||
// alpha; nearer focus behavior remains tunable rather than universal.
|
||||
const cameraDistanceM = Cesium.Cartesian3.distance(
|
||||
camera.positionWC,
|
||||
bb.position,
|
||||
icon.position,
|
||||
);
|
||||
const distanceScale = nearFarScalarValueAtDistance(
|
||||
bb.scaleByDistance,
|
||||
icon.scaleByDistance,
|
||||
cameraDistanceM,
|
||||
);
|
||||
const focus = advanceProjectedSpriteFocus(
|
||||
bb,
|
||||
bb.position,
|
||||
icon.position,
|
||||
scene,
|
||||
camera,
|
||||
nowMs,
|
||||
focusTarget,
|
||||
undefined,
|
||||
(bb.width || 20) * (bb.scale || 1) * distanceScale * 0.5,
|
||||
(bb.height || 20) * (bb.scale || 1) * distanceScale * 0.5,
|
||||
(icon.width || 20) * (icon.scale || 1) * distanceScale * 0.5,
|
||||
(icon.height || 20) * (icon.scale || 1) * distanceScale * 0.5,
|
||||
);
|
||||
const isCockpitNear =
|
||||
flightState._cockpitContactMode &&
|
||||
@@ -1077,8 +1086,8 @@ export function createRendering({
|
||||
// hysteresis so zoom oscillation never thrashes the atlas.
|
||||
if (!flightState._cockpitContactMode || isCockpitNear) {
|
||||
const glyphDevPx =
|
||||
(bb.width || 20) *
|
||||
(bb.scale || 1) *
|
||||
(icon.width || 20) *
|
||||
(icon.scale || 1) *
|
||||
distanceScale *
|
||||
(globalThis.devicePixelRatio || 1);
|
||||
const visual = aircraftVisuals.write(bb);
|
||||
@@ -1160,12 +1169,12 @@ export function createRendering({
|
||||
) {
|
||||
const rot = screenProjectedRotation(
|
||||
scene,
|
||||
bb.position,
|
||||
icon.position,
|
||||
course,
|
||||
bb.rotation,
|
||||
icon.rotation,
|
||||
);
|
||||
if (rot !== null && Math.abs(rot - bb.rotation) > 0.002) {
|
||||
bb.rotation = rot;
|
||||
if (rot !== null && Math.abs(rot - icon.rotation) > 0.002) {
|
||||
setBillboard(bb, 'rotation', rot);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
} from '../../data/motionModel.js';
|
||||
import { aircraftIcon } from '../../data/aircraftIcons.js';
|
||||
import { POSITION_HISTORY_LIMIT } from './recordPolicy.js';
|
||||
import { addBillboard } from '../../data/billboardMirror.js';
|
||||
|
||||
/** Apply reconciled aircraft records to Cesium resources and follow state. */
|
||||
export function createFlightSnapshotRenderer({
|
||||
@@ -195,7 +196,7 @@ export function createFlightSnapshotRenderer({
|
||||
rendering._modelOwnsVisual(icao24),
|
||||
)) ||
|
||||
position;
|
||||
const bb = flightState._billboardCollection.add({
|
||||
const bb = addBillboard(flightState._billboardCollection, {
|
||||
position: displayed,
|
||||
image: aircraftIcon(rendering._iconKind(icao24, meta.klass)),
|
||||
width: isTracked ? 24 : 20,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as Cesium from 'cesium';
|
||||
import { CYAN_TRANSPARENT } from './policy.js';
|
||||
import { mirrorBillboard } from '../../data/billboardMirror.js';
|
||||
|
||||
export function createTesting({
|
||||
flightState,
|
||||
@@ -68,7 +69,7 @@ export function createTesting({
|
||||
flightState._viewer = viewer;
|
||||
flightState._modelCollection = modelCollection;
|
||||
flightState._billboardCollection = billboardCollection;
|
||||
flightState._billboards = new Map([[icao24, billboard]]);
|
||||
flightState._billboards = new Map([[icao24, mirrorBillboard(billboard)]]);
|
||||
flightState._cullPositions.clear();
|
||||
flightState._models.clear();
|
||||
for (const [key, model] of models) flightState._models.set(key, model);
|
||||
@@ -117,7 +118,7 @@ export function createTesting({
|
||||
billboard,
|
||||
history = [],
|
||||
}) {
|
||||
flightState._billboards.set(icao24, billboard);
|
||||
flightState._billboards.set(icao24, mirrorBillboard(billboard));
|
||||
flightState.records.data.set(icao24, meta);
|
||||
flightState._positionHistory.set(icao24, history);
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import {
|
||||
} from './policy.js';
|
||||
import { roundHeadingDegrees } from '../../data/headingDegrees.js';
|
||||
import { entityRecord, readEntityRecord } from '../../data/entityRecords.js';
|
||||
import { billboardState, setBillboard } from '../../data/billboardMirror.js';
|
||||
|
||||
export function createTracking({
|
||||
flightState,
|
||||
@@ -65,7 +66,7 @@ export function createTracking({
|
||||
function _publishTrackedSelection(icao24, origin = 'programmatic') {
|
||||
const bb = flightState._billboards.get(icao24);
|
||||
const info = flightState.records.data.get(icao24);
|
||||
if (!bb?.position || !info) return false;
|
||||
if (!billboardState(bb)?.position || !info) return false;
|
||||
if (flightState._trackedEntity)
|
||||
entityRecord(flightState._trackedEntity).selectionOrigin = origin;
|
||||
_emitAwarenessEvent('gev:awareness-subject-selected', {
|
||||
@@ -76,7 +77,7 @@ export function createTracking({
|
||||
// a callsign-less contact reached Context as its raw hex even once adsbdb
|
||||
// had supplied a registration. Identity below stays `icao24`.
|
||||
label: parts.queries._contactLabel(icao24, info),
|
||||
position: Cesium.Cartesian3.clone(bb.position),
|
||||
position: Cesium.Cartesian3.clone(billboardState(bb).position),
|
||||
origin,
|
||||
});
|
||||
selectTrackedSubjectContext(_contextSubjectMetadata(icao24));
|
||||
@@ -162,12 +163,13 @@ export function createTracking({
|
||||
const previous = flightState._cockpitNearContacts;
|
||||
const distancesSquared = [];
|
||||
for (const [icao24, bb] of flightState._billboards) {
|
||||
if (icao24 === flightState._trackedIcao || !bb?.position) continue;
|
||||
const position = billboardState(bb)?.position;
|
||||
if (icao24 === flightState._trackedIcao || !position) continue;
|
||||
distancesSquared.push([
|
||||
icao24,
|
||||
Cesium.Cartesian3.distanceSquared(
|
||||
flightState._viewer.camera.positionWC,
|
||||
bb.position,
|
||||
position,
|
||||
),
|
||||
]);
|
||||
}
|
||||
@@ -316,7 +318,8 @@ export function createTracking({
|
||||
if (!flightState._trackedIcao || !flightState._viewer) return;
|
||||
const pos =
|
||||
parts.motion._trackedDisplayCached() ||
|
||||
flightState._billboards.get(flightState._trackedIcao)?.position;
|
||||
billboardState(flightState._billboards.get(flightState._trackedIcao))
|
||||
?.position;
|
||||
if (!pos) return;
|
||||
const projected = screenProjectedRotation(
|
||||
flightState._viewer.scene,
|
||||
@@ -642,17 +645,21 @@ export function createTracking({
|
||||
// ROTATION_REFRESH_MS of a wrong (possibly reversed) nose on release.
|
||||
if (flightState._billboards.has(flightState._trackedIcao)) {
|
||||
const bb = flightState._billboards.get(flightState._trackedIcao);
|
||||
bb.show = true;
|
||||
bb.width = 20;
|
||||
bb.height = 20;
|
||||
setBillboard(bb, 'show', true);
|
||||
setBillboard(bb, 'width', 20);
|
||||
setBillboard(bb, 'height', 20);
|
||||
// Ground/military-aware restore (a plane untracked while taxiing must come
|
||||
// back muted-gray at ground scale, not white at full scale).
|
||||
bb.color = parts.rendering._fleetBillboardColor(flightState._trackedIcao);
|
||||
bb.scale = parts.rendering._fleetBillboardScale(
|
||||
flightState._trackedIcao,
|
||||
flightState.records.data.get(flightState._trackedIcao)?.klass,
|
||||
setBillboard(
|
||||
bb,
|
||||
'scale',
|
||||
parts.rendering._fleetBillboardScale(
|
||||
flightState._trackedIcao,
|
||||
flightState.records.data.get(flightState._trackedIcao)?.klass,
|
||||
),
|
||||
);
|
||||
bb.rotation = flightState._lastTrackedRotation;
|
||||
setBillboard(bb, 'rotation', flightState._lastTrackedRotation);
|
||||
}
|
||||
flightState._lastCamPoseSig = ''; // force a fleet rotation pass on the next tick
|
||||
|
||||
@@ -830,7 +837,7 @@ export function createTracking({
|
||||
if (flightState._models.has(id) || flightState._modelPending.has(id))
|
||||
parts.rendering._releaseModel(id);
|
||||
const bb = flightState._billboards.get(id);
|
||||
if (bb && id !== flightState._trackedIcao) bb.show = true; // horizon cull re-asserts next tick
|
||||
if (bb && id !== flightState._trackedIcao) setBillboard(bb, 'show', true); // horizon cull re-asserts next tick
|
||||
if (id === flightState._trackedIcao) {
|
||||
parts.rendering._releaseTrackedModel();
|
||||
_syncTracked2dRotation();
|
||||
@@ -862,9 +869,9 @@ export function createTracking({
|
||||
function _routeIsPlausible(icao24, route) {
|
||||
const info = flightState.records.data.get(icao24);
|
||||
const bb = flightState._billboards.get(icao24);
|
||||
if (!info || !bb || !bb.position) return true;
|
||||
if (!info || !bb || !billboardState(bb).position) return true;
|
||||
const carto = Cesium.Cartographic.fromCartesian(
|
||||
bb.position,
|
||||
billboardState(bb).position,
|
||||
Cesium.Ellipsoid.WGS84,
|
||||
flightState._scratchCarto,
|
||||
);
|
||||
@@ -906,21 +913,22 @@ export function createTracking({
|
||||
flightState._trackedIcao = icao24;
|
||||
_resetTrackedSelectionState(); // fresh selection: enter at the ENTER ceiling, full load-retry budget
|
||||
flightState._cachedDRFrame = -1;
|
||||
flightState._lastTrackedRotation = bb.rotation || 0;
|
||||
flightState._lastTrackedRotation = billboardState(bb).rotation || 0;
|
||||
// Drop any fleet 3D model for this aircraft — the tracked entity now owns its visual (its
|
||||
// own billboard + model graphic), and the fleet tick skips the tracked icao, so a leftover
|
||||
// fleet model would be orphaned + double-rendered.
|
||||
parts.rendering._releaseModel(icao24);
|
||||
|
||||
// Hide the billboard — the tracked entity replaces it visually
|
||||
bb.show = false;
|
||||
setBillboard(bb, 'show', false);
|
||||
|
||||
// Helper: smoothed, per-frame-cached tracked position (see _trackedDisplayPosition —
|
||||
// one computation shared by the position/alignedAxis/rotation/trail-head callbacks,
|
||||
// with discontinuity reconciliation). Falls back to the last billboard position when
|
||||
// the aircraft has no fix.
|
||||
const getTrackedPosition = () =>
|
||||
parts.motion._trackedDisplayPosition(icao24) || bb.position;
|
||||
parts.motion._trackedDisplayPosition(icao24) ||
|
||||
billboardState(bb).position;
|
||||
|
||||
// Dead-reckoning position property — smooth continuous motion between API updates.
|
||||
const positionProperty = new Cesium.CallbackProperty(() => {
|
||||
|
||||
Reference in new issue
Block a user