From 30b6be1da079b53c59ca758223c566da03bafd8d Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Sat, 7 Nov 2026 01:03:50 -0800 Subject: [PATCH] Drive the camera orbit and the FPS readout through the frame port The orbit controller and the frame-rate monitor had left the Cesium allow-list but still hooked the scene's preRender and postRender events. They now listen through the frame port; the monitor looks the port up each time it is shown, so a renderer bound after it was created is the one it counts. --- src/orbit.js | 6 +++--- src/ui/frameRateMonitor.js | 9 ++++++--- src/ui/frameRateMonitor.test.mjs | 4 ++++ src/ui/frameRateView.test.mjs | 8 +++++++- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/orbit.js b/src/orbit.js index 6478712d0..c3e3f7b0c 100644 --- a/src/orbit.js +++ b/src/orbit.js @@ -1,5 +1,5 @@ import { toRadians } from './geo/index.js'; -import { cameraOf, findCamera } from './render/rendererOf.js'; +import { cameraOf, findCamera, frameOf } from './render/rendererOf.js'; import { holdContinuousRender, releaseContinuousRender, @@ -7,7 +7,7 @@ import { /** * OrbitController — smooth orbit around a target point. - * Uses scene.preRender for frame-rate-independent 60fps updates. + * Uses the frame port's preRender for frame-rate-independent 60fps updates. * Toggle with O key; auto-stops on POI/city change. */ export class OrbitController { @@ -50,7 +50,7 @@ export class OrbitController { this.angle = pose.heading; let lastTime = Date.now(); - this._removeListener = this.viewer.scene.preRender.addEventListener(() => { + this._removeListener = frameOf(this.viewer).on('preRender', () => { if (!this.active) return; const now = Date.now(); diff --git a/src/ui/frameRateMonitor.js b/src/ui/frameRateMonitor.js index 233041b08..3d6f315eb 100644 --- a/src/ui/frameRateMonitor.js +++ b/src/ui/frameRateMonitor.js @@ -1,5 +1,6 @@ import { useStatusStore } from './stores/status.js'; import { applicationPinia } from './vueRuntime.js'; +import { findFrame } from '../render/rendererOf.js'; /** * Count rendered globe frames while the optional readout is visible. The @@ -10,9 +11,9 @@ export function createFrameRateMonitor({ documentRef = document, store = useStatusStore(applicationPinia()), }) { - const frameEvent = viewer?.scene?.postRender; + const frameOfViewer = () => findFrame(viewer); // A page without the scene chrome has no title bar to show it in. - if (!documentRef.getElementById('title-bar') || !frameEvent) + if (!documentRef.getElementById('title-bar') || !frameOfViewer()) return { destroy() {} }; // i18n-ignore: FPS is a unit code, the same in every language @@ -43,7 +44,9 @@ export function createFrameRateMonitor({ startedAt = performance.now(); // i18n-ignore: FPS is a unit code, the same in every language present({ visible: true, text: 'FPS —' }); - removeFrameListener = frameEvent.addEventListener(() => { + // Looked up when shown, so a renderer bound since creation is the one + // counted. + removeFrameListener = frameOfViewer()?.on('postRender', () => { frames++; }); timer = setInterval(() => { diff --git a/src/ui/frameRateMonitor.test.mjs b/src/ui/frameRateMonitor.test.mjs index fcf482ce6..e1cc7047c 100644 --- a/src/ui/frameRateMonitor.test.mjs +++ b/src/ui/frameRateMonitor.test.mjs @@ -1,6 +1,8 @@ import test from 'node:test'; import assert from 'node:assert/strict'; import { createFrameRateMonitor } from './frameRateMonitor.js'; +import { bindRenderer } from '../render/rendererOf.js'; +import { fakeSceneFrame } from '../testSupport/fakeCesiumScene.mjs'; function fixture(t) { const keys = new Set(); @@ -27,6 +29,7 @@ function fixture(t) { }, }, }; + bindRenderer(viewer, { frame: fakeSceneFrame(viewer) }); const monitor = createFrameRateMonitor({ viewer, documentRef, store }); t.after(() => monitor.destroy()); return { @@ -133,6 +136,7 @@ test("destroying an earlier monitor leaves a newer one's readout", () => { const viewer = { scene: { postRender: { addEventListener: () => () => {} } }, }; + bindRenderer(viewer, { frame: fakeSceneFrame(viewer) }); const first = createFrameRateMonitor({ viewer, documentRef, store }); const second = createFrameRateMonitor({ viewer, documentRef, store }); const shown = store.fps; diff --git a/src/ui/frameRateView.test.mjs b/src/ui/frameRateView.test.mjs index 7b25f7cb9..fa13e064a 100644 --- a/src/ui/frameRateView.test.mjs +++ b/src/ui/frameRateView.test.mjs @@ -8,6 +8,8 @@ import { createPinia } from 'pinia'; import { useStatusStore } from './stores/status.js'; import { createFrameRateMonitor } from './frameRateMonitor.js'; import SceneChromeView from './views/SceneChromeView.vue'; +import { bindRenderer } from '../render/rendererOf.js'; +import { fakeSceneFrame } from '../testSupport/fakeCesiumScene.mjs'; test('the FPS readout sits in the title bar, hidden until the backquote key', async (t) => { document.body.replaceChildren(); @@ -18,8 +20,12 @@ test('the FPS readout sits in the title bar, hidden until the backquote key', as const readout = () => document.querySelector('#title-bar .frame-rate-readout'); assert.equal(readout(), null, 'no readout without a monitor'); + const viewer = { + scene: { postRender: { addEventListener: () => () => {} } }, + }; + bindRenderer(viewer, { frame: fakeSceneFrame(viewer) }); const monitor = createFrameRateMonitor({ - viewer: { scene: { postRender: { addEventListener: () => () => {} } } }, + viewer, store: useStatusStore(pinia), }); t.after(() => monitor.destroy());