mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 08:42:21 +00:00
feat(globe): follow camera on both engines
camera.follow({ position, viewFrom, minRange = 150, native? }) keeps a
moving target centred at an east-north-up offset the user may turn and
zoom; camera.following() and camera.followChanged report it; stop() frees
the camera and a camera command (setView, flyTo, flyToSphere, lookAt,
cancelFlight) ends it.
Probe ruling: Navara 0.2.1's cameraFollow holds the target but ignores the
user's drag and wheel, the aircraft sits ~13 px off centre with 7.6 px of
spread, and calling it without an offset each frame gives a NaN camera.
So Navara (and the fake engine) follow with src/globe/follow.js: each
frame, before Navara draws, the offset is re-read from where the user put
the camera relative to the previous target, kept outside the minimum
range and carried to the new target.
Cesium follows with viewer.trackedEntity: the layer's own Entity
(`native`) or a proxy Entity at position() with a 1 px transparent point,
since EntityView moves the camera only for an entity with a bounding
sphere. applyTrackedCameraFrame and the zoom limits moved to
src/globe/cesium/follow.js; src/data/trackedCamera.js keeps the pure parts
(the range clamp now lives in src/globe/follow.js). following() also
reports an entity the app tracked itself. Camera sensitivity claims made
on a viewer's Cesium camera now share the engine camera's ledger, and the
orientation controls and the world jump read the follow from the engine.
Contract (both engines): a target flying at 250 m/s stays within 3 px of
the centre for 2 s, zoomIn through it stops at 150 m, stop() and setView
end the follow. Cesium 71/71, Navara 77/77; shell 23/25/4.
This commit is contained in:
1 parent
a89719aba9
commit
f640890cf6
24 files changed
+1226
-218
No files matched your search
@@ -30,6 +30,7 @@ import { createAppClock } from '../../time/clock.js';
|
||||
import { createLineRegistry } from '../lines.js';
|
||||
import { createMoverRegistry } from '../movers.js';
|
||||
import { createCpuPicker } from '../cpuPicks.js';
|
||||
import { createFollowController } from '../follow.js';
|
||||
|
||||
const { cartesian2, cartesian3, cartographic, ellipsoid, math, matrix4 } = geo;
|
||||
const WGS84 = ellipsoid.WGS84;
|
||||
@@ -260,6 +261,8 @@ export function createFakeEngine(options = {}) {
|
||||
'frames.preRender': createEngineEvent(),
|
||||
'frames.postRender': createEngineEvent(),
|
||||
'clock.ticked': createEngineEvent(),
|
||||
// The follow steps here, before preRender (as on Navara).
|
||||
followStep: createEngineEvent(),
|
||||
};
|
||||
let wallMs = options.nowMs ?? FAKE_EPOCH_MS;
|
||||
const appClock = options.appClock ?? createAppClock({ now: () => wallMs });
|
||||
@@ -792,6 +795,11 @@ export function createFakeEngine(options = {}) {
|
||||
moveStart: events['camera.moveStart'],
|
||||
moveEnd: events['camera.moveEnd'],
|
||||
commanded: events['camera.commanded'],
|
||||
follow: (options) => follow.follow(options),
|
||||
following: () => follow.following(),
|
||||
get followChanged() {
|
||||
return follow.followChanged;
|
||||
},
|
||||
get percentageChanged() {
|
||||
return percentageChanged;
|
||||
},
|
||||
@@ -833,6 +841,18 @@ export function createFakeEngine(options = {}) {
|
||||
modelMatrix: state.modelMatrix,
|
||||
})),
|
||||
});
|
||||
// camera.follow on the fake's frames (src/globe/follow.js), as Navara.
|
||||
const follow = createFollowController({
|
||||
camera: {
|
||||
pose: () => engine.camera.pose(),
|
||||
commanded: events['camera.commanded'],
|
||||
},
|
||||
aim: (pose) => apply(pose),
|
||||
frame: events.followStep,
|
||||
requestRender: () => {
|
||||
fake.renderRequests++;
|
||||
},
|
||||
});
|
||||
const engine = {
|
||||
kind: options.kind ?? 'cesium',
|
||||
host,
|
||||
@@ -1092,6 +1112,7 @@ export function createFakeEngine(options = {}) {
|
||||
events['clock.ticked'].raiseValue(appClock.beginFrame());
|
||||
events['frames.preUpdate'].raiseEvent(clock);
|
||||
advanceFlight(dt);
|
||||
events.followStep.raiseEvent();
|
||||
events['frames.preRender'].raiseEvent(clock);
|
||||
cameraEvents();
|
||||
events['frames.postRender'].raiseEvent(clock);
|
||||
|
||||
Reference in new issue
Block a user