mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Read the camera verbs' and voice actions' canvas from the renderer
The camera verbs size their keyhole fit by the renderer's canvas and listen on it for the user's input, and the voice actions size their view samples by it, rather than reaching through `viewer.scene`; a viewer with no renderer bound answers with its own canvas, the same element. The test fakes give their viewers a canvas, and a fake camera binding's renderer reports the fake viewer's.
This commit is contained in:
1 parent
20fdfd492e
commit
b47aa5f3de
14 files changed
+46
-9
No files matched your search
@@ -18,6 +18,9 @@ function harness() {
|
|||||||
const viewer = {
|
const viewer = {
|
||||||
trackedEntity: undefined,
|
trackedEntity: undefined,
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
get canvas() {
|
||||||
|
return this.scene.canvas;
|
||||||
|
},
|
||||||
scene: {
|
scene: {
|
||||||
canvas: {
|
canvas: {
|
||||||
clientWidth: 1200,
|
clientWidth: 1200,
|
||||||
|
|||||||
+11
-3
@@ -52,7 +52,12 @@ import {
|
|||||||
vec,
|
vec,
|
||||||
} from './geo/index.js';
|
} from './geo/index.js';
|
||||||
import { heightsOf } from './queries/heights.js';
|
import { heightsOf } from './queries/heights.js';
|
||||||
import { cameraOf, findCamera, findFrame } from './render/rendererOf.js';
|
import {
|
||||||
|
cameraOf,
|
||||||
|
findCamera,
|
||||||
|
findFrame,
|
||||||
|
rendererOf,
|
||||||
|
} from './render/rendererOf.js';
|
||||||
|
|
||||||
let _isCockpitActive = null;
|
let _isCockpitActive = null;
|
||||||
/** °/s by speed word — orbit; pan uses fractions of view height/s. */
|
/** °/s by speed word — orbit; pan uses fractions of view height/s. */
|
||||||
@@ -1224,6 +1229,9 @@ function liveView(camera, pose = camera.pose()) {
|
|||||||
return { ...pose, projection, live: true };
|
return { ...pose, projection, live: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The canvas the renderer draws in (the viewer's own when none is bound). */
|
||||||
|
const canvasOf = (viewer) => rendererOf(viewer)?.canvas ?? viewer.canvas;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether a projection is a perspective one centred on the view: what the
|
* Whether a projection is a perspective one centred on the view: what the
|
||||||
* keyhole cone below assumes. Column-major, so element 11 is row 3 of
|
* keyhole cone below assumes. Column-major, so element 11 is row 3 of
|
||||||
@@ -1235,7 +1243,7 @@ const centredPerspective = (p) =>
|
|||||||
|
|
||||||
/** Use the existing WGS84/CSS-pixel projection; null means unsupported, not close-up. */
|
/** Use the existing WGS84/CSS-pixel projection; null means unsupported, not close-up. */
|
||||||
function globeRotationFitsKeyhole(view) {
|
function globeRotationFitsKeyhole(view) {
|
||||||
const canvas = _viewer.scene.canvas;
|
const canvas = canvasOf(_viewer);
|
||||||
const width = canvas.clientWidth;
|
const width = canvas.clientWidth;
|
||||||
const height = canvas.clientHeight;
|
const height = canvas.clientHeight;
|
||||||
if (
|
if (
|
||||||
@@ -1383,7 +1391,7 @@ export function initCameraVerbs(
|
|||||||
});
|
});
|
||||||
for (const rm of _inputRemovers) rm();
|
for (const rm of _inputRemovers) rm();
|
||||||
_inputRemovers = [];
|
_inputRemovers = [];
|
||||||
const canvas = viewer.scene.canvas;
|
const canvas = canvasOf(viewer);
|
||||||
// ANY manual camera input reclaims control — the cancelFlight reflex.
|
// ANY manual camera input reclaims control — the cancelFlight reflex.
|
||||||
for (const evt of ['pointerdown', 'touchstart', 'wheel']) {
|
for (const evt of ['pointerdown', 'touchstart', 'wheel']) {
|
||||||
const h = () => interruptCameraMotion('manual-input');
|
const h = () => interruptCameraMotion('manual-input');
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ test('changed status without contact time retains general contact, including voi
|
|||||||
const runner = createGevActionRunner({
|
const runner = createGevActionRunner({
|
||||||
viewer: {
|
viewer: {
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
camera: {
|
camera: {
|
||||||
moveEnd: { addEventListener() {} },
|
moveEnd: { addEventListener() {} },
|
||||||
|
|||||||
@@ -441,6 +441,7 @@ test('cockpit class filter matches a converted contact end to end', async () =>
|
|||||||
const runner = createGevActionRunner({
|
const runner = createGevActionRunner({
|
||||||
viewer: {
|
viewer: {
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1111,6 +1111,7 @@ test('a route hidden from Draw is not flown; the newest visible one is', () => {
|
|||||||
test('a frame port bound after the verbs started runs the next motion', () => {
|
test('a frame port bound after the verbs started runs the next motion', () => {
|
||||||
// A viewer with no renderer yet, so no frame port to listen to.
|
// A viewer with no renderer yet, so no frame port to listen to.
|
||||||
const viewer = {
|
const viewer = {
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -75,7 +75,8 @@ export function fakeCameraPort({ pose = {}, viewRectangle = null } = {}) {
|
|||||||
* `moveEnd`. A fake with `trackedEntityChanged` and `entities` follows
|
* `moveEnd`. A fake with `trackedEntityChanged` and `entities` follows
|
||||||
* through the port, as the renderer does. Its credits are the renderer's
|
* through the port, as the renderer does. Its credits are the renderer's
|
||||||
* credits port over the fake's `creditDisplay`, if it has one; `ports`
|
* credits port over the fake's `creditDisplay`, if it has one; `ports`
|
||||||
* adds other ports (a fake draw port, say). Binding a viewer twice keeps the
|
* adds other ports (a fake draw port, say). The renderer's `canvas` is the
|
||||||
|
* fake viewer's (`canvas`, else `scene.canvas`). Binding a viewer twice keeps the
|
||||||
* first. Returns the viewer.
|
* first. Returns the viewer.
|
||||||
* @template {{camera: object}} V
|
* @template {{camera: object}} V
|
||||||
* @param {V} viewer
|
* @param {V} viewer
|
||||||
@@ -189,6 +190,11 @@ export function bindFakeCesiumCamera(viewer, ports = {}) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
bindRenderer(viewer, {
|
bindRenderer(viewer, {
|
||||||
|
// The renderer's canvas is the fake's, as the Cesium renderer's is the
|
||||||
|
// viewer's: read when asked, so a fake that swaps its canvas is seen.
|
||||||
|
get canvas() {
|
||||||
|
return viewer.canvas ?? viewer.scene?.canvas;
|
||||||
|
},
|
||||||
...ports,
|
...ports,
|
||||||
camera: port,
|
camera: port,
|
||||||
credits: fakeCesiumCredits(viewer),
|
credits: fakeCesiumCredits(viewer),
|
||||||
|
|||||||
@@ -57,6 +57,9 @@ test('real runner and facade use visual settings, preserve visibility and return
|
|||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
scene: { canvas: new EventTarget() },
|
scene: { canvas: new EventTarget() },
|
||||||
|
get canvas() {
|
||||||
|
return this.scene.canvas;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
const runner = createGevActionRunner({ styleManager: owner, viewer, dataManager: {} });
|
const runner = createGevActionRunner({ styleManager: owner, viewer, dataManager: {} });
|
||||||
|
|||||||
@@ -254,6 +254,7 @@ test('Display and voice HUD routes preserve explicit Cyber entry and exit author
|
|||||||
const viewer = {
|
const viewer = {
|
||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: eventSource,
|
||||||
scene: { canvas: eventSource },
|
scene: { canvas: eventSource },
|
||||||
};
|
};
|
||||||
const runVoiceAction = createGevActionRunner({
|
const runVoiceAction = createGevActionRunner({
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ after(() => {
|
|||||||
function viewerFixture() {
|
function viewerFixture() {
|
||||||
return {
|
return {
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import { DataLayerManager } from '../data/manager.js';
|
|||||||
const viewerFixture = () => ({
|
const viewerFixture = () => ({
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
});
|
});
|
||||||
const request = (ws, id, name, args = {}) =>
|
const request = (ws, id, name, args = {}) =>
|
||||||
|
|||||||
+12
-5
@@ -21,7 +21,12 @@ import {
|
|||||||
toRadians,
|
toRadians,
|
||||||
} from '../geo/index.js';
|
} from '../geo/index.js';
|
||||||
import { sphereFromPoints } from '../geo/sphere.js';
|
import { sphereFromPoints } from '../geo/sphere.js';
|
||||||
import { cameraOf, findCamera, findQuery } from '../render/rendererOf.js';
|
import {
|
||||||
|
cameraOf,
|
||||||
|
findCamera,
|
||||||
|
findQuery,
|
||||||
|
rendererOf,
|
||||||
|
} from '../render/rendererOf.js';
|
||||||
import { CITY_POIS } from '../cityPois.js';
|
import { CITY_POIS } from '../cityPois.js';
|
||||||
import { greatCircleKm } from '../geoDistance.js';
|
import { greatCircleKm } from '../geoDistance.js';
|
||||||
import {
|
import {
|
||||||
@@ -3965,13 +3970,16 @@ function selectedEntityContext(dataManager) {
|
|||||||
return summarizeContextRecord(record, { includeProperties: true });
|
return summarizeContextRecord(record, { includeProperties: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The canvas the renderer draws in (the viewer's own when none is bound). */
|
||||||
|
const canvasOf = (viewer) => rendererOf(viewer)?.canvas ?? viewer.canvas;
|
||||||
|
|
||||||
function visibleEntityContexts(
|
function visibleEntityContexts(
|
||||||
viewer,
|
viewer,
|
||||||
dataManager,
|
dataManager,
|
||||||
{ layerId = null, limit = 5, target = null } = {},
|
{ layerId = null, limit = 5, target = null } = {},
|
||||||
) {
|
) {
|
||||||
const nearbyRecords = [];
|
const nearbyRecords = [];
|
||||||
const canvas = viewer.scene.canvas;
|
const canvas = canvasOf(viewer);
|
||||||
const width = canvas.clientWidth || canvas.width || 0;
|
const width = canvas.clientWidth || canvas.width || 0;
|
||||||
const height = canvas.clientHeight || canvas.height || 0;
|
const height = canvas.clientHeight || canvas.height || 0;
|
||||||
const centerX = width / 2;
|
const centerX = width / 2;
|
||||||
@@ -4322,7 +4330,7 @@ function cameraViewSignature(camera) {
|
|||||||
function getViewTargetCartesian(viewer) {
|
function getViewTargetCartesian(viewer) {
|
||||||
const query = findQuery(viewer);
|
const query = findQuery(viewer);
|
||||||
if (!query) return null;
|
if (!query) return null;
|
||||||
const canvas = viewer.scene.canvas;
|
const canvas = canvasOf(viewer);
|
||||||
const width = canvas.clientWidth || canvas.width || 0;
|
const width = canvas.clientWidth || canvas.width || 0;
|
||||||
const height = canvas.clientHeight || canvas.height || 0;
|
const height = canvas.clientHeight || canvas.height || 0;
|
||||||
const x = width / 2;
|
const x = width / 2;
|
||||||
@@ -4356,8 +4364,7 @@ function getViewTargetCartesian(viewer) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function sampleViewportCartographics(viewer) {
|
function sampleViewportCartographics(viewer) {
|
||||||
const scene = viewer.scene;
|
const canvas = canvasOf(viewer);
|
||||||
const canvas = scene.canvas;
|
|
||||||
const width = canvas.clientWidth || canvas.width || 0;
|
const width = canvas.clientWidth || canvas.width || 0;
|
||||||
const height = canvas.clientHeight || canvas.height || 0;
|
const height = canvas.clientHeight || canvas.height || 0;
|
||||||
if (!width || !height) return [];
|
if (!width || !height) return [];
|
||||||
|
|||||||
@@ -1306,6 +1306,7 @@ test('generic same-response Radio visibility disable supersedes delayed Select',
|
|||||||
});
|
});
|
||||||
const viewer = {
|
const viewer = {
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
};
|
};
|
||||||
@@ -1558,6 +1559,7 @@ test('Pause and Stop preserve independent dedicated and generic Radio ON across
|
|||||||
});
|
});
|
||||||
const viewer = {
|
const viewer = {
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -497,6 +497,7 @@ async function directActions(
|
|||||||
const runner = createGevActionRunner({
|
const runner = createGevActionRunner({
|
||||||
viewer: {
|
viewer: {
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
camera: { moveEnd: { addEventListener() {} } },
|
camera: { moveEnd: { addEventListener() {} } },
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ export function harness({
|
|||||||
const enabled = new Set(on);
|
const enabled = new Set(on);
|
||||||
const viewer = {
|
const viewer = {
|
||||||
clock: { onTick: { addEventListener: () => () => {} } },
|
clock: { onTick: { addEventListener: () => () => {} } },
|
||||||
|
canvas: { addEventListener() {}, removeEventListener() {} },
|
||||||
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
scene: { canvas: { addEventListener() {}, removeEventListener() {} } },
|
||||||
camera: {
|
camera: {
|
||||||
moveEnd: { addEventListener() {} },
|
moveEnd: { addEventListener() {} },
|
||||||
|
|||||||
Reference in new issue
Block a user