mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Read flight and military billboard state from the app'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 the app'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
7ebc73393a
commit
bb91688a62
23 files changed
+424
-172
No files matched your search
@@ -11,6 +11,7 @@ import {
|
||||
} from '../../data/contactMatch.js';
|
||||
import { LANDED_ALT_MAX_FT, LANDED_SPEED_MAX_MPS } from './policy.js';
|
||||
import { emergencyBroadcastPhrase } from '../../data/aircraftEmergency.js';
|
||||
import { billboardState, setBillboard } from '../../data/billboardMirror.js';
|
||||
|
||||
export function createQueries({
|
||||
flightState,
|
||||
@@ -96,7 +97,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,
|
||||
@@ -272,7 +274,8 @@ export function createQueries({
|
||||
// plane's own fleet billboard — its tracked entity is the visual (avoids a double-image).
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -375,7 +378,7 @@ export function createQueries({
|
||||
if (
|
||||
!aircraftIncludedInNearby({
|
||||
isTracked,
|
||||
billboardShown: bb.show,
|
||||
billboardShown: billboardState(bb).show,
|
||||
modelRendering: parts.rendering._modelOwnsVisual(icao24),
|
||||
includeHidden,
|
||||
})
|
||||
@@ -385,7 +388,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);
|
||||
@@ -462,7 +465,8 @@ export function createQueries({
|
||||
// doesn't vanish on the 2D→3D handoff; bb.position stays current while hidden.
|
||||
const model = flightState._models.get(icao24);
|
||||
const modelOwnsVisual = parts.rendering._modelOwnsVisual(icao24);
|
||||
if (!isTracked && !bb.show && !modelOwnsVisual) continue;
|
||||
if (!isTracked && !billboardState(bb).show && !modelOwnsVisual)
|
||||
continue;
|
||||
const info = flightState.records.data.get(icao24);
|
||||
const callsign = info?.callsign?.trim();
|
||||
const registration = info?.registration?.trim();
|
||||
@@ -484,7 +488,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,
|
||||
@@ -494,7 +498,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;
|
||||
@@ -616,7 +620,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,
|
||||
|
||||
Reference in new issue
Block a user