mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Keep aircraft, installation and viewshed state off Cesium objects
The aircraft layers' model spec key, IR boost and belly offset and the billboards' large-icon flag move into aircraftVisuals, one store shared by flights, military and local ADS-B. Installation markers' last drawn height and selection move into installationMarkers. The CCTV viewshed QA tag is now the viewshedCameraId record field, which qa-cctv-v2 reads through entityRecords. Test fixtures drop a placement flag nothing reads.
This commit is contained in:
1 parent
42b17ffab6
commit
f86dcc9179
11 files changed
+84
-40
No files matched your search
@@ -38,6 +38,7 @@ import {
|
||||
COURSE_MAX_DPS,
|
||||
} from './policy.js';
|
||||
import { AIRCRAFT_ENVIRONMENT_MAP_OPTIONS } from '../../data/aircraftModelLighting.js';
|
||||
import { aircraftVisuals } from '../aircraft/visualState.js';
|
||||
|
||||
export function createRendering({
|
||||
flightState,
|
||||
@@ -162,7 +163,7 @@ export function createRendering({
|
||||
const meta = flightState.records.data.get(icao24);
|
||||
bb.image = aircraftIcon(
|
||||
_iconKind(icao24, meta?.klass),
|
||||
bb._gevIconLarge ? TRACKED_ICON_PX : undefined,
|
||||
aircraftVisuals.read(bb)?.iconLarge ? TRACKED_ICON_PX : undefined,
|
||||
);
|
||||
bb.width = icao24 === flightState._trackedIcao ? 24 : 20;
|
||||
bb.height = icao24 === flightState._trackedIcao ? 24 : 20;
|
||||
@@ -432,7 +433,7 @@ export function createRendering({
|
||||
const key = _specKeyFor(flightState.records.data.get(icao24)?.klass);
|
||||
const current = flightState._models.get(icao24);
|
||||
if (
|
||||
(current && current._gevSpecKey !== key) ||
|
||||
(current && aircraftVisuals.read(current)?.specKey !== key) ||
|
||||
(!current && flightState._modelPending.has(icao24))
|
||||
) {
|
||||
const bb = flightState._billboards.get(icao24);
|
||||
@@ -442,7 +443,7 @@ export function createRendering({
|
||||
if (
|
||||
icao24 === flightState._trackedIcao &&
|
||||
flightState._trackedModel &&
|
||||
flightState._trackedModel._gevSpecKey !== key
|
||||
aircraftVisuals.read(flightState._trackedModel)?.specKey !== key
|
||||
) {
|
||||
_releaseTrackedModel();
|
||||
}
|
||||
@@ -465,7 +466,11 @@ export function createRendering({
|
||||
const batch = flightState._irReloadQueue.splice(0, IR_RELOAD_BATCH);
|
||||
for (const icao of batch) {
|
||||
const model = flightState._models.get(icao);
|
||||
if (!model || model._gevIrBoost === flightState._irBoost) continue; // already right state
|
||||
if (
|
||||
!model ||
|
||||
aircraftVisuals.read(model)?.irBoost === flightState._irBoost
|
||||
)
|
||||
continue; // already right state
|
||||
const bb = flightState._billboards.get(icao);
|
||||
if (bb && icao !== flightState._trackedIcao) bb.show = true;
|
||||
_releaseModel(icao);
|
||||
@@ -571,8 +576,9 @@ export function createRendering({
|
||||
// Keep the pick identity explicit on the resolved primitive. This also
|
||||
// protects injected/custom loaders that do not copy the creation option.
|
||||
model.id = icao24;
|
||||
model._gevSpecKey = specKey; // class-change sync compares against this
|
||||
model._gevIrBoost = loadIrBoost; // boost-flip reload queue compares against this
|
||||
const visual = aircraftVisuals.write(model);
|
||||
visual.specKey = specKey; // class-change sync compares against this
|
||||
visual.irBoost = loadIrBoost; // boost-flip reload queue compares against this
|
||||
// Admitted, not yet the visual. Cesium's default is show=true, which would let
|
||||
// an unplaced primitive claim ownership from the billboard for the frames
|
||||
// between admission and the next fleet tick (and draw at the identity matrix,
|
||||
@@ -764,7 +770,7 @@ export function createRendering({
|
||||
// Assign after resolution as well as in the creation options so the
|
||||
// standalone primitive always exposes the tracked aircraft pick id.
|
||||
m.id = flightState._trackedIcao;
|
||||
m._gevSpecKey = trackedKey; // class-change sync compares against this
|
||||
aircraftVisuals.write(m).specKey = trackedKey; // class-change sync compares against this
|
||||
m.show = false; // admitted, not yet the visual — the driver shows it once placed
|
||||
// Seed the world transform before the primitive enters the scene. A model
|
||||
// can become ready+shown between render phases; leaving Cesium's identity
|
||||
@@ -1075,9 +1081,10 @@ export function createRendering({
|
||||
(bb.scale || 1) *
|
||||
distanceScale *
|
||||
(globalThis.devicePixelRatio || 1);
|
||||
const wantLarge = bb._gevIconLarge ? glyphDevPx > 56 : glyphDevPx > 76;
|
||||
if (wantLarge !== !!bb._gevIconLarge) {
|
||||
bb._gevIconLarge = wantLarge;
|
||||
const visual = aircraftVisuals.write(bb);
|
||||
const wantLarge = visual.iconLarge ? glyphDevPx > 56 : glyphDevPx > 76;
|
||||
if (wantLarge !== !!visual.iconLarge) {
|
||||
visual.iconLarge = wantLarge;
|
||||
bb.image = aircraftIcon(
|
||||
_iconKind(icao24, info?.klass),
|
||||
wantLarge ? TRACKED_ICON_PX : undefined,
|
||||
|
||||
Reference in new issue
Block a user