mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
fix(camera): leave flights and scenes to their framing
Review follow-ups for the globe-in-view recovery and voice limits. - Leave a camera flight in progress and a playing Director scene, holds included, to their own framing. The recovery is now installed with the scene tools, which own the Director, and reads its running state. - Reuse a voice turn's half-degree proof only from the position and direction it was proven at, so a release that moves the camera checks the turn again. - Share one free-globe-camera check between the recovery, the voice turn limit and the globe rotation. - Keep an enableLook setting other code makes after the free-look limit is installed, instead of writing back the install-time value. - Name the nudging test for what it asserts, the 1% floor, and document that a view losing its surface without a camera move waits for the next one.
This commit is contained in:
1 parent
d36b28f352
commit
64377db91a
8 files changed
+137
-44
No files matched your search
+18
-9
@@ -4,6 +4,7 @@ import { StarrySky } from '../sky/starrySky.js';
|
||||
import {
|
||||
FREE_LOOK_MAX_HEIGHT_METERS,
|
||||
globeOutOfFrame,
|
||||
isFreeGlobeCamera,
|
||||
} from '../globeInView.js';
|
||||
|
||||
const PINCH_ZOOM_MULTIPLIER = 8;
|
||||
@@ -109,7 +110,9 @@ export function installTrackpadPinchZoom(
|
||||
|
||||
/**
|
||||
* Allow Cesium's free look only below `maxHeight` and return its disposer.
|
||||
* Orbit, tilt and zoom stay available at every height. `enableLook` gates the
|
||||
* Orbit, tilt and zoom stay available at every height. A value other code
|
||||
* sets later is kept as the one to allow below that height, and restored on
|
||||
* dispose. `enableLook` gates the
|
||||
* Shift+drag binding only; a drag that starts on the stars below Cesium's
|
||||
* trackball height still turns the camera in place, which
|
||||
* `installGlobeInViewRecovery` catches.
|
||||
@@ -124,11 +127,14 @@ export function installFreeLookHeightLimit(
|
||||
if (!controller || !camera || !scene?.preUpdate)
|
||||
throw new TypeError('A complete Cesium viewer is required');
|
||||
|
||||
const originalEnableLook = controller.enableLook;
|
||||
let wanted = controller.enableLook;
|
||||
let written;
|
||||
const sync = () => {
|
||||
if (written !== undefined && controller.enableLook !== written)
|
||||
wanted = controller.enableLook;
|
||||
const height = camera.positionCartographic?.height;
|
||||
controller.enableLook =
|
||||
originalEnableLook && !(Number.isFinite(height) && height > maxHeight);
|
||||
written = wanted && !(Number.isFinite(height) && height > maxHeight);
|
||||
controller.enableLook = written;
|
||||
};
|
||||
sync();
|
||||
const removeListener = scene.preUpdate.addEventListener(sync);
|
||||
@@ -138,7 +144,7 @@ export function installFreeLookHeightLimit(
|
||||
if (!active) return;
|
||||
active = false;
|
||||
removeListener();
|
||||
controller.enableLook = originalEnableLook;
|
||||
if (controller.enableLook === written) controller.enableLook = wanted;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -159,7 +165,9 @@ const SETTLE_GIVE_UP_MS = 5 * 60_000;
|
||||
* catches a saved or shared view that looked away, and a drag that Cesium turns
|
||||
* into an in-place look below its trackball height whatever `enableLook` says.
|
||||
* Heading and position are kept. Tracked cameras, locked ones (non-identity
|
||||
* transform) and the 2D and Columbus modes are left alone. `keyholeRadius`
|
||||
* transform), a camera flight in progress, the 2D and Columbus modes, and any
|
||||
* time `paused` returns true (an authored scene playing) are left alone.
|
||||
* `keyholeRadius`
|
||||
* returns the radius of the visible circle when a scope mask hides the rest of
|
||||
* the frame (see `globeFrameShare`), or 0; it is read at every check.
|
||||
*
|
||||
@@ -179,6 +187,7 @@ export function installGlobeInViewRecovery(
|
||||
{
|
||||
minHeight = FREE_LOOK_MAX_HEIGHT_METERS,
|
||||
keyholeRadius = () => 0,
|
||||
paused = () => false,
|
||||
setTimeout: schedule = globalThis.setTimeout,
|
||||
clearTimeout: unschedule = globalThis.clearTimeout,
|
||||
} = {},
|
||||
@@ -189,9 +198,9 @@ export function installGlobeInViewRecovery(
|
||||
throw new TypeError('A complete Cesium viewer is required');
|
||||
|
||||
const recover = () => {
|
||||
if (scene.mode !== Cesium.SceneMode.SCENE3D || viewer.trackedEntity) return;
|
||||
if (!Cesium.Matrix4.equals(camera.transform, Cesium.Matrix4.IDENTITY))
|
||||
return;
|
||||
if (!isFreeGlobeCamera(viewer)) return;
|
||||
// Cesium has no public running-flight flag.
|
||||
if (camera._currentFlight || paused()) return;
|
||||
const height = camera.positionCartographic?.height;
|
||||
if (
|
||||
!(height > minHeight) ||
|
||||
|
||||
Reference in new issue
Block a user