Scope render demand to each scene attachment

Give each scene its own render governor, owner holds and recent idle requests.
Make the Cesium render backend own its request mode directly, so the governor
drives engine.render on both engines without a dependency back from Cesium.
Route layer requests through their attached engine and capture the attachment's
governor for camera motions, orbit, annotations and shell controls. Release
retained-layer holds before clearing the outgoing engine, and destroy the
governor after scene consumers have detached.

Preserve Cesium's owner-keyed holds, pre-install buffering, last-release settling
frame and one-shot requests during continuous rendering. Navara keeps the same
render policy. There is no intended visible change on either engine. Simultaneous
scenes no longer share holds, and an old captured service cannot release a
replacement attachment's hold. Cover both rules on fake and headless Cesium
engines, including an old orbit ending after reattachment.

Viewer-reference lines fall from 910 to 891, Navara-kind checks from 2 to 1,
and engine-name lines from 33 to 32. All other coupling counts stay unchanged.

Checked in the browser, keyless: qa-perf passes on both engines with the
same idle, active and release counts as before (24 checks on Cesium, 22 on
Navara).
This commit is contained in:
German Khokhlov committed 2026-11-07 16:56:34 +04:00
1 parent 4252ed0798
commit 0459ee6d58
87 files changed
+720 -935

No files matched your search

+28 -24
View File
@@ -1136,7 +1136,7 @@ export function createBhoteKoshiEventLayer({
if (!_enabled || generation !== _comparisonSurfaceGeneration) return;
syncFloodSurfaceMode();
updateProgress(_progress);
renderHost.request('bhote-koshi-comparison-ready');
renderHost.request('bhote-koshi-comparison-ready', _engine);
}
function attachDataManager(dataManager) {
@@ -1421,7 +1421,8 @@ export function createBhoteKoshiEventLayer({
}
_sceneMediaPlaybackBeatId = null;
if (pauseMedia) _embeddedMedia?.pause?.();
if (hadPlayback) renderHost.request('bhote-koshi-scene-media-hold');
if (hadPlayback)
renderHost.request('bhote-koshi-scene-media-hold', _engine);
}
function completeSceneMediaPlayback() {
@@ -1439,7 +1440,7 @@ export function createBhoteKoshiEventLayer({
if (_sceneMediaPlaybackBeatId !== beatId) return;
_sceneMediaPlaybackTimer = null;
_sceneMediaPlaybackBeatId = null;
renderHost.request('bhote-koshi-scene-media-exit');
renderHost.request('bhote-koshi-scene-media-exit', _engine);
}, exitDurationSec * 1000) ?? null;
}
@@ -1762,7 +1763,8 @@ export function createBhoteKoshiEventLayer({
if (_sceneRevealAnimationFrame != null)
cancelAnimationFrame(_sceneRevealAnimationFrame);
_sceneRevealAnimationFrame = null;
if (_sceneRevealHoldActive) renderHost.release(SCENE_REVEAL_RENDER_HOLD);
if (_sceneRevealHoldActive)
renderHost.release(SCENE_REVEAL_RENDER_HOLD, _engine);
_sceneRevealHoldActive = false;
}
@@ -1773,7 +1775,8 @@ export function createBhoteKoshiEventLayer({
if (_scenePathDeadlineTimer != null)
globalThis.window?.clearTimeout?.(_scenePathDeadlineTimer);
_scenePathDeadlineTimer = null;
if (_scenePathHoldActive) renderHost.release(SCENE_PATH_RENDER_HOLD);
if (_scenePathHoldActive)
renderHost.release(SCENE_PATH_RENDER_HOLD, _engine);
_scenePathHoldActive = false;
}
@@ -1787,8 +1790,9 @@ export function createBhoteKoshiEventLayer({
_scenePathRevealProgress = targetProgress;
updateFloodTrace(_scenePathRevealProgress);
updateSurgeFront(_scenePathRevealProgress);
renderHost.request(requestReason);
if (_scenePathHoldActive) renderHost.release(SCENE_PATH_RENDER_HOLD);
renderHost.request(requestReason, _engine);
if (_scenePathHoldActive)
renderHost.release(SCENE_PATH_RENDER_HOLD, _engine);
_scenePathHoldActive = false;
}
@@ -1959,7 +1963,7 @@ export function createBhoteKoshiEventLayer({
lastTickAt = tickAt;
return activeElapsedMs;
};
renderHost.hold(SCENE_PATH_RENDER_HOLD);
renderHost.hold(SCENE_PATH_RENDER_HOLD, _engine);
_scenePathHoldActive = true;
// RAF normally paints every intermediate frame. This independent deadline
// is registered before Cesium starts the flight, so a throttled or briefly
@@ -2008,7 +2012,7 @@ export function createBhoteKoshiEventLayer({
startProgress + (targetProgress - startProgress) * eased;
updateFloodTrace(_scenePathRevealProgress);
updateSurgeFront(_scenePathRevealProgress);
renderHost.request('bhote-koshi-scene-path-travel');
renderHost.request('bhote-koshi-scene-path-travel', _engine);
if (linear < 1) {
_scenePathAnimationFrame = requestAnimationFrame(step);
} else {
@@ -2066,7 +2070,7 @@ export function createBhoteKoshiEventLayer({
if (sequenceWindow) updateProgress(sequenceWindow.startProgress);
let lastTickAt = performance.now();
let activeElapsedMs = 0;
renderHost.hold(SCENE_REVEAL_RENDER_HOLD);
renderHost.hold(SCENE_REVEAL_RENDER_HOLD, _engine);
_sceneRevealHoldActive = true;
const step = (now) => {
if (
@@ -2097,12 +2101,12 @@ export function createBhoteKoshiEventLayer({
updateFloodTrace(floodProgress);
updateSurgeFront(floodProgress);
}
renderHost.request('bhote-koshi-scene-beat-reveal');
renderHost.request('bhote-koshi-scene-beat-reveal', _engine);
if (linear < 1) {
_sceneRevealAnimationFrame = requestAnimationFrame(step);
} else {
_sceneRevealAnimationFrame = null;
renderHost.release(SCENE_REVEAL_RENDER_HOLD);
renderHost.release(SCENE_REVEAL_RENDER_HOLD, _engine);
_sceneRevealHoldActive = false;
}
};
@@ -2147,7 +2151,7 @@ export function createBhoteKoshiEventLayer({
),
})
) {
renderHost.request('bhote-koshi-evidence-video-frame');
renderHost.request('bhote-koshi-evidence-video-frame', _engine);
}
_evidenceVideoFrameHandle = video.requestVideoFrameCallback(drawFrame);
};
@@ -2176,7 +2180,7 @@ export function createBhoteKoshiEventLayer({
previousIndex >= 0 &&
redrawEvidenceSlot(previousIndex)
) {
renderHost.request('bhote-koshi-evidence-poster-restore');
renderHost.request('bhote-koshi-evidence-poster-restore', _engine);
}
}
@@ -2204,7 +2208,7 @@ export function createBhoteKoshiEventLayer({
)
return;
_evidenceVideoReady = true;
renderHost.request('bhote-koshi-evidence-video-ready');
renderHost.request('bhote-koshi-evidence-video-ready', _engine);
syncEvidenceMedia();
};
video.addEventListener?.('loadeddata', markReady, { once: true });
@@ -2215,7 +2219,7 @@ export function createBhoteKoshiEventLayer({
video !== _evidenceVideo
)
return;
renderHost.request('bhote-koshi-evidence-video-seek');
renderHost.request('bhote-koshi-evidence-video-seek', _engine);
});
video.src = eventAsset(videoPath);
video.load?.();
@@ -2363,7 +2367,7 @@ export function createBhoteKoshiEventLayer({
mediaProgress: presentation.localProgress,
})
) {
renderHost.request('bhote-koshi-evidence-video-frame');
renderHost.request('bhote-koshi-evidence-video-frame', _engine);
}
}
@@ -2509,7 +2513,7 @@ export function createBhoteKoshiEventLayer({
slot.poster = poster;
poster = null;
if (!redrawEvidenceSlot(index)) return;
renderHost.request('bhote-koshi-evidence-poster');
renderHost.request('bhote-koshi-evidence-poster', _engine);
} catch (error) {
closeFrame(poster);
if (
@@ -2785,7 +2789,7 @@ export function createBhoteKoshiEventLayer({
if (releaseCamera)
cameraForScene()?.lookAtTransform?.(Cesium.Matrix4.IDENTITY);
syncCinematicButton();
renderHost.request('bhote-koshi-cinematic-stop');
renderHost.request('bhote-koshi-cinematic-stop', _engine);
}
function startCinematic({ play = true } = {}) {
@@ -3446,7 +3450,7 @@ export function createBhoteKoshiEventLayer({
applyCinematicCamera();
syncEvidenceMedia();
syncPanel();
renderHost.request('bhote-koshi-progress');
renderHost.request('bhote-koshi-progress', _engine);
}
function setSplit(split) {
@@ -3454,7 +3458,7 @@ export function createBhoteKoshiEventLayer({
_splitControl?.setValue(_split);
_native?.setSplit(_split);
syncPanel();
renderHost.request('bhote-koshi-split');
renderHost.request('bhote-koshi-split', _engine);
}
function stopPlayback() {
@@ -3462,7 +3466,7 @@ export function createBhoteKoshiEventLayer({
_playing = false;
if (_animationFrame != null) cancelAnimationFrame(_animationFrame);
_animationFrame = null;
renderHost.release(FLOOD_RENDER_HOLD);
renderHost.release(FLOOD_RENDER_HOLD, _engine);
syncEvidenceMedia();
syncPanel();
}
@@ -3486,7 +3490,7 @@ export function createBhoteKoshiEventLayer({
_playing = true;
_playStartProgress = _progress;
_playStartedAt = performance.now();
renderHost.hold(FLOOD_RENDER_HOLD);
renderHost.hold(FLOOD_RENDER_HOLD, _engine);
syncEvidenceMedia();
syncPanel();
_animationFrame = requestAnimationFrame(animationTick);
@@ -3832,7 +3836,7 @@ export function createBhoteKoshiEventLayer({
try {
await comparisonLease?.release();
} finally {
renderHost.request('bhote-koshi-disable');
renderHost.request('bhote-koshi-disable', _engine);
}
return true;
}
+1 -4
View File
@@ -291,10 +291,7 @@ export function createBhoteKoshiLocatorLayer({
let _native = null;
let _pausedApproach = null;
const cameraForScene = () => _engine?.camera ?? _viewer?.camera;
const requestRender = (reason) =>
_engine?.kind === 'navara'
? _engine.render.request(reason)
: requestSceneRender(reason);
const requestRender = (reason) => requestSceneRender(reason, _engine);
let _dataSource = null;
let _enabled = false;
let _boundaryReady = false;
+4 -4
View File
@@ -400,7 +400,7 @@ function _scheduleCyberSonarRender(nowMs) {
_cyberSonarRenderTimer = globalThis.setTimeout(() => {
_cyberSonarRenderTimer = null;
if (isCyberSonarActive()) {
governorRequestRender('cyber-sonar-cadence');
governorRequestRender('cyber-sonar-cadence', _engine);
}
}, delay);
}
@@ -655,7 +655,7 @@ function _syncSurfaceVisibility() {
// owes itself follow-up frames only while a bounded animation is in flight
// (see `detectionRenderDemand.js` for why a hold was wrong here, and why
// removing it is safe).
governorRequestRender('detection-visibility');
governorRequestRender('detection-visibility', _engine);
if (!_hostSurface) return;
_hostSurface.style.display = _mode === MODE_OFF ? 'none' : 'block';
_hostSurface.style.opacity = _suspended ? '0' : '1';
@@ -750,7 +750,7 @@ function _shouldPaintDetectionLane(frame) {
if (_lastDiagnostics)
_lastDiagnostics.throttleSkipCount = _throttleSkipCount;
if (decision.requestFollowUp)
governorRequestRender('detection-paint-skipped');
governorRequestRender('detection-paint-skipped', _engine);
return false;
}
return true;
@@ -815,7 +815,7 @@ function _paintDetectionLane(frame) {
solvePending: result.solvePending === true,
})
) {
governorRequestRender('detection-animation');
governorRequestRender('detection-animation', _engine);
}
}
+5 -5
View File
@@ -275,9 +275,9 @@ test('detection holds nothing, and asks for its own frames instead', async () =>
assert.doesNotMatch(source, /releaseContinuousRender/,
'and with no hold there is nothing to release');
assert.match(source, /governorRequestRender\('detection-visibility'\)/,
assert.match(source, /governorRequestRender\('detection-visibility', _engine\)/,
'mode/suspend transitions request their own repaint');
assert.match(source, /if \(\s*detectionNeedsFollowUpFrame\(\{[\s\S]*?\}\)\s*\) \{\s*\n\s*governorRequestRender\('detection-animation'\);/,
assert.match(source, /if \(\s*detectionNeedsFollowUpFrame\(\{[\s\S]*?\}\)\s*\) \{\s*\n\s*governorRequestRender\('detection-animation', _engine\);/,
'the follow-up frame is gated on the policy, never unconditional');
// The demand call must read the FRAME's timestamp, not a fresh sample.
@@ -339,7 +339,7 @@ test('detection holds nothing, and asks for its own frames instead', async () =>
'the valve asks the shared policy instead of inlining its own threshold');
assert.doesNotMatch(shouldPaint, /_lastPaintMs > 22/,
'the old inline threshold must be gone, not shadowing the policy');
assert.match(shouldPaint, /if \(decision\.requestFollowUp\)\s*governorRequestRender\('detection-paint-skipped'\)/,
assert.match(shouldPaint, /if \(decision\.requestFollowUp\)\s*governorRequestRender\('detection-paint-skipped', _engine\)/,
'skipping a paint must hand the request forward, not swallow it');
// The scanline must not go back to the frame counter: that is what made a
@@ -478,13 +478,13 @@ test('aircraft brackets stay prompt because the aircraft layers hold the render
assert.ok(enable, `${file}: enable() is still identifiable`);
assert.match(
enable,
/holdContinuousRender\('(flights|military)'\)/,
/holdContinuousRender\(\s*'(flights|military)',\s*flightState\._renderer\?\.engine,?\s*\)/,
`${file}: enabling the layer must hold continuous render — detection no longer ` +
'holds one, so this is what keeps its AIR brackets repainting on a parked scene',
);
assert.match(
source,
/releaseContinuousRender\('(flights|military)'\)/,
/releaseContinuousRender\(\s*'(flights|military)',\s*flightState\._renderer\?\.engine,?\s*\)/,
`${file}: and the hold must be released, or the governor can never idle`,
);
}
+8 -10
View File
@@ -17,8 +17,7 @@ import {
import { DataLayerManager } from './manager.js';
import {
getRenderGovernorDiagnostics,
installRenderGovernor,
_resetRenderGovernorForTest,
renderGovernorFor,
} from '../renderGovernor.js';
import { loadLayerRenderers } from '../app/layers/renderers.js';
@@ -214,6 +213,7 @@ test('a quake poll still reaches the screen with the render loop idle', async ()
const originalFetch = globalThis.fetch;
const renderRequests = [];
const ground = createFakeGroundHarness();
ground.engine.render.request = () => renderRequests.push(Date.now());
const viewer = {
scene: { requestRenderMode: false, requestRender: () => renderRequests.push(Date.now()) },
};
@@ -231,8 +231,7 @@ test('a quake poll still reaches the screen with the render loop idle', async ()
}),
});
_resetRenderGovernorForTest();
installRenderGovernor(viewer);
renderGovernorFor(ground.engine).install();
// Installing the governor enters idle mode, which itself paints one settling
// frame. Drop that from the baseline or the enable assertion below can pass on
// the install alone, without the manager ever requesting anything.
@@ -244,9 +243,9 @@ test('a quake poll still reaches the screen with the render loop idle', async ()
await manager.setEnabled('earthquakes', true, { origin: 'test' });
// The whole point of the change: enabling quakes must not pin the loop on.
assert.equal(getRenderGovernorDiagnostics().mode, 'idle', 'quakes must not force continuous render');
assert.deepEqual(getRenderGovernorDiagnostics().holds, []);
assert.equal(viewer.scene.requestRenderMode, true, 'the governor really is in idle mode');
assert.equal(getRenderGovernorDiagnostics(ground.engine).mode, 'idle', 'quakes must not force continuous render');
assert.deepEqual(getRenderGovernorDiagnostics(ground.engine).holds, []);
assert.equal(ground.engine.render.isContinuous(), false, 'the governor really is in idle mode');
// ...and the poll that populated the discs must still have asked for a frame,
// because in idle mode nothing repaints on its own.
@@ -255,7 +254,7 @@ test('a quake poll still reaches the screen with the render loop idle', async ()
// Named, not merely counted: the frame has to come from the manager's
// visibility request, not from some incidental repaint.
assert.ok(
getRenderGovernorDiagnostics().recentRequests.some(({ reason }) => reason === 'layer-visibility'),
getRenderGovernorDiagnostics(ground.engine).recentRequests.some(({ reason }) => reason === 'layer-visibility'),
'the enable frame must be the manager\'s layer-visibility request',
);
@@ -267,7 +266,7 @@ test('a quake poll still reaches the screen with the render loop idle', async ()
renderRequests.length > beforeRefresh,
'each refresh tick must request its own render while the loop is idle',
);
const reasons = getRenderGovernorDiagnostics().recentRequests.map(({ reason }) => reason);
const reasons = getRenderGovernorDiagnostics(ground.engine).recentRequests.map(({ reason }) => reason);
assert.ok(
reasons.includes('layer-tick:earthquakes'),
`the tick request must be attributed to the layer, got ${JSON.stringify(reasons)}`,
@@ -275,7 +274,6 @@ test('a quake poll still reaches the screen with the render loop idle', async ()
} finally {
globalThis.fetch = originalFetch;
await manager.setEnabled('earthquakes', false, { origin: 'test' }).catch(() => {});
_resetRenderGovernorForTest();
ground.destroy();
}
});
+23 -13
View File
@@ -32,9 +32,8 @@ import aisLiveVesselsLayer, {
} from './aisLiveVessels.js';
import militaryInstallationsLayer from './militaryInstallations.js';
import {
_resetRenderGovernorForTest,
getRenderGovernorDiagnostics,
installRenderGovernor,
renderGovernorFor,
} from '../renderGovernor.js';
import {
AWARENESS_RADIUS_M,
@@ -54,7 +53,10 @@ import { registerLayerRenderers } from '../app/layers/renderers.js';
// the layer through the renderer registry, under an engine kind of its own.
const VIEWER_ENGINE = 'awareness-viewer-test';
registerLayerRenderers(VIEWER_ENGINE, {
'military-awareness': ({ viewer }) => ({
'military-awareness': (engine) => {
const { viewer } = engine;
return {
engine,
container: viewer.container,
canvas: viewer.canvas,
get camera() {
@@ -70,9 +72,21 @@ registerLayerRenderers(VIEWER_ENGINE, {
viewer.camera.flyToBoundingSphere({ center, radius }, { duration }),
createRim: () => ({ move() {}, setAlpha() {}, destroy() {} }),
createPulses: () => null,
}),
};
},
});
const viewerEngine = (viewer) => ({ kind: VIEWER_ENGINE, viewer });
const viewerEngines = new WeakMap();
const viewerEngine = (viewer) => {
if (!viewerEngines.has(viewer)) viewerEngines.set(viewer, {
kind: VIEWER_ENGINE, viewer,
render: {
request: () => viewer.scene.requestRender?.(),
setContinuous: (enabled) => { viewer.scene.requestRenderMode = !enabled; },
isContinuous: () => viewer.scene.requestRenderMode === false,
},
});
return viewerEngines.get(viewer);
};
const militaryAwarenessSource = readLayerSource(
new URL('./militaryAwareness.js', import.meta.url),
@@ -3922,13 +3936,12 @@ test('parked Contacts takes no continuous-render hold and requests at most the p
{ icao24: 'neighbour-flight', position: neighbour, distanceM: 4000 },
],
});
_resetRenderGovernorForTest();
const runtime = installAwarenessRuntime();
const holds = () => getRenderGovernorDiagnostics().holds;
const holds = () => getRenderGovernorDiagnostics(viewerEngine(runtime.viewer)).holds;
try {
Date.now = () => clockMs;
installRenderGovernor(runtime.viewer);
renderGovernorFor(viewerEngine(runtime.viewer)).install();
runtime.viewer.camera = {
positionWC: new Cesium.Cartesian3(1_000_000, 200_000, 300_000),
heading: 0,
@@ -4003,7 +4016,6 @@ test('parked Contacts takes no continuous-render hold and requests at most the p
Date.now = realNow;
runtime.restore();
restoreCollections();
_resetRenderGovernorForTest();
}
});
@@ -4058,13 +4070,12 @@ test('a moving view over failed feeds takes no continuous-render hold', () => {
// Every dependency reports unavailable, so every cohort summarizes to count
// null — the exact state the old Boolean(state.results) gate still held for.
const restoreCollections = stubAwarenessCollections({});
_resetRenderGovernorForTest();
const runtime = installAwarenessRuntime({ isEnabled: () => false });
const holds = () => getRenderGovernorDiagnostics().holds;
const holds = () => getRenderGovernorDiagnostics(viewerEngine(runtime.viewer)).holds;
try {
Date.now = () => clockMs;
installRenderGovernor(runtime.viewer);
renderGovernorFor(viewerEngine(runtime.viewer)).install();
runtime.viewer.camera = {
positionWC: new Cesium.Cartesian3(1_000_000, 200_000, 300_000),
heading: 0,
@@ -4096,7 +4107,6 @@ test('a moving view over failed feeds takes no continuous-render hold', () => {
Date.now = realNow;
runtime.restore();
restoreCollections();
_resetRenderGovernorForTest();
}
});
+4 -15
View File
@@ -19,9 +19,8 @@ import {
} from './groundFloor.js';
import { _resetFireAnchorsForTest } from './fireAnchors.js';
import {
_resetRenderGovernorForTest,
getRenderGovernorDiagnostics,
installRenderGovernor,
renderGovernorFor,
} from '../renderGovernor.js';
import * as Cesium from 'cesium';
import { getContextStore, registerEntityContext, selectEntityContext, getSelectedEntityContext, clearSelectedEntityContextForLayer } from './contextStore.js';
@@ -283,7 +282,6 @@ async function runInstallationLoad({
const originalFetch = globalThis.fetch;
const requests = [];
const contextEvents = [];
_resetRenderGovernorForTest();
globalThis.document = { addEventListener() {}, removeEventListener() {} };
globalThis.window = {
dispatchEvent(event) {
@@ -312,17 +310,8 @@ async function runInstallationLoad({
return { ok: true, status: 200, json: async () => payload };
};
const engine = engineOver(VIEWPORT);
// Enough of a viewer for the real render governor, so one-shot render
// requests are observable.
const viewer = {
scene: {
requestRenderMode: false,
maximumRenderTimeChange: 0,
requestRender() {},
},
};
militaryInstallationsLayer.init(null, { engine });
installRenderGovernor(viewer);
renderGovernorFor(engine).install();
militaryInstallationsLayer.enable();
await militaryInstallationsLayer.update();
@@ -338,11 +327,11 @@ async function runInstallationLoad({
engine.fake.input('click', { position: { x: 0, y: 0 } });
engine.fake.unscript('pick');
},
renderRequests: () => getRenderGovernorDiagnostics().recentRequests.map((item) => item.reason),
renderRequests: () => getRenderGovernorDiagnostics(engine).recentRequests.map((item) => item.reason),
restore() {
militaryInstallationsLayer.destroy();
renderGovernorFor(engine).destroy();
engine.destroy();
_resetRenderGovernorForTest();
globalThis.fetch = originalFetch;
if (originalDocument === undefined) delete globalThis.document;
else globalThis.document = originalDocument;
+4
View File
@@ -1,3 +1,4 @@
import { createRenderGovernor } from '../renderGovernor.js';
import { createPickRegistry } from './pickRegistry.js';
import { createSelectionDispatcher } from './selectionDispatcher.js';
@@ -8,17 +9,20 @@ const scenes = new WeakMap();
/** Create the services for one attachment, including reuse of a parked engine. */
export function createSceneServices(engine, options = {}) {
scenes.get(engine)?.destroy();
const render = createRenderGovernor(engine);
const picking = createPickRegistry();
const selection = createSelectionDispatcher(engine, { ...options, picking });
let destroyed = false;
const services = {
picking,
selection,
render,
destroy() {
if (destroyed) return;
destroyed = true;
selection.destroy();
picking.destroy();
render.destroy();
},
};
scenes.set(engine, services);