mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 00:32:21 +00:00
Mark a resumed or share-restored follow only while it starts so a later follow of the same subject is navigation again
The aircraft scene binding re-tracked with origin share-restore, which stayed on the entity: a later trackedEntityChanged for it (cockpit exit, refocus) never stamped navigation, and the aircraft lost its selection origin. Flights, military and satellites now set a transient gevRestoring mark around follow.start, and the aircraft binding resumes with the origin the aircraft was selected by.
This commit is contained in:
1 parent
cbe1d841ea
commit
90d64e6916
7 files changed
+176
-41
No files matched your search
@@ -3,61 +3,165 @@ import test from 'node:test';
|
||||
import { createAircraftSceneBinding } from './sceneBinding.js';
|
||||
import { LayerBindings } from '../../ui/layerBindings.js';
|
||||
import { createEngineEvent } from '../../globe/contract.js';
|
||||
import { readLayerSource } from '../../testSupport/readLayerSource.mjs';
|
||||
|
||||
test('resuming an aircraft on Cesium preserves the pending share navigation', (t) => {
|
||||
function observedShell(t) {
|
||||
const previous = globalThis.window;
|
||||
globalThis.window = new EventTarget();
|
||||
t.after(() => {
|
||||
globalThis.window = previous;
|
||||
});
|
||||
const trackedEntityChanged = createEngineEvent();
|
||||
let generation = 1;
|
||||
const shell = new LayerBindings({
|
||||
const shell = {
|
||||
generation: 1,
|
||||
trackedEntityChanged,
|
||||
};
|
||||
const bindings = new LayerBindings({
|
||||
viewer: { trackedEntityChanged },
|
||||
services: {},
|
||||
operations: {
|
||||
_stampNavigation() {
|
||||
generation++;
|
||||
shell.generation++;
|
||||
},
|
||||
},
|
||||
});
|
||||
shell.observeCamera();
|
||||
t.after(() => shell.stop());
|
||||
bindings.observeCamera();
|
||||
t.after(() => bindings.stop());
|
||||
return shell;
|
||||
}
|
||||
|
||||
// What the tracking modules do around follow.start on a resume or a share
|
||||
// restore (flights, military and satellites tracking.js).
|
||||
function follow(trackedEntityChanged, entity, restoring) {
|
||||
if (restoring) entity.gevRestoring = true;
|
||||
try {
|
||||
trackedEntityChanged.raiseEvent(entity);
|
||||
} finally {
|
||||
if (restoring) delete entity.gevRestoring;
|
||||
}
|
||||
}
|
||||
|
||||
function binding(flightState, tracked) {
|
||||
const renderer = {
|
||||
fleet: { attach() {}, setVisible() {}, restoreOrder() {} },
|
||||
models: { setVisible() {} },
|
||||
fleet: {
|
||||
attach() {},
|
||||
detach() {},
|
||||
setVisible() {},
|
||||
restoreOrder() {},
|
||||
},
|
||||
models: { setVisible() {}, destroy() {} },
|
||||
follow: {
|
||||
isFollowing: () => true,
|
||||
release() {},
|
||||
},
|
||||
tracked: { remove() {} },
|
||||
destroy() {},
|
||||
};
|
||||
let restored;
|
||||
const binding = createAircraftSceneBinding({
|
||||
return createAircraftSceneBinding({
|
||||
id: 'flights',
|
||||
flightState: {
|
||||
initialized: true,
|
||||
_trackedIcao: 'a00000',
|
||||
_preloadModel: {},
|
||||
flightState,
|
||||
services: {
|
||||
renderer: { create: () => renderer },
|
||||
render: { releaseContinuousRender() {} },
|
||||
picking: { unregisterPickOwner() {} },
|
||||
},
|
||||
services: { renderer: { create: () => renderer } },
|
||||
parts: {
|
||||
snapshots: { presentRecords() {} },
|
||||
tracking: {
|
||||
_trackFlight(id, options) {
|
||||
restored = { id, ...options };
|
||||
trackedEntityChanged.raiseEvent({
|
||||
gevSelectionOrigin: options.origin,
|
||||
});
|
||||
},
|
||||
_trackFlight: tracked,
|
||||
_removeClickHandler() {},
|
||||
_detachTrail() {},
|
||||
},
|
||||
rendering: { _releaseTrackedModel() {}, _releaseModels() {} },
|
||||
motion: { _resetTrackedDisplay() {} },
|
||||
},
|
||||
});
|
||||
binding.attachRenderer({});
|
||||
}
|
||||
|
||||
test('resuming an aircraft on Cesium preserves the pending share navigation', (t) => {
|
||||
const shell = observedShell(t);
|
||||
let restored;
|
||||
binding(
|
||||
{ initialized: true, _trackedIcao: 'a00000', _preloadModel: {} },
|
||||
(id, options) => {
|
||||
restored = { id, ...options };
|
||||
follow(
|
||||
shell.trackedEntityChanged,
|
||||
{ gevSelectionOrigin: options.origin },
|
||||
options.resume,
|
||||
);
|
||||
},
|
||||
).attachRenderer({});
|
||||
assert.equal(restored.id, 'a00000');
|
||||
assert.equal(restored.resume, true);
|
||||
assert.equal(
|
||||
generation,
|
||||
shell.generation,
|
||||
1,
|
||||
'restored tracking cannot supersede and clear itself',
|
||||
);
|
||||
for (const origin of ['user', 'voice', 'programmatic']) {
|
||||
trackedEntityChanged.raiseEvent({ gevSelectionOrigin: origin });
|
||||
follow(shell.trackedEntityChanged, { gevSelectionOrigin: origin }, false);
|
||||
}
|
||||
assert.equal(
|
||||
shell.generation,
|
||||
4,
|
||||
'new tracking still takes navigation authority',
|
||||
);
|
||||
});
|
||||
|
||||
test('a restored aircraft followed again later is new navigation', (t) => {
|
||||
const shell = observedShell(t);
|
||||
const entity = { gevSelectionOrigin: 'share-restore' };
|
||||
follow(shell.trackedEntityChanged, entity, true);
|
||||
assert.equal(shell.generation, 1);
|
||||
assert.equal('gevRestoring' in entity, false, 'the mark does not stick');
|
||||
// Cockpit exit or a refocus hands the same aircraft back to the camera.
|
||||
shell.trackedEntityChanged.raiseEvent(undefined);
|
||||
shell.trackedEntityChanged.raiseEvent(entity);
|
||||
assert.equal(shell.generation, 2);
|
||||
});
|
||||
|
||||
test('an engine switch resumes the aircraft with the origin it was selected by', () => {
|
||||
const calls = [];
|
||||
const flightState = {
|
||||
initialized: true,
|
||||
_trackedIcao: 'a00000',
|
||||
_preloadModel: null,
|
||||
_modelEpoch: 0,
|
||||
_modelPending: new Map(),
|
||||
_modelGen: new Map(),
|
||||
_billboards: new Map(),
|
||||
_cullPositions: new Map(),
|
||||
_detectionObjects: new Set(),
|
||||
_groundSnap: new Map(),
|
||||
};
|
||||
const scene = binding(flightState, (id, options) => calls.push(options));
|
||||
flightState._preloadModel = {};
|
||||
scene.attachRenderer({});
|
||||
assert.equal(calls[0].origin, 'programmatic');
|
||||
flightState._trackedEntity = { gevSelectionOrigin: 'voice' };
|
||||
scene.detachRenderer({});
|
||||
flightState._preloadModel = {};
|
||||
scene.attachRenderer({});
|
||||
assert.equal(calls[1].origin, 'voice');
|
||||
assert.equal(calls[1].resume, true);
|
||||
assert.equal(calls[1].follow, true);
|
||||
});
|
||||
|
||||
test('every follow of a resumed or share-restored subject is marked while it starts', () => {
|
||||
for (const [file, resume] of [
|
||||
['flights/tracking.js', 'resume'],
|
||||
['military/tracking.js', 'resume'],
|
||||
['satellites/tracking.js', 'resuming'],
|
||||
]) {
|
||||
const source = readLayerSource(new URL(`../${file}`, import.meta.url));
|
||||
assert.match(
|
||||
source,
|
||||
new RegExp(
|
||||
`const restoring = ${resume} \\|\\| origin === 'share-restore';\\s*if \\(restoring\\) entity\\.gevRestoring = true;\\s*try \\{[\\s\\S]*?follow\\.start\\(entity\\);?\\s*\\} finally \\{\\s*if \\(restoring\\) delete entity\\.gevRestoring;`,
|
||||
),
|
||||
file,
|
||||
);
|
||||
assert.equal(source.match(/follow\.start\(/g).length, 1, file);
|
||||
}
|
||||
assert.equal(generation, 4, 'new tracking still takes navigation authority');
|
||||
});
|
||||
Reference in new issue
Block a user