mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Draw radio, transit and CCTV through one display each
- Radio: stations, clusters, the selection and its brackets are point and sprite sets; clusters come from the layer's engine-neutral screen clusterer with Cesium's EntityCluster rules, and clicks go through the selection dispatcher. One style module holds the sizes and colours. - Transit: vehicles are two sprite sets from an up-front atlas, rotated with Cesium's projected-rotation maths. The selected vehicle's trail is engine.lines in two lanes and 29 age bands, so trails are no longer draped over terrain until the contract has ground corridors. The Cesium contact trail renderer and its re-export go. - CCTV: markers, wedges, the plane outline and the calibration gizmo (rings, arrows, handles, drags through engine.input) draw on the contract. The textured monitor plane and the viewshed volume, which no primitive expresses yet, sit behind one seam, render/meshes.js, with a Cesium backend and a Navara backend the Navara mode passes in. Known gaps against Cesium: transit trails are not draped, and the surveillance-lens click correction runs only where the engine reports its style stage (Navara). Coupling: layer renderer lines fall from 2638/8735 to 1636/6953 (Cesium/Navara), ScreenSpaceEventHandler files from 15 to 10, `viewer` lines from 2014 to 1901.
This commit is contained in:
1 parent
fc75e245a6
commit
dc1144b947
68 files changed
+6216
-5326
No files matched your search
+17
-16
@@ -1,11 +1,7 @@
|
||||
import {
|
||||
createCctvCesiumRenderer,
|
||||
bindCctvWorldClickGesture,
|
||||
} from '../../layers/cctv/render/cesium.js';
|
||||
import { bindCctvWorldClickGesture } from '../../layers/cctv/render/display.js';
|
||||
import { createCctvLayer } from '../../layers/cctv/index.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
import * as credits from '../../data/dataCredits.js';
|
||||
import * as sprites from '../../data/spriteOrder.js';
|
||||
import * as activation from '../../cctvFocusRequest.js';
|
||||
import * as overlays from '../../overlays/worldOverlay.js';
|
||||
import { CITY_POIS } from '../../cityPois.js';
|
||||
@@ -13,14 +9,16 @@ import * as picking from '../../data/pickRegistry.js';
|
||||
import * as focus from '../../data/focusDeemphasis.js';
|
||||
import * as render from '../../renderGovernor.js';
|
||||
|
||||
/** Construct one layer using the application scene owners and a supplied source. */
|
||||
/**
|
||||
* Construct one layer using the application scene owners and a supplied
|
||||
* source; it draws with the engine's renderer from the registry
|
||||
* (render/display.js on every engine).
|
||||
*/
|
||||
export function createApplicationCctv({
|
||||
surface,
|
||||
source,
|
||||
rendererFactory = ({ engine, ...context }) =>
|
||||
engine?.kind === 'navara'
|
||||
? rendererFor('cctv', engine, context)
|
||||
: createCctvCesiumRenderer(context),
|
||||
rendererFor('cctv', engine, context),
|
||||
}) {
|
||||
const { terrain, groundFloor: ground, meshFloor: mesh } = surface;
|
||||
const layer = createCctvLayer({
|
||||
@@ -28,7 +26,6 @@ export function createApplicationCctv({
|
||||
rendererFactory,
|
||||
services: {
|
||||
credits,
|
||||
sprites,
|
||||
activation,
|
||||
overlays,
|
||||
locations: { CITY_POIS },
|
||||
@@ -43,13 +40,17 @@ export function createApplicationCctv({
|
||||
return {
|
||||
...layer,
|
||||
bindCctvWorldClickGesture,
|
||||
// Legacy native helper; production navigation uses the initialized owner.
|
||||
focusCctvRecord(viewer, record, duration) {
|
||||
const renderer = viewer
|
||||
? createCctvCesiumRenderer({ services: {}, state: {} })
|
||||
// Legacy helper; production navigation uses the initialized owner.
|
||||
focusCctvRecord(engine, record, duration) {
|
||||
const display = engine
|
||||
? rendererFor('cctv', engine, { services: {}, state: {} })
|
||||
: null;
|
||||
renderer?.attach(viewer);
|
||||
return layer.focusCctvRecord(renderer, record, duration);
|
||||
display?.attach();
|
||||
try {
|
||||
return layer.focusCctvRecord(display, record, duration);
|
||||
} finally {
|
||||
display?.destroy();
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
import { createRadioCesiumRenderer } from '../../layers/radio/render/cesium.js';
|
||||
import { createRadioLayer } from '../../layers/radio/index.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
import * as picking from '../../data/pickRegistry.js';
|
||||
@@ -6,14 +5,16 @@ import * as overlays from '../../overlays/worldOverlay.js';
|
||||
import * as globe from '../../celestialRing.js';
|
||||
import * as render from '../../renderGovernor.js';
|
||||
|
||||
/** Construct one layer using the application scene owners and a supplied source. */
|
||||
/**
|
||||
* Construct one layer using the application scene owners and a supplied
|
||||
* source; it draws with the engine's renderer from the registry
|
||||
* (render/display.js on every engine).
|
||||
*/
|
||||
export function createApplicationRadio({
|
||||
surface,
|
||||
source,
|
||||
rendererFactory = ({ engine, ...context }) =>
|
||||
engine?.kind === 'navara'
|
||||
? rendererFor('radio', engine, context)
|
||||
: createRadioCesiumRenderer(context),
|
||||
rendererFor('radio', engine, context),
|
||||
}) {
|
||||
const { groundFloor: ground } = surface;
|
||||
return createRadioLayer({
|
||||
|
||||
@@ -40,6 +40,9 @@ import { createLaunchesDisplay } from '../../layers/launches/render/display.js';
|
||||
import { createOsmPlacesDisplay } from '../../layers/osmPlaces/render/display.js';
|
||||
import { createAlprDisplay } from '../../layers/alpr/render/display.js';
|
||||
import { createBikeshareDisplay } from '../../layers/bikeshare/render/display.js';
|
||||
import { createRadioDisplay } from '../../layers/radio/render/display.js';
|
||||
import { createTransitDisplay } from '../../layers/transit/render/display.js';
|
||||
import { createCctvDisplay } from '../../layers/cctv/render/display.js';
|
||||
|
||||
const ENGINE_KINDS = new Set(['cesium', 'navara']);
|
||||
|
||||
@@ -109,6 +112,8 @@ export const CESIUM_LAYER_RENDERERS = Object.freeze({
|
||||
'osm-places': createOsmPlacesDisplay,
|
||||
'alpr-cameras': createAlprDisplay,
|
||||
bikeshare: createBikeshareDisplay,
|
||||
radio: createRadioDisplay,
|
||||
transit: createTransitDisplay,
|
||||
'local-firms': createFirmsCesiumRenderer,
|
||||
'rocket-launches': createLaunchesDisplay,
|
||||
satellites: createSatellitesDisplay,
|
||||
@@ -116,6 +121,7 @@ export const CESIUM_LAYER_RENDERERS = Object.freeze({
|
||||
military: createMilitaryDisplay,
|
||||
'local-adsb': createLocalAdsbDisplay,
|
||||
'ais-live-vessels': createVesselsDisplay,
|
||||
cctv: createCctvDisplay,
|
||||
});
|
||||
|
||||
// The other application layers still draw themselves on Cesium.
|
||||
|
||||
@@ -68,6 +68,8 @@ test('the layers with extracted renderers', () => {
|
||||
'osm-places',
|
||||
'alpr-cameras',
|
||||
'bikeshare',
|
||||
'radio',
|
||||
'transit',
|
||||
'local-firms',
|
||||
'rocket-launches',
|
||||
'satellites',
|
||||
@@ -75,6 +77,7 @@ test('the layers with extracted renderers', () => {
|
||||
'military',
|
||||
'local-adsb',
|
||||
'ais-live-vessels',
|
||||
'cctv',
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -89,6 +92,8 @@ test('the layers drawn through one display get the same factory on every engine'
|
||||
'osm-places': ['osmPlaces', 'createOsmPlacesDisplay'],
|
||||
'alpr-cameras': ['alpr', 'createAlprDisplay'],
|
||||
bikeshare: ['bikeshare', 'createBikeshareDisplay'],
|
||||
radio: ['radio', 'createRadioDisplay'],
|
||||
transit: ['transit', 'createTransitDisplay'],
|
||||
};
|
||||
// The Navara mode registers the same modules' factories.
|
||||
const navaraMode = readFileSync(
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
import { createTransitLayer } from '../../layers/transit/index.js';
|
||||
import { createTransitCesiumRenderer } from '../../layers/transit/render/cesium.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
import * as render from '../../renderGovernor.js';
|
||||
import * as sprites from '../../data/spriteOrder.js';
|
||||
import * as picking from '../../data/pickRegistry.js';
|
||||
import * as overlays from '../../overlays/worldOverlay.js';
|
||||
import {
|
||||
@@ -19,7 +17,8 @@ import {
|
||||
* from `surface.meshFloor`, so a mesh floor the application resolves for a
|
||||
* cell is the floor transit draws on, and a transit-only session warms its
|
||||
* own mesh floors. An earlier cut imported the legacy module-level singleton
|
||||
* instead and could not see either.
|
||||
* instead and could not see either. It draws with the engine's renderer from
|
||||
* the registry (render/display.js on every engine).
|
||||
*
|
||||
* @param {{surface: object}} options
|
||||
* @returns {object}
|
||||
@@ -28,9 +27,7 @@ export function createApplicationTransit({
|
||||
surface,
|
||||
source,
|
||||
rendererFactory = ({ engine, ...context }) =>
|
||||
engine?.kind === 'navara'
|
||||
? rendererFor('transit', engine, context)
|
||||
: createTransitCesiumRenderer({ ...context, engine }),
|
||||
rendererFor('transit', engine, context),
|
||||
}) {
|
||||
if (!surface?.groundFloor || !surface?.meshFloor)
|
||||
throw new TypeError('Transit needs the application surface services');
|
||||
@@ -40,7 +37,6 @@ export function createApplicationTransit({
|
||||
rendererFactory,
|
||||
services: {
|
||||
render,
|
||||
sprites,
|
||||
picking,
|
||||
overlays,
|
||||
credits: { registerDynamicCredit, transitFeedCredit },
|
||||
|
||||
+12
-15
@@ -103,29 +103,26 @@ export async function registerNavaraLayerRenderers() {
|
||||
...engine.extensions.navara,
|
||||
});
|
||||
},
|
||||
transit: async () => {
|
||||
const { createTransitNavaraRenderer } =
|
||||
await import('../layers/transit/render/navara.js');
|
||||
return (engine, options) =>
|
||||
createTransitNavaraRenderer(engine, {
|
||||
...options,
|
||||
...engine.extensions.navara,
|
||||
});
|
||||
},
|
||||
transit: async () =>
|
||||
(await import('../layers/transit/render/display.js'))
|
||||
.createTransitDisplay,
|
||||
// CCTV's display, with the Navara backend of its plane and volume.
|
||||
cctv: async () => {
|
||||
const { createCctvNavaraRenderer } =
|
||||
await import('../layers/cctv/render/navara.js');
|
||||
const [{ createCctvDisplay }, { createCctvNavaraMeshes }] =
|
||||
await Promise.all([
|
||||
import('../layers/cctv/render/display.js'),
|
||||
import('../layers/cctv/render/navaraMeshes.js'),
|
||||
]);
|
||||
return (engine, options) =>
|
||||
createCctvNavaraRenderer(engine, {
|
||||
createCctvDisplay(engine, {
|
||||
...options,
|
||||
...engine.extensions.navara,
|
||||
navaraMeshes: createCctvNavaraMeshes,
|
||||
});
|
||||
},
|
||||
'alpr-cameras': async () =>
|
||||
(await import('../layers/alpr/render/display.js')).createAlprDisplay,
|
||||
radio: async () =>
|
||||
(await import('../layers/radio/render/navara.js'))
|
||||
.createRadioNavaraRenderer,
|
||||
(await import('../layers/radio/render/display.js')).createRadioDisplay,
|
||||
bikeshare: async () =>
|
||||
(await import('../layers/bikeshare/render/display.js'))
|
||||
.createBikeshareDisplay,
|
||||
|
||||
Reference in new issue
Block a user