feat(vessels, transit, rail): draw fleet models under the 3D toggle

Vessels, Transit and Rail turn nearby icons into fleet models at the
aircraft layers' distances. A vessel is drawn at its AIS length and beam
(static dimensions now reach vessel rows), standing at the sea surface; a
transit vehicle or train stands on its road or rail, raised by its type's
elevation, and is painted in its mode or category colour where the model
marks it.
This commit is contained in:
Sameh Khamis committed 2026-11-13 07:16:25 -08:00
1 parent fcc44d0eaf
commit 7b93045895
18 files changed
+984 -15

No files matched your search

+3
View File
@@ -95,6 +95,7 @@ export function createLifecycle({ state, services, parts, timetable }) {
parts.rendering.onPreRender,
);
state._networkFade = -1;
parts.rendering.startModels();
parts.viewport.loadCatalog();
parts.viewport.runProximityCheck();
restoreSpriteOrder(viewer);
@@ -127,6 +128,7 @@ export function createLifecycle({ state, services, parts, timetable }) {
state._heldFeedId = null;
state._feedStatus.clear();
dropAllTrains();
parts.rendering.stopModels();
// Floor cells and track samples queued for trains now gone.
parts.rendering.reset();
parts.routes.hideAll();
@@ -154,6 +156,7 @@ export function createLifecycle({ state, services, parts, timetable }) {
/** Tear down the collection and release every shared registration. */
destroy(viewer) {
this.disable(viewer);
parts.rendering.stopModels(true);
parts.routes.destroy();
if (state._markers) {
unregisterSpriteCollection('rail', state._markers);
+142 -4
View File
@@ -26,6 +26,22 @@ import {
UNSELECTED_TRAIN_ALPHA,
} from './policy.js';
import { placeOnPath } from './pathBinding.js';
import {
fleetModelSet,
loadFleetModelSet,
transitModelSpec,
} from '../../data/fleetModels.js';
import { createFleetModelLayer } from '../../data/fleetModelInstances.js';
/** How often the trains near enough for a model are gathered again (wall ms). */
const MODEL_CANDIDATES_MS = 500;
/** Each category's colour, painted where a train model marks it. */
const CATEGORY_TINTS = Object.fromEntries(
Object.entries(RAIL_CATEGORY_COLORS).map(([category, css]) => [
category,
Cesium.Color.fromCssColorString(css),
]),
);
const SPRITE_PX = 64;
/** Billboard tints; the setter copies, so sharing one instance is safe. */
@@ -507,6 +523,11 @@ export function createRendering({ state, services, parts }) {
);
}
/** Whether a train's icon is drawn: shown, and not drawn by its model. */
function markerShown(entry) {
return categoryShown(entry) && !entry.modelOwnsVisual;
}
/**
* A train bound to its railway line is drawn on the line, at the arc its
* playback has reached; any other train (or a bound train whose reports do
@@ -536,7 +557,7 @@ export function createRendering({ state, services, parts }) {
undefined,
scratchPosition,
);
entry.marker.show = categoryShown(entry);
entry.marker.show = markerShown(entry);
}
/** While a train is selected, every other train is drawn see-through. */
@@ -554,7 +575,7 @@ export function createRendering({ state, services, parts }) {
entry.marker.width = size;
entry.marker.height = size;
entry.marker.color = tintFor(entry);
entry.marker.show = categoryShown(entry);
entry.marker.show = markerShown(entry);
}
/** Re-tint every train after the selection appeared, moved or cleared. */
@@ -658,7 +679,7 @@ export function createRendering({ state, services, parts }) {
function cullSelected() {
const entry = state._trains.get(state._selectedKey);
if (!entry?.marker) return;
const shown = categoryShown(entry) && facesCamera(entry.marker.position);
const shown = markerShown(entry) && facesCamera(entry.marker.position);
if (entry.marker.show !== shown) entry.marker.show = shown;
parts.routes.cullStops(facesCamera);
}
@@ -666,6 +687,121 @@ export function createRendering({ state, services, parts }) {
function onPreRender() {
advanceMoving();
if (state._enabled && state._selectedKey !== null) cullSelected();
if (state._enabled) updateModels();
}
// Under the DISPLAY rail's 3D toggle, trains near the camera are drawn as
// the project's procedural fleet models, chosen by category and mode,
// painted in their category 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;
let modelItems = new Map();
let modelCandidatesAtMs = -Infinity;
/** 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; trains keep their icons */
});
fleetModels ||= createFleetModelLayer({
viewer: state._viewer,
display: fleet.display,
policy: fleet.policy,
resolveAsset: fleet.resolveAsset,
});
}
/** Hand a train's visual back to its icon. */
function handBack(entry) {
if (!entry.modelOwnsVisual) return;
entry.modelOwnsVisual = false;
if (entry.marker) entry.marker.show = markerShown(entry);
}
function modelItem(entry, set) {
let item = modelItems.get(entry.key);
if (!item || item.entry !== entry)
item = { entry, pickId: entry.key, modelOwnsVisual: false };
const specKey = `${entry.category}|${entry.railMode}`;
if (item.specKey !== specKey) {
item.specKey = specKey;
item.spec = transitModelSpec(set, {
railCategory: entry.category,
railMode: entry.railMode,
});
item.tint = CATEGORY_TINTS[entry.category] || CATEGORY_TINTS.local;
}
item.position = entry.marker.position;
item.headingDeg = Number.isFinite(entry.courseDeg) ? entry.courseDeg : 0;
item.show = categoryShown(entry);
return item;
}
function updateModels() {
if (!fleetModels) return;
if (!fleetModels.active() || state._trains.size === 0) {
if (modelItems.size) {
fleetModels.frame(new Map(), performance.now());
for (const item of modelItems.values()) handBack(item.entry);
modelItems = new Map();
}
return;
}
const set = fleetModelSet();
const now = performance.now();
const next = new Map();
if (now - modelCandidatesAtMs >= MODEL_CANDIDATES_MS) {
modelCandidatesAtMs = now;
const camera = state._viewer?.camera;
const policy = services.fleet.policy;
const keepM =
services.fleet.display?.()?.models3dMode === 'all'
? policy.keepAllM
: policy.keepM;
const limitSq = keepM * keepM * 1.44;
if (camera?.positionWC)
for (const entry of state._trains.values()) {
if (!entry.marker || !categoryShown(entry)) continue;
if (
Cesium.Cartesian3.distanceSquared(
camera.positionWC,
entry.marker.position,
) > limitSq
)
continue;
next.set(entry.key, modelItem(entry, set));
}
} else {
for (const [key, item] of modelItems)
if (state._trains.get(key) === item.entry && item.entry.marker)
next.set(key, modelItem(item.entry, set));
}
for (const [key, item] of modelItems)
if (next.get(key) !== item) handBack(item.entry);
modelItems = next;
fleetModels.frame(modelItems, 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('rail-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 = new Map();
modelCandidatesAtMs = -Infinity;
if (destroy) {
fleetModels?.destroy();
fleetModels = null;
} else fleetModels?.clear();
}
function advanceMoving() {
@@ -697,7 +833,7 @@ export function createRendering({ state, services, parts }) {
function applyCategoryVisibility() {
for (const entry of state._trains.values()) {
if (!entry.marker) continue;
entry.marker.show = categoryShown(entry);
entry.marker.show = markerShown(entry);
schedulePlayback(entry);
}
syncRenderHold();
@@ -720,5 +856,7 @@ export function createRendering({ state, services, parts }) {
applyCategoryVisibility,
categoryShown,
reset,
startModels,
stopModels,
};
}
+3
View File
@@ -195,6 +195,7 @@ export function createLifecycle({ state, services, parts }) {
parts.rendering.onPreRender,
);
}
parts.rendering.startModels();
parts.viewport.runProximityCheck();
restoreSpriteOrder(viewer);
},
@@ -242,6 +243,7 @@ export function createLifecycle({ state, services, parts }) {
destroyTrack(entry.track);
}
state._vehicles.clear();
parts.rendering.stopModels();
parts.height.clear();
state._markers?.removeAll();
state._animatedMarkers?.removeAll();
@@ -282,6 +284,7 @@ export function createLifecycle({ state, services, parts }) {
*/
destroy(viewer) {
this.disable(viewer);
parts.rendering.stopModels(true);
if (state._markers) {
unregisterSpriteCollection('transit', state._markers);
viewer?.scene?.primitives?.remove(state._markers);
+103 -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]) => [
@@ -100,7 +106,8 @@ export function createRendering({ state, services, parts }) {
);
entry.surfaceReady = !!known;
entry.heightPending = !known;
entry.marker.show = !!known && vehicleInView(entry);
entry.marker.show =
!!known && vehicleInView(entry) && !entry.modelOwnsVisual;
if (known) {
entry.marker.position = state._scratchCartesian;
entry.hasRendered = true;
@@ -403,6 +410,7 @@ export function createRendering({ state, services, parts }) {
const now = state.now();
if (state._vehicles.size === 0) {
state._moving.clear();
updateModels();
syncRenderHold();
return;
}
@@ -450,9 +458,97 @@ 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;
let modelItems = new Map();
/** 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) {
fleetModels.frame(new Map(), performance.now());
for (const item of modelItems.values()) handBack(item.entry);
modelItems = new Map();
}
return;
}
const set = fleetModelSet();
const next = new Map();
for (const entry of state._visible) {
if (!entry.marker || !entry.hasRendered) continue;
let item = modelItems.get(entry.key);
if (!item || item.entry !== entry) {
item = { entry, pickId: entry.key, modelOwnsVisual: false };
}
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);
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 = new Map();
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();
@@ -556,7 +652,10 @@ export function createRendering({ state, services, parts }) {
}
}
entry.marker.show =
visible && !entry.heightPending && entry.surfaceReady !== false;
visible &&
!entry.heightPending &&
entry.surfaceReady !== false &&
!entry.modelOwnsVisual;
visibility.heightPending = !!entry.heightPending;
visibility.surfaceReady = entry.surfaceReady ?? null;
schedulePlayback(entry);
@@ -621,5 +720,7 @@ export function createRendering({ state, services, parts }) {
setStylePreset,
onPreRender,
syncRenderHold,
startModels,
stopModels,
};
}
+2
View File
@@ -213,6 +213,8 @@ export function createIngestion({
imo: record.imo,
type: record.type,
destination: record.destination,
length: record.lengthM ?? null,
beam: record.beamM ?? null,
speed: record.speedMps == null ? null : record.speedMps / 0.514444,
course: record.courseDeg,
heading: record.headingDeg,
+1
View File
@@ -248,6 +248,7 @@ export function createLifecycle({
if (state.preRenderRemover) {
state.preRenderRemover();
}
components.rendering.destroyModels();
resetState();
},
};
+10
View File
@@ -25,6 +25,9 @@ export function normalizeVessel(row) {
imo: String(row.imo || ''),
type: String(row.type || ''),
destination: String(row.destination || ''),
// Hull length and beam (metres), null when unreported.
length: positiveNumber(row.length),
beam: positiveNumber(row.beam),
speed: finiteNumber(row.speed),
course: finiteNumber(row.course),
heading: finiteNumber(row.heading),
@@ -46,6 +49,11 @@ function stampFix(record, receivedAtMs, feedLatestEpoch) {
record.fixFeedEpoch = feedLatestEpoch;
}
function positiveNumber(value) {
const number = finiteNumber(value);
return number !== null && number > 0 ? number : null;
}
function finiteNumber(value) {
if (value === null || value === undefined || value === '') return null;
const number = Number(value);
@@ -147,6 +155,8 @@ export class VesselRecords {
record.imo = next.imo;
record.type = next.type;
record.destination = next.destination;
record.length = next.length;
record.beam = next.beam;
record.speed = next.speed;
record.course = next.course;
record.heading = next.heading;
+148 -1
View File
@@ -22,10 +22,19 @@ import {
followsClock,
} from './policy.js';
import { vesselPositionAt } from './motion.js';
import {
fleetModelSet,
loadFleetModelSet,
vesselModelSpec,
} from '../../data/fleetModels.js';
import { createFleetModelLayer } from '../../data/fleetModelInstances.js';
/** How often vessels move on as the world clock plays (wall ms). */
const FOLLOW_POSITION_MS = 250;
/** How often the vessels near enough for a model are gathered again (wall ms). */
const MODEL_CANDIDATES_MS = 500;
export function createRendering({
vesselState,
services,
@@ -56,6 +65,12 @@ export function createRendering({
VESSEL_LIFT_M,
);
visual.position = Cesium.Cartesian3.fromDegrees(lon, lat, heightM);
// A ship model's origin is its waterline: the sea surface, unlifted.
visual.waterline = Cesium.Cartesian3.fromDegrees(
lon,
lat,
heightM - VESSEL_LIFT_M,
);
visual.surfacePosition = Cesium.Cartesian3.fromDegrees(lon, lat, 0);
visual.normal = Cesium.Ellipsoid.WGS84.geodeticSurfaceNormal(
visual.position,
@@ -101,6 +116,7 @@ export function createRendering({
}
function ensureCollections(viewer) {
ensureModels(viewer);
if (!viewer || state.billboardCollection) return;
state.billboardCollection = new Cesium.BillboardCollection({
blendOption: Cesium.BlendOption.TRANSLUCENT,
@@ -203,6 +219,126 @@ export function createRendering({
return icon;
}
// Under the DISPLAY rail's 3D toggle, vessels near the camera are drawn as
// the project's procedural fleet models at their reported length and beam,
// on the aircraft layers' icon-to-model rules (services.fleet). The fleet
// set loads once, up front, when the layer starts.
let fleetModels = null;
let modelItems = new Map();
let modelCandidatesAtMs = -Infinity;
function ensureModels(viewer) {
const fleet = services.fleet;
if (!viewer || fleetModels || !fleet?.policy) return;
loadFleetModelSet({ resolveAsset: fleet.resolveAsset }).catch(() => {
/* models stay off; vessels keep their icons */
});
fleetModels = createFleetModelLayer({
viewer,
display: fleet.display,
policy: fleet.policy,
resolveAsset: fleet.resolveAsset,
});
}
/** The model item for `record`, its spec rebuilt only when its type or size changes. */
function modelItem(record, set) {
let item = modelItems.get(record.id);
const specKey = `${record.type}|${record.length}|${record.beam}|${record.name}`;
if (!item) {
item = { pickId: record, tint: null, modelOwnsVisual: false };
modelItems.set(record.id, item);
}
if (item.specKey !== specKey) {
item.specKey = specKey;
item.spec = vesselModelSpec(set, record);
}
const visual = getVisual(record);
item.record = record;
item.position = visual.waterline;
item.headingDeg = vesselCourseDeg(record);
item.show = record.id !== state.cockpitSubjectId;
return item;
}
/** Gather the vessels within the models' keep radius of the camera. */
function gatherModelItems(set, prefs) {
const camera = state.viewer?.camera;
const policy = services.fleet.policy;
const keepM =
prefs?.models3dMode === 'all' ? policy.keepAllM : policy.keepM;
const next = new Map();
if (camera?.positionWC) {
const limitSq = keepM * keepM * 1.44;
for (const record of state.records.all) {
const visual = getVisual(record);
if (!visual.waterline) continue;
if (
Cesium.Cartesian3.distanceSquared(
camera.positionWC,
visual.waterline,
) > limitSq
)
continue;
next.set(record.id, modelItem(record, set));
}
}
for (const [id, item] of modelItems)
if (!next.has(id)) handBackVisual(item);
modelItems = next;
}
/** Give a vessel's icon back when its model no longer draws it. */
function handBackVisual(item) {
if (!item.ownedBillboard) return;
item.ownedBillboard = false;
const billboard = getVisual(item.record).billboard;
if (billboard)
billboard.show =
isVisible(getVisual(item.record).surfacePosition, makeOccluder()) &&
item.record.id !== state.cockpitSubjectId;
}
function updateModels() {
if (!fleetModels) return;
if (!fleetModels.active()) {
if (modelItems.size) {
fleetModels.frame(modelItems, performance.now());
for (const item of modelItems.values()) handBackVisual(item);
modelItems = new Map();
}
return;
}
const set = fleetModelSet();
const now = performance.now();
if (now - modelCandidatesAtMs >= MODEL_CANDIDATES_MS) {
modelCandidatesAtMs = now;
gatherModelItems(set, services.fleet.display?.());
} else {
for (const [id, item] of modelItems) {
if (state.records.byId.get(id) === item.record)
modelItem(item.record, set);
else modelItems.delete(id);
}
}
fleetModels.frame(modelItems, now);
for (const item of modelItems.values()) {
const billboard = getVisual(item.record).billboard;
if (item.modelOwnsVisual) {
item.ownedBillboard = true;
if (billboard) billboard.show = false;
} else handBackVisual(item);
}
if (fleetModels.settling) governorRequestRender('ais-vessels-models');
}
function destroyModels() {
fleetModels?.destroy();
fleetModels = null;
modelItems = new Map();
modelCandidatesAtMs = -Infinity;
}
// Vessels move only when a poll lands, so the layer does not hold the
// continuous render loop. Its passes run in preRender, which idle mode fires
// only for rendered frames: a forced pass (new data, selection) requests its
@@ -216,6 +352,7 @@ export function createRendering({
state.preRenderRemover = viewer.scene.preRender.addEventListener(() => {
if (followsClock(vesselState)) followClockPositions();
updateVisibility();
if (state.feed.enabled) updateModels();
});
}
@@ -307,7 +444,9 @@ export function createRendering({
if (visual.billboard) {
// The bridge camera sits on this sprite; showing it would fill the view.
visual.billboard.show =
visible && record.id !== state.cockpitSubjectId;
visible &&
record.id !== state.cockpitSubjectId &&
!modelItems.get(record.id)?.ownedBillboard;
if (visible && doRotations && scene) {
const rot = screenProjectedRotation(
scene,
@@ -582,6 +721,12 @@ export function createRendering({
if (state.billboardCollection) {
state.billboardCollection.show = show;
}
fleetModels?.setVisible(show);
if (!show && fleetModels) {
fleetModels.clear();
for (const item of modelItems.values()) item.ownedBillboard = false;
modelItems = new Map();
}
vesselState._vesselOverlayHost.setVisible(VESSEL_OVERLAY_SOURCE_ID, show);
}
return {
@@ -607,5 +752,7 @@ export function createRendering({
labelPriority,
hasUsefulName,
setVisible,
updateModels,
destroyModels,
};
}