mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 00:32:21 +00:00
fix(cockpit): keep the orbital view on a double-click at a ground point
In the orbital view a double-click on a mapped ground point went on to Cesium's own double-click, which tracks the picked entity and so ended the view. The Cockpit's double-click routing now takes it in orbit: it keeps or starts the focus on that point (a point beyond the reach is left unfocused but still not tracked). A double-click anywhere else, one a tool owns, and every one outside orbit go on to Cesium's as before, and stopping the Cockpit still hands Cesium's handler back.
This commit is contained in:
1 parent
dd063b0e83
commit
b18336d3d4
5 files changed
+116
-9
No files matched your search
@@ -109,6 +109,18 @@ function fixture(t, { reducedMotion = false } = {}) {
|
||||
};
|
||||
handler.stock = stockClick;
|
||||
actions.set(Cesium.ScreenSpaceEventType.LEFT_CLICK, stockClick);
|
||||
// Its double-click tracks what it picks (pickAndTrackObject): a mapped
|
||||
// point, tracked, would end the orbital view.
|
||||
handler.stockDoubleClicks = 0;
|
||||
const stockDoubleClick = ({ position }) => {
|
||||
handler.stockDoubleClicks += 1;
|
||||
const picked = viewer.scene.pick(position);
|
||||
viewer.trackedEntity = picked?.id
|
||||
? { ...picked.id, position: { getValue: () => null } }
|
||||
: undefined;
|
||||
};
|
||||
handler.stockDouble = stockDoubleClick;
|
||||
actions.set(Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK, stockDoubleClick);
|
||||
viewer.screenSpaceEventHandler = handler;
|
||||
|
||||
let subject = { ...ISS };
|
||||
@@ -229,6 +241,12 @@ function fixture(t, { reducedMotion = false } = {}) {
|
||||
frame,
|
||||
click: (position) =>
|
||||
actions.get(Cesium.ScreenSpaceEventType.LEFT_CLICK)?.({ position }),
|
||||
/** A double-click as Cesium fires it: two clicks, then the double. */
|
||||
doubleClick(position) {
|
||||
actions.get(Cesium.ScreenSpaceEventType.LEFT_CLICK)?.({ position });
|
||||
actions.get(Cesium.ScreenSpaceEventType.LEFT_CLICK)?.({ position });
|
||||
actions.get(Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK)?.({ position });
|
||||
},
|
||||
/** Move the satellite along its track by `deg` of latitude and longitude. */
|
||||
move(dLat, dLon) {
|
||||
subject = {
|
||||
@@ -642,3 +660,50 @@ test('stopping the Cockpit hands the single click back to Cesium', async (t) =>
|
||||
assert.equal(scene.handler.stockClicks, 1);
|
||||
assert.equal(scene.cockpit.orbital, null);
|
||||
});
|
||||
|
||||
test('a double-click on a mapped point focuses it and keeps the orbital view', async (t) => {
|
||||
const scene = await inOrbit(t);
|
||||
const { cockpit, viewer, handler } = scene;
|
||||
scene.doubleClick(SITES.alpha.at);
|
||||
assert.equal(handler.stockDoubleClicks, 0, 'Cesium does not track the point');
|
||||
assert.equal(viewer.trackedEntity, undefined);
|
||||
scene.frame();
|
||||
assert.equal(cockpit.active, true, 'still in orbit');
|
||||
assert.equal(cockpit.orbital.focus.key, 'site-alpha');
|
||||
run(scene, LAND_FRAMES);
|
||||
assert.ok(missDeg(scene.shots.at(-1), 'alpha') < 1e-5);
|
||||
|
||||
// On the focused point it keeps the focus; on another it switches.
|
||||
scene.doubleClick(SITES.alpha.at);
|
||||
assert.equal(cockpit.orbital.focus.key, 'site-alpha');
|
||||
scene.doubleClick(SITES.bravo.at);
|
||||
assert.equal(cockpit.orbital.focus.key, 'site-bravo');
|
||||
// A mapped point beyond the reach is not focused, but not tracked either.
|
||||
scene.doubleClick(SITES.far.at);
|
||||
assert.equal(handler.stockDoubleClicks, 0);
|
||||
scene.frame();
|
||||
assert.equal(cockpit.active, true);
|
||||
|
||||
// Anywhere else the double-click goes on to Cesium's, as before.
|
||||
scene.doubleClick(EMPTY_GROUND);
|
||||
assert.equal(handler.stockDoubleClicks, 1);
|
||||
assert.equal(cockpit.orbital.focus, null, 'the clicks ended the focus');
|
||||
});
|
||||
|
||||
test('a double-click a tool owns, or one outside orbit, goes on to Cesium', async (t) => {
|
||||
const scene = fixture(t);
|
||||
const type = Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK;
|
||||
scene.doubleClick(SITES.alpha.at);
|
||||
assert.equal(scene.handler.stockDoubleClicks, 1, 'outside orbit');
|
||||
scene.viewer.trackedEntity = undefined;
|
||||
assert.equal(scene.cockpit.enter(), true);
|
||||
await settle();
|
||||
scene.frame();
|
||||
const lease = claimPointer('draw');
|
||||
t.after(() => releasePointer(lease));
|
||||
scene.doubleClick(SITES.alpha.at);
|
||||
assert.equal(scene.handler.stockDoubleClicks, 2, 'a tool owns it');
|
||||
releasePointer(lease);
|
||||
scene.cockpit.stop();
|
||||
assert.equal(scene.handler.getInputAction(type), scene.handler.stockDouble);
|
||||
});
|
||||
Reference in new issue
Block a user