From b47aa5f3de4e859270e6270f27e9e8ce87f306fa Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Sat, 7 Nov 2026 15:43:22 -0800 Subject: [PATCH] Read the camera verbs' and voice actions' canvas from the renderer The camera verbs size their keyhole fit by the renderer's canvas and listen on it for the user's input, and the voice actions size their view samples by it, rather than reaching through `viewer.scene`; a viewer with no renderer bound answers with its own canvas, the same element. The test fakes give their viewers a canvas, and a fake camera binding's renderer reports the fake viewer's. --- src/agent/worldPacket.test.mjs | 3 +++ src/cameraVerbs.js | 14 +++++++++++--- src/data/aircraftEmergencyAnalyst.test.mjs | 1 + src/data/tr3bRegistry.test.mjs | 1 + src/routeCinematics.test.mjs | 1 + src/testSupport/fakeCameraPort.mjs | 8 +++++++- src/ui/cyberSonarControls.test.mjs | 3 +++ src/ui/cyberTheme.test.mjs | 1 + src/voice/cctvRouting.test.mjs | 1 + src/voice/geminiNativeRadio.test.mjs | 1 + src/voice/gevActions.js | 17 ++++++++++++----- src/voice/gevRealtime.test.mjs | 2 ++ src/voice/panel/host.test.mjs | 1 + src/voice/voiceWorkflowHarness.mjs | 1 + 14 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/agent/worldPacket.test.mjs b/src/agent/worldPacket.test.mjs index 063e3652c..5df5f8d64 100644 --- a/src/agent/worldPacket.test.mjs +++ b/src/agent/worldPacket.test.mjs @@ -18,6 +18,9 @@ function harness() { const viewer = { trackedEntity: undefined, clock: { onTick: { addEventListener: () => () => {} } }, + get canvas() { + return this.scene.canvas; + }, scene: { canvas: { clientWidth: 1200, diff --git a/src/cameraVerbs.js b/src/cameraVerbs.js index 8949e83ae..e2925a24e 100644 --- a/src/cameraVerbs.js +++ b/src/cameraVerbs.js @@ -52,7 +52,12 @@ import { vec, } from './geo/index.js'; import { heightsOf } from './queries/heights.js'; -import { cameraOf, findCamera, findFrame } from './render/rendererOf.js'; +import { + cameraOf, + findCamera, + findFrame, + rendererOf, +} from './render/rendererOf.js'; let _isCockpitActive = null; /** °/s by speed word — orbit; pan uses fractions of view height/s. */ @@ -1224,6 +1229,9 @@ function liveView(camera, pose = camera.pose()) { return { ...pose, projection, live: true }; } +/** The canvas the renderer draws in (the viewer's own when none is bound). */ +const canvasOf = (viewer) => rendererOf(viewer)?.canvas ?? viewer.canvas; + /** * Whether a projection is a perspective one centred on the view: what the * keyhole cone below assumes. Column-major, so element 11 is row 3 of @@ -1235,7 +1243,7 @@ const centredPerspective = (p) => /** Use the existing WGS84/CSS-pixel projection; null means unsupported, not close-up. */ function globeRotationFitsKeyhole(view) { - const canvas = _viewer.scene.canvas; + const canvas = canvasOf(_viewer); const width = canvas.clientWidth; const height = canvas.clientHeight; if ( @@ -1383,7 +1391,7 @@ export function initCameraVerbs( }); for (const rm of _inputRemovers) rm(); _inputRemovers = []; - const canvas = viewer.scene.canvas; + const canvas = canvasOf(viewer); // ANY manual camera input reclaims control — the cancelFlight reflex. for (const evt of ['pointerdown', 'touchstart', 'wheel']) { const h = () => interruptCameraMotion('manual-input'); diff --git a/src/data/aircraftEmergencyAnalyst.test.mjs b/src/data/aircraftEmergencyAnalyst.test.mjs index aa1257248..079dfc663 100644 --- a/src/data/aircraftEmergencyAnalyst.test.mjs +++ b/src/data/aircraftEmergencyAnalyst.test.mjs @@ -149,6 +149,7 @@ test('changed status without contact time retains general contact, including voi const runner = createGevActionRunner({ viewer: { clock: { onTick: { addEventListener: () => () => {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, camera: { moveEnd: { addEventListener() {} }, diff --git a/src/data/tr3bRegistry.test.mjs b/src/data/tr3bRegistry.test.mjs index 37c6aef45..51e19c3bd 100644 --- a/src/data/tr3bRegistry.test.mjs +++ b/src/data/tr3bRegistry.test.mjs @@ -441,6 +441,7 @@ test('cockpit class filter matches a converted contact end to end', async () => const runner = createGevActionRunner({ viewer: { clock: { onTick: { addEventListener: () => () => {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, camera: { moveEnd: { addEventListener() {} } }, }, diff --git a/src/routeCinematics.test.mjs b/src/routeCinematics.test.mjs index 9a1dfd316..c458d9e94 100644 --- a/src/routeCinematics.test.mjs +++ b/src/routeCinematics.test.mjs @@ -1111,6 +1111,7 @@ test('a route hidden from Draw is not flown; the newest visible one is', () => { test('a frame port bound after the verbs started runs the next motion', () => { // A viewer with no renderer yet, so no frame port to listen to. const viewer = { + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, }; try { diff --git a/src/testSupport/fakeCameraPort.mjs b/src/testSupport/fakeCameraPort.mjs index 6b5d6e93d..0ec70934c 100644 --- a/src/testSupport/fakeCameraPort.mjs +++ b/src/testSupport/fakeCameraPort.mjs @@ -75,7 +75,8 @@ export function fakeCameraPort({ pose = {}, viewRectangle = null } = {}) { * `moveEnd`. A fake with `trackedEntityChanged` and `entities` follows * through the port, as the renderer does. Its credits are the renderer's * credits port over the fake's `creditDisplay`, if it has one; `ports` - * adds other ports (a fake draw port, say). Binding a viewer twice keeps the + * adds other ports (a fake draw port, say). The renderer's `canvas` is the + * fake viewer's (`canvas`, else `scene.canvas`). Binding a viewer twice keeps the * first. Returns the viewer. * @template {{camera: object}} V * @param {V} viewer @@ -189,6 +190,11 @@ export function bindFakeCesiumCamera(viewer, ports = {}) { }, }); bindRenderer(viewer, { + // The renderer's canvas is the fake's, as the Cesium renderer's is the + // viewer's: read when asked, so a fake that swaps its canvas is seen. + get canvas() { + return viewer.canvas ?? viewer.scene?.canvas; + }, ...ports, camera: port, credits: fakeCesiumCredits(viewer), diff --git a/src/ui/cyberSonarControls.test.mjs b/src/ui/cyberSonarControls.test.mjs index e389084b1..1c69bd4a4 100644 --- a/src/ui/cyberSonarControls.test.mjs +++ b/src/ui/cyberSonarControls.test.mjs @@ -57,6 +57,9 @@ test('real runner and facade use visual settings, preserve visibility and return camera: { moveEnd: { addEventListener() {} } }, clock: { onTick: { addEventListener: () => () => {} } }, scene: { canvas: new EventTarget() }, + get canvas() { + return this.scene.canvas; + }, }; try { const runner = createGevActionRunner({ styleManager: owner, viewer, dataManager: {} }); diff --git a/src/ui/cyberTheme.test.mjs b/src/ui/cyberTheme.test.mjs index d001a77c4..01e06c585 100644 --- a/src/ui/cyberTheme.test.mjs +++ b/src/ui/cyberTheme.test.mjs @@ -254,6 +254,7 @@ test('Display and voice HUD routes preserve explicit Cyber entry and exit author const viewer = { camera: { moveEnd: { addEventListener() {} } }, clock: { onTick: { addEventListener: () => () => {} } }, + canvas: eventSource, scene: { canvas: eventSource }, }; const runVoiceAction = createGevActionRunner({ diff --git a/src/voice/cctvRouting.test.mjs b/src/voice/cctvRouting.test.mjs index 0df5dd12c..8f44eaf59 100644 --- a/src/voice/cctvRouting.test.mjs +++ b/src/voice/cctvRouting.test.mjs @@ -16,6 +16,7 @@ after(() => { function viewerFixture() { return { clock: { onTick: { addEventListener: () => () => {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, camera: { moveEnd: { addEventListener() {} } }, }; diff --git a/src/voice/geminiNativeRadio.test.mjs b/src/voice/geminiNativeRadio.test.mjs index 38ba8ff79..d9ab9d8b0 100644 --- a/src/voice/geminiNativeRadio.test.mjs +++ b/src/voice/geminiNativeRadio.test.mjs @@ -14,6 +14,7 @@ import { DataLayerManager } from '../data/manager.js'; const viewerFixture = () => ({ clock: { onTick: { addEventListener: () => () => {} } }, camera: { moveEnd: { addEventListener() {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, }); const request = (ws, id, name, args = {}) => diff --git a/src/voice/gevActions.js b/src/voice/gevActions.js index ece8c0ad6..1fd260b45 100644 --- a/src/voice/gevActions.js +++ b/src/voice/gevActions.js @@ -21,7 +21,12 @@ import { toRadians, } from '../geo/index.js'; import { sphereFromPoints } from '../geo/sphere.js'; -import { cameraOf, findCamera, findQuery } from '../render/rendererOf.js'; +import { + cameraOf, + findCamera, + findQuery, + rendererOf, +} from '../render/rendererOf.js'; import { CITY_POIS } from '../cityPois.js'; import { greatCircleKm } from '../geoDistance.js'; import { @@ -3965,13 +3970,16 @@ function selectedEntityContext(dataManager) { return summarizeContextRecord(record, { includeProperties: true }); } +/** The canvas the renderer draws in (the viewer's own when none is bound). */ +const canvasOf = (viewer) => rendererOf(viewer)?.canvas ?? viewer.canvas; + function visibleEntityContexts( viewer, dataManager, { layerId = null, limit = 5, target = null } = {}, ) { const nearbyRecords = []; - const canvas = viewer.scene.canvas; + const canvas = canvasOf(viewer); const width = canvas.clientWidth || canvas.width || 0; const height = canvas.clientHeight || canvas.height || 0; const centerX = width / 2; @@ -4322,7 +4330,7 @@ function cameraViewSignature(camera) { function getViewTargetCartesian(viewer) { const query = findQuery(viewer); if (!query) return null; - const canvas = viewer.scene.canvas; + const canvas = canvasOf(viewer); const width = canvas.clientWidth || canvas.width || 0; const height = canvas.clientHeight || canvas.height || 0; const x = width / 2; @@ -4356,8 +4364,7 @@ function getViewTargetCartesian(viewer) { } function sampleViewportCartographics(viewer) { - const scene = viewer.scene; - const canvas = scene.canvas; + const canvas = canvasOf(viewer); const width = canvas.clientWidth || canvas.width || 0; const height = canvas.clientHeight || canvas.height || 0; if (!width || !height) return []; diff --git a/src/voice/gevRealtime.test.mjs b/src/voice/gevRealtime.test.mjs index 261b276f3..de9e837e1 100644 --- a/src/voice/gevRealtime.test.mjs +++ b/src/voice/gevRealtime.test.mjs @@ -1306,6 +1306,7 @@ test('generic same-response Radio visibility disable supersedes delayed Select', }); const viewer = { clock: { onTick: { addEventListener: () => () => {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, camera: { moveEnd: { addEventListener() {} } }, }; @@ -1558,6 +1559,7 @@ test('Pause and Stop preserve independent dedicated and generic Radio ON across }); const viewer = { clock: { onTick: { addEventListener: () => () => {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, camera: { moveEnd: { addEventListener() {} } }, }; diff --git a/src/voice/panel/host.test.mjs b/src/voice/panel/host.test.mjs index dd3b25038..2eda45928 100644 --- a/src/voice/panel/host.test.mjs +++ b/src/voice/panel/host.test.mjs @@ -497,6 +497,7 @@ async function directActions( const runner = createGevActionRunner({ viewer: { clock: { onTick: { addEventListener: () => () => {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, camera: { moveEnd: { addEventListener() {} } }, }, diff --git a/src/voice/voiceWorkflowHarness.mjs b/src/voice/voiceWorkflowHarness.mjs index f89f98411..ca39c0bff 100644 --- a/src/voice/voiceWorkflowHarness.mjs +++ b/src/voice/voiceWorkflowHarness.mjs @@ -54,6 +54,7 @@ export function harness({ const enabled = new Set(on); const viewer = { clock: { onTick: { addEventListener: () => () => {} } }, + canvas: { addEventListener() {}, removeEventListener() {} }, scene: { canvas: { addEventListener() {}, removeEventListener() {} } }, camera: { moveEnd: { addEventListener() {} },