mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +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
@@ -124,8 +124,31 @@
|
||||
* lookAt and cancelFlight. Cesium also raises it for those calls made on the
|
||||
* viewer's own camera and when the viewer's tracked entity changes, so a
|
||||
* pending correction yields to every new camera owner.
|
||||
* @property {(options: FollowOptions) => FollowHandle} follow Keeps a moving
|
||||
* target in the centre (Cesium: trackedEntity; Navara and the fake engine:
|
||||
* src/globe/follow.js each frame). The user may turn and zoom around it;
|
||||
* a command that takes the camera (setView, flyTo, flyToSphere, lookAt,
|
||||
* cancelFlight) ends it. A new follow replaces the current one.
|
||||
* @property {() => (FollowHandle | null)} following The current follow
|
||||
* (Cesium: also one the app started on viewer.trackedEntity itself).
|
||||
* @property {EngineEvent} followChanged Listener receives the new handle or
|
||||
* null (Cesium: viewer.trackedEntityChanged).
|
||||
* @property {number} percentageChanged
|
||||
*
|
||||
* @typedef {object} FollowOptions
|
||||
* @property {() => Cartesian3} position Where the target is (read each frame).
|
||||
* @property {Cartesian3 | (() => Cartesian3)} viewFrom The camera's offset
|
||||
* from the target in its east-north-up frame, metres.
|
||||
* @property {number} [minRange] Closest the camera comes (150 m).
|
||||
* @property {'enu'} [frame]
|
||||
* @property {any} [native] Cesium only (layers' render/cesium.js): the
|
||||
* Entity to put on viewer.trackedEntity instead of a proxy.
|
||||
*
|
||||
* @typedef {object} FollowHandle
|
||||
* @property {() => void} stop
|
||||
* @property {(next: Partial<FollowOptions>) => void} retarget
|
||||
* @property {any} [native]
|
||||
*
|
||||
* @typedef {'click'|'doubleClick'|'move'|'down'|'up'} InputType
|
||||
* @typedef {'ctrl'|'shift'|'alt'} InputModifier
|
||||
* @typedef {object} InputEvent
|
||||
@@ -531,6 +554,9 @@ const SHAPE = {
|
||||
moveStart: isEngineEvent,
|
||||
moveEnd: isEngineEvent,
|
||||
commanded: isEngineEvent,
|
||||
follow: isFunction,
|
||||
following: isFunction,
|
||||
followChanged: isEngineEvent,
|
||||
percentageChanged: isNumber,
|
||||
},
|
||||
picker: {
|
||||
|
||||
Reference in new issue
Block a user