Merge branch 'main' into denis/cockpit-subject-providers

This commit is contained in:
Denis Groshev committed 2026-11-13 16:38:13 +01:00
commit 546ac22708
217 files changed
+8983 -2470

No files matched your search

+117 -2
View File
@@ -27,6 +27,12 @@ import {
TRANSIT_MODE_COLORS,
vehicleNearView,
} from './policy.js';
import {
fleetModelSet,
loadFleetModelSet,
transitModelSpec,
} from '../../data/fleetModels.js';
import { createFleetModelLayer } from '../../data/fleetModelInstances.js';
export const MODE_CESIUM_COLORS = Object.fromEntries(
Object.entries(TRANSIT_MODE_COLORS).map(([mode, css]) => [
@@ -102,7 +108,10 @@ export function createRendering({ state, services, parts }) {
entry.heightPending = !known;
// A vehicle a first-person view rides keeps moving, unseen.
entry.marker.show =
!!known && vehicleInView(entry) && entry.key !== state._cockpitSubjectKey;
!!known &&
vehicleInView(entry) &&
!entry.modelOwnsVisual &&
entry.key !== state._cockpitSubjectKey;
if (known) {
entry.marker.position = state._scratchCartesian;
entry.hasRendered = true;
@@ -405,6 +414,7 @@ export function createRendering({ state, services, parts }) {
const now = state.now();
if (state._vehicles.size === 0) {
state._moving.clear();
updateModels();
syncRenderHold();
return;
}
@@ -452,9 +462,111 @@ export function createRendering({ state, services, parts }) {
: 0;
}
if (state._heightDirty.size) governorRequestRender('transit-height-batch');
updateModels();
syncRenderHold();
}
// Under the DISPLAY rail's 3D toggle, vehicles in view near the camera are
// drawn as the project's procedural fleet models, chosen by mode, painted
// in their mode colour where the model marks it, on the aircraft layers'
// icon-to-model rules (services.fleet). The fleet set loads once, up front,
// when the layer starts.
let fleetModels = null;
/** Items drawn last frame, and the map the next frame's are gathered into. */
let modelItems = new Map();
let spareItems = new Map();
/** The lift icons are drawn with above the floor; a model stands on the floor. */
const groundLiftM = services.ground?.GROUND_FLOOR_LIFT_M || 0;
/** Load the fleet set and create the layer's models (on enable). */
function startModels() {
const fleet = services.fleet;
if (!fleet?.policy || !state._viewer) return;
loadFleetModelSet({ resolveAsset: fleet.resolveAsset }).catch(() => {
/* models stay off; vehicles keep their icons */
});
fleetModels ||= createFleetModelLayer({
viewer: state._viewer,
display: fleet.display,
policy: fleet.policy,
resolveAsset: fleet.resolveAsset,
});
}
/** Hand an entry's visual back to its icon. */
function handBack(entry) {
if (!entry.modelOwnsVisual) return;
entry.modelOwnsVisual = false;
if (entry.marker)
entry.marker.show =
vehicleInView(entry) &&
!entry.heightPending &&
entry.surfaceReady !== false;
}
function updateModels() {
if (!fleetModels) return;
if (!fleetModels.active() || state._vehicles.size === 0) {
if (modelItems.size) {
for (const item of modelItems.values()) handBack(item.entry);
modelItems.clear();
fleetModels.frame(modelItems, performance.now());
}
return;
}
const set = fleetModelSet();
const next = spareItems;
next.clear();
for (const entry of state._visible) {
// A vehicle of no known mode keeps its icon: no model says what it is.
if (!entry.marker || !entry.hasRendered || entry.mode === 'unknown')
continue;
let item = modelItems.get(entry.key);
if (!item || item.entry !== entry) {
item = {
entry,
pickId: entry.key,
modelOwnsVisual: false,
groundLiftM,
};
}
if (item.mode !== entry.mode) {
item.mode = entry.mode;
item.spec = transitModelSpec(set, { mode: entry.mode });
item.tint =
MODE_CESIUM_COLORS[entry.mode] || MODE_CESIUM_COLORS.unknown;
}
item.position = entry.marker.position;
item.headingDeg = Number.isFinite(entry.courseDeg) ? entry.courseDeg : 0;
item.show = !entry.heightPending && entry.surfaceReady !== false;
next.set(entry.key, item);
}
for (const [key, item] of modelItems)
if (next.get(key) !== item) handBack(item.entry);
spareItems = modelItems;
modelItems = next;
fleetModels.frame(modelItems, performance.now());
for (const item of modelItems.values()) {
const entry = item.entry;
if (item.modelOwnsVisual) {
entry.modelOwnsVisual = true;
entry.marker.show = false;
} else handBack(entry);
}
if (fleetModels.settling) governorRequestRender('transit-models');
}
/** Drop every model (layer disabled); `destroy` also removes the collection. */
function stopModels(destroy = false) {
for (const item of modelItems.values()) item.entry.modelOwnsVisual = false;
modelItems.clear();
spareItems.clear();
if (destroy) {
fleetModels?.destroy();
fleetModels = null;
} else fleetModels?.clear();
}
const occluder = new Cesium.EllipsoidalOccluder(Cesium.Ellipsoid.WGS84);
const sphere = new Cesium.BoundingSphere(undefined, 5);
const cameraPosition = new Cesium.Cartesian3();
@@ -564,7 +676,8 @@ export function createRendering({ state, services, parts }) {
!held &&
visible &&
!entry.heightPending &&
entry.surfaceReady !== false;
entry.surfaceReady !== false &&
!entry.modelOwnsVisual;
visibility.heightPending = !!entry.heightPending;
visibility.surfaceReady = entry.surfaceReady ?? null;
schedulePlayback(entry);
@@ -629,5 +742,7 @@ export function createRendering({ state, services, parts }) {
setStylePreset,
onPreRender,
syncRenderHold,
startModels,
stopModels,
};
}