mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Follow through the camera port in the remaining tests
- The tests that faked a follow by setting the viewer's tracked entity, or by raising its change event, follow through the camera port (followEntity, or a port with follow and followChanged), and check followedOf: camera handoffs, globe rotation, tilt, ground guard, vessels, ALPR, CCTV, Contacts, radio, orientation, share links and follow offsets, the tracked readout and the shell's camera listeners. - The fake Cesium camera port delivers followChanged from the port itself. - A ride handed to another aircraft is adopted by the follow's change, as the application does, not by the test calling the adoption. - The unbound-factory record lists the scene, the map defaults, share restoration and the World Packet as entries whose caller loads the factories; the map startup test stubs the default renderer load.
This commit is contained in:
1 parent
9a13aeab48
commit
1fbe546531
21 files changed
+476
-148
No files matched your search
@@ -1,4 +1,10 @@
|
||||
import { bindFakeCesiumCamera } from './testSupport/fakeCameraPort.mjs';
|
||||
import {
|
||||
bindFakeCesiumCamera,
|
||||
followEntity,
|
||||
followedEntity,
|
||||
} from './testSupport/fakeCameraPort.mjs';
|
||||
import { rendererOf } from './render/rendererOf.js';
|
||||
import { followedOf } from './data/followed.js';
|
||||
import {
|
||||
fakeSceneFrame,
|
||||
fakeSceneQuery,
|
||||
@@ -175,13 +181,34 @@ function harness(
|
||||
const double = {
|
||||
camera,
|
||||
scene,
|
||||
trackedEntity: undefined,
|
||||
// Cesium's entity tracking, without entities of its own: the camera
|
||||
// port follows on a tracking widget of the fake's.
|
||||
trackedEntityChanged: new Cesium.Event(),
|
||||
entities: {},
|
||||
};
|
||||
const viewer = bindFakeCesiumCamera(double, {
|
||||
query: fakeSceneQuery(double),
|
||||
frame: fakeSceneFrame(double),
|
||||
});
|
||||
// Count who listens for the port's follow changes.
|
||||
const renderer = rendererOf(viewer);
|
||||
const port = renderer.camera;
|
||||
let followListeners = 0;
|
||||
renderer.camera = Object.create(port, {
|
||||
on: {
|
||||
value(event, cb, options) {
|
||||
const off = port.on(event, cb, options);
|
||||
if (event !== 'followChanged') return off;
|
||||
followListeners += 1;
|
||||
let live = true;
|
||||
return () => {
|
||||
if (live) followListeners -= 1;
|
||||
live = false;
|
||||
off();
|
||||
};
|
||||
},
|
||||
},
|
||||
});
|
||||
const target = Cesium.Cartesian3.fromDegrees(
|
||||
longitudeDeg,
|
||||
latitude,
|
||||
@@ -201,7 +228,15 @@ function harness(
|
||||
for (let i = 0; i < 20 && getActiveCameraMotion(); i += 1) tick();
|
||||
assert.equal(getActiveCameraMotion(), null, 'once motion must finish');
|
||||
};
|
||||
return { viewer, camera, canvas, target, tick, finishOnce };
|
||||
return {
|
||||
viewer,
|
||||
camera,
|
||||
canvas,
|
||||
target,
|
||||
tick,
|
||||
finishOnce,
|
||||
followListeners: () => followListeners,
|
||||
};
|
||||
}
|
||||
|
||||
test('globe rotation yields to tracking acquired and cleared before the next tick', (t) => {
|
||||
@@ -212,15 +247,13 @@ test('globe rotation yields to tracking acquired and cleared before the next tic
|
||||
);
|
||||
const before = pose(camera);
|
||||
const entity = { id: 'cockpit-aircraft', position: {} };
|
||||
viewer.trackedEntity = entity;
|
||||
viewer.trackedEntityChanged.raiseEvent(entity);
|
||||
followEntity(viewer, entity);
|
||||
assert.equal(
|
||||
getActiveCameraMotion(),
|
||||
null,
|
||||
'tracking acquisition must synchronously yield',
|
||||
);
|
||||
viewer.trackedEntity = undefined;
|
||||
viewer.trackedEntityChanged.raiseEvent(undefined);
|
||||
followEntity(viewer, null);
|
||||
tick();
|
||||
samePose(camera, before);
|
||||
assert.equal(hasRenderHold(), false);
|
||||
@@ -233,36 +266,34 @@ test('tracking event keeps legacy yaw and an untracked globe rotation active', (
|
||||
true,
|
||||
);
|
||||
const yawId = activeCameraMotionId();
|
||||
viewer.trackedEntityChanged.raiseEvent({ id: 'aircraft' });
|
||||
followEntity(viewer, { id: 'aircraft' });
|
||||
assert.equal(activeCameraMotionId(), yawId);
|
||||
followEntity(viewer, null);
|
||||
assert.equal(
|
||||
moveCamera({ motion: 'rotate_globe', mode: 'continuous' }).ok,
|
||||
true,
|
||||
);
|
||||
const globeId = activeCameraMotionId();
|
||||
viewer.trackedEntityChanged.raiseEvent(undefined);
|
||||
followEntity(viewer, null);
|
||||
assert.equal(activeCameraMotionId(), globeId);
|
||||
});
|
||||
|
||||
test('replaced viewer releases the old tracking listener without duplicate subscriptions', (t) => {
|
||||
const first = harness(t);
|
||||
assert.equal(first.viewer.trackedEntityChanged.numberOfListeners, 1);
|
||||
assert.equal(first.followListeners(), 1);
|
||||
initCameraVerbs(first.viewer);
|
||||
assert.equal(first.viewer.trackedEntityChanged.numberOfListeners, 1);
|
||||
assert.equal(first.followListeners(), 1);
|
||||
const next = harness(t);
|
||||
assert.equal(first.viewer.trackedEntityChanged.numberOfListeners, 0);
|
||||
assert.equal(next.viewer.trackedEntityChanged.numberOfListeners, 1);
|
||||
assert.equal(first.followListeners(), 0);
|
||||
assert.equal(next.followListeners(), 1);
|
||||
assert.equal(
|
||||
moveCamera({ motion: 'rotate_globe', mode: 'continuous' }).ok,
|
||||
true,
|
||||
);
|
||||
const id = activeCameraMotionId();
|
||||
// As Cesium's setter does: the value changes, then the event fires.
|
||||
first.viewer.trackedEntity = { id: 'stale-aircraft' };
|
||||
first.viewer.trackedEntityChanged.raiseEvent(first.viewer.trackedEntity);
|
||||
followEntity(first.viewer, { id: 'stale-aircraft' });
|
||||
assert.equal(activeCameraMotionId(), id);
|
||||
next.viewer.trackedEntity = { id: 'new-aircraft' };
|
||||
next.viewer.trackedEntityChanged.raiseEvent(next.viewer.trackedEntity);
|
||||
followEntity(next.viewer, { id: 'new-aircraft' });
|
||||
assert.equal(getActiveCameraMotion(), null);
|
||||
assert.equal(hasRenderHold(), false);
|
||||
});
|
||||
@@ -545,7 +576,7 @@ for (const mode of ['once', 'continuous']) {
|
||||
tick();
|
||||
assert.equal(hasRenderHold(), true);
|
||||
const tracked = { id: 'new-tracked-aircraft' };
|
||||
if (acquisition === 'tracking') viewer.trackedEntity = tracked;
|
||||
if (acquisition === 'tracking') followEntity(viewer, tracked);
|
||||
else
|
||||
camera.lookAt(
|
||||
target,
|
||||
@@ -556,10 +587,9 @@ for (const mode of ['once', 'continuous']) {
|
||||
tick();
|
||||
assert.equal(getActiveCameraMotion(), null);
|
||||
assert.equal(hasRenderHold(), false);
|
||||
assert.equal(
|
||||
viewer.trackedEntity,
|
||||
acquisition === 'tracking' ? tracked : undefined,
|
||||
);
|
||||
if (acquisition === 'tracking')
|
||||
assert.equal(followedEntity(viewer), tracked);
|
||||
else assert.equal(followedOf(viewer), null);
|
||||
assert.equal(Cesium.Matrix4.equals(camera.transform, transform), true);
|
||||
samePose(camera, before);
|
||||
tick();
|
||||
@@ -570,7 +600,7 @@ for (const mode of ['once', 'continuous']) {
|
||||
|
||||
test('direct globe rotation refuses a tracked camera without disturbing its reference frame', (t) => {
|
||||
const { viewer, camera, target } = harness(t);
|
||||
viewer.trackedEntity = { id: 'tracked-aircraft', name: 'tracked-aircraft' };
|
||||
followEntity(viewer, { id: 'tracked-aircraft', name: 'tracked-aircraft' });
|
||||
camera.lookAt(target, new Cesium.HeadingPitchRange(0, radians(-40), 1_000));
|
||||
const before = pose(camera);
|
||||
const transform = Cesium.Matrix4.clone(camera.transform);
|
||||
@@ -641,18 +671,19 @@ test('close-up refusal preserves an inherited target frame', (t) => {
|
||||
});
|
||||
test('navigation callback never releases tracking for globe rotation', (t) => {
|
||||
const { viewer, camera } = harness(t);
|
||||
const tracked = (viewer.trackedEntity = { id: 'tracked-aircraft' });
|
||||
const tracked = { id: 'tracked-aircraft' };
|
||||
followEntity(viewer, tracked);
|
||||
const before = pose(camera);
|
||||
let calls = 0;
|
||||
assert.equal(
|
||||
moveCamera({ motion: 'rotate_globe' }, () => {
|
||||
calls++;
|
||||
viewer.trackedEntity = undefined;
|
||||
followEntity(viewer, null);
|
||||
}).ok,
|
||||
false,
|
||||
);
|
||||
assert.equal(calls, 0);
|
||||
assert.equal(viewer.trackedEntity, tracked);
|
||||
assert.equal(followedEntity(viewer), tracked);
|
||||
samePose(camera, before);
|
||||
});
|
||||
test('direct globe request refuses Cockpit before navigation mutation', (t) => {
|
||||
@@ -843,8 +874,8 @@ for (const owner of ['tracking', 'cockpit', 'close-up'])
|
||||
height: owner === 'close-up' ? 5000 : GLOBE_VIEW.heightM,
|
||||
});
|
||||
const before = pose(camera);
|
||||
if (owner === 'tracking') viewer.trackedEntity = { id: 'tracked-aircraft' };
|
||||
const tracked = viewer.trackedEntity;
|
||||
if (owner === 'tracking') followEntity(viewer, { id: 'tracked-aircraft' });
|
||||
const tracked = followedEntity(viewer);
|
||||
let releases = 0,
|
||||
stamps = 0;
|
||||
const styleManager = {
|
||||
@@ -858,7 +889,7 @@ for (const owner of ['tracking', 'cockpit', 'close-up'])
|
||||
},
|
||||
release() {
|
||||
releases++;
|
||||
viewer.trackedEntity = undefined;
|
||||
followEntity(viewer, null);
|
||||
},
|
||||
navigate,
|
||||
});
|
||||
@@ -880,7 +911,7 @@ for (const owner of ['tracking', 'cockpit', 'close-up'])
|
||||
assert.equal(result.ok, false);
|
||||
assert.equal(releases, 0);
|
||||
assert.equal(stamps, 0);
|
||||
assert.equal(viewer.trackedEntity, tracked);
|
||||
assert.equal(followedEntity(viewer), tracked);
|
||||
samePose(camera, before);
|
||||
if (owner === 'close-up') {
|
||||
assert.equal(result.reason, 'globe-view-required');
|
||||
@@ -1806,7 +1837,7 @@ test('a voice turn reported as done turns at least the half degree its check pro
|
||||
|
||||
/** Track an entity below `camera`, locking it into that entity's frame. */
|
||||
function trackFrom(viewer, camera) {
|
||||
viewer.trackedEntity = { id: 'high-satellite' };
|
||||
followEntity(viewer, { id: 'high-satellite' });
|
||||
const below = Cesium.Cartesian3.fromDegrees(10, 20, 400_000);
|
||||
camera.lookAtTransform(Cesium.Transforms.eastNorthUpToFixedFrame(below));
|
||||
}
|
||||
@@ -1832,7 +1863,7 @@ test('a voice turn that releases a tracked camera is checked as released', (t) =
|
||||
});
|
||||
trackFrom(viewer, camera);
|
||||
const releaseThenRun = (start) => {
|
||||
viewer.trackedEntity = undefined;
|
||||
followEntity(viewer, null);
|
||||
camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
|
||||
return start();
|
||||
};
|
||||
@@ -1873,14 +1904,14 @@ test('a refused voice turn leaves a tracked camera tracking', (t) => {
|
||||
for (let j = 0; j < 600 && getActiveCameraMotion(); j += 1) tick(1 / 60);
|
||||
}
|
||||
trackFrom(viewer, camera);
|
||||
const tracked = viewer.trackedEntity;
|
||||
const tracked = followedEntity(viewer);
|
||||
const transform = Cesium.Matrix4.clone(camera.transform);
|
||||
let released = false;
|
||||
const result = moveCamera(
|
||||
{ motion: 'tilt', direction: 'up', mode: 'once' },
|
||||
(start) => {
|
||||
released = true;
|
||||
viewer.trackedEntity = undefined;
|
||||
followEntity(viewer, null);
|
||||
camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
|
||||
return start();
|
||||
},
|
||||
@@ -1889,7 +1920,7 @@ test('a refused voice turn leaves a tracked camera tracking', (t) => {
|
||||
assert.equal(result.ok, false, label);
|
||||
assert.match(result.error, /globe out of view/, label);
|
||||
assert.equal(released, false, label);
|
||||
assert.equal(viewer.trackedEntity, tracked, label);
|
||||
assert.equal(followedEntity(viewer), tracked, label);
|
||||
assert.ok(Cesium.Matrix4.equals(camera.transform, transform), label);
|
||||
}
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user