mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Stop Navara's memory growth on engine switches, hide polygon zones reliably, and drop the Cesium camera rig
- Navara 0.2.1 never frees pick batch ids, and the mover banks rebuilt their instanced meshes on each attach, leaking about 260 KiB of WebAssembly memory per switch. A per-view pool hands released ids back out; the long soak now asserts native growth of at most 32 KiB per switch. - Navara 0.2.1 sometimes drops the first show:false update on a new vector layer, so a zone turned off right after a switch back stayed drawn. Polygon displays hide by deleting their layers and rebuild them when shown. - Camera verbs drive both engines through the globe contract; the Cesium viewer rig and the tests of states it can no longer reach are gone. - Flights and military tracking share src/layers/aircraft/tracking.js. - The geo import scenario reads movers only where the engine has them. - Add the Navara section to docs/CURRENT-STATE.md and a changelog fragment.
This commit is contained in:
1 parent
7abf74518f
commit
a6c64713ee
46 files changed
+2367
-2894
No files matched your search
+27
-43
@@ -3,7 +3,6 @@ import * as Cesium from 'cesium';
|
||||
import { guardCameraAboveGround } from '../cameraGroundGuard.js';
|
||||
import { rangeForBoundingSphere } from '../data/cameraFraming.js';
|
||||
import { cancelCameraArrival } from '../data/cameraArrival.js';
|
||||
import { isGlobeEngine } from '../globe/contract.js';
|
||||
|
||||
/** All visible positions, path vertices, polygon rings, walls and overlay bounds. */
|
||||
export function dataSourcePoints(dataSource, time = Cesium.JulianDate.now()) {
|
||||
@@ -72,17 +71,17 @@ export function dataSourcePoints(dataSource, time = Cesium.JulianDate.now()) {
|
||||
|
||||
/**
|
||||
* Fly synchronously to the footprint; later navigation always owns its
|
||||
* camera. `viewer` is a Cesium viewer or a globe engine (Navara), which flies
|
||||
* the same sphere through the contract's flyToSphere.
|
||||
* camera. `engine` is the globe engine (Cesium or Navara), which flies the
|
||||
* sphere through the contract's flyToSphere.
|
||||
*/
|
||||
export function flyToDataSource(
|
||||
viewer,
|
||||
engine,
|
||||
dataSource,
|
||||
{ duration = 1.5, ground = null } = {},
|
||||
) {
|
||||
const points = dataSourcePoints(dataSource);
|
||||
if (!points.length) return false;
|
||||
cancelCameraArrival(viewer);
|
||||
cancelCameraArrival(engine);
|
||||
const positions = points.map(([lon, lat, height]) =>
|
||||
Cesium.Cartesian3.fromDegrees(lon, lat, height),
|
||||
);
|
||||
@@ -92,12 +91,9 @@ export function flyToDataSource(
|
||||
Cesium.Cartographic.fromDegrees(points[0][0], points[0][1]);
|
||||
const lat = Cesium.Math.toDegrees(center.latitude),
|
||||
lon = Cesium.Math.toDegrees(center.longitude);
|
||||
const engine = isGlobeEngine(viewer) ? viewer : null;
|
||||
const terrain = engine
|
||||
? engine.surface.terrainHeightSupported
|
||||
? engine.surface.terrainHeight(center)
|
||||
: undefined
|
||||
: viewer.scene?.globe?.getHeight?.(center);
|
||||
const terrain = engine.surface.terrainHeightSupported
|
||||
? engine.surface.terrainHeight(center)
|
||||
: undefined;
|
||||
const cached = ground?.cachedGroundFloor?.(lat, lon);
|
||||
const height =
|
||||
Number.isFinite(terrain) && terrain > 0
|
||||
@@ -119,38 +115,26 @@ export function flyToDataSource(
|
||||
sphere.radius,
|
||||
Cesium.Cartesian3.distance(sphere.center, position),
|
||||
);
|
||||
if (engine) {
|
||||
const pose = engine.camera.pose();
|
||||
const aspect = pose.aspectRatio ?? 1;
|
||||
// Cesium's frustum fov: the wider side's angle.
|
||||
const fov =
|
||||
aspect > 1 ? 2 * Math.atan(Math.tan(pose.fovy / 2) * aspect) : pose.fovy;
|
||||
engine.camera.flyToSphere(
|
||||
{ center: sphere.center, radius: sphere.radius },
|
||||
{
|
||||
heading: pose.heading || 0,
|
||||
pitch: -Math.PI / 2,
|
||||
range: Math.max(
|
||||
800,
|
||||
rangeForBoundingSphere(
|
||||
{ camera: { frustum: { fov, aspectRatio: aspect } } },
|
||||
sphere.radius,
|
||||
),
|
||||
const pose = engine.camera.pose();
|
||||
const aspect = pose.aspectRatio ?? 1;
|
||||
// Cesium's frustum fov: the wider side's angle.
|
||||
const fov =
|
||||
aspect > 1 ? 2 * Math.atan(Math.tan(pose.fovy / 2) * aspect) : pose.fovy;
|
||||
engine.camera.flyToSphere(
|
||||
{ center: sphere.center, radius: sphere.radius },
|
||||
{
|
||||
heading: pose.heading || 0,
|
||||
pitch: -Math.PI / 2,
|
||||
range: Math.max(
|
||||
800,
|
||||
rangeForBoundingSphere(
|
||||
{ camera: { frustum: { fov, aspectRatio: aspect } } },
|
||||
sphere.radius,
|
||||
),
|
||||
duration,
|
||||
complete: () => guardCameraAboveGround(engine, { lat, lon }),
|
||||
},
|
||||
);
|
||||
return true;
|
||||
}
|
||||
viewer.camera?.flyToBoundingSphere?.(sphere, {
|
||||
offset: new Cesium.HeadingPitchRange(
|
||||
viewer.camera.heading || 0,
|
||||
-Math.PI / 2,
|
||||
Math.max(800, rangeForBoundingSphere(viewer, sphere.radius)),
|
||||
),
|
||||
duration,
|
||||
complete: () => guardCameraAboveGround(viewer, { lat, lon }),
|
||||
});
|
||||
),
|
||||
duration,
|
||||
complete: () => guardCameraAboveGround(engine, { lat, lon }),
|
||||
},
|
||||
);
|
||||
return true;
|
||||
}
|
||||
Reference in new issue
Block a user