mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Merge origin/main into german/navara
Main's new layers (drone airspace, OSM places, sea marks, ski pistes) are Cesium-only for now: they join the layer directory and the Cesium catalog, are built afresh for each Cesium catalog, and show as unavailable on Navara. The zoom-out guard is a scene part that attaches to Cesium globes only. The awareness range pulses and their echoes draw on Cesium through the awareness display's viewer; Navara keeps the plain range ring. Camera-input wakes go through the display, and the analyst keeps the session-owned memory with main's area presentation. A disposed voice runner aborts work in flight, and an engine switch still keeps the last answer. Modules main added that read Cesium while they load (zoomOutGuard, awarenessEcho, the ground-sampling scratch in localGeojsonCore) now build those values on first use or use src/geo, so a Navara page still starts without the SDK. The OSM view box reads the engine's view rectangle. Main grew its own main chunk by 93,873 bytes gzip-9 since the merge base, so the baseline is raised to the merged size.
This commit is contained in:
commit
db9bf64821
264 files changed
+33864
-1424
No files matched your search
@@ -1003,9 +1003,9 @@ export function createLocalGeoJsonLayer(
|
||||
// governor the retry's preRender never arrives on a parked camera
|
||||
// and the stem stays at ellipsoid height (buried/floating) until
|
||||
// the user happens to move. Schedule the frame the retry needs.
|
||||
// Gated on a sampleable scene and in-range records only, so a far
|
||||
// camera (or a keyless scene) stays fully idle; the distance is
|
||||
// only computed for still-unsampled stems.
|
||||
// Gated on a sampleable scene and in-range, in-view records only,
|
||||
// so a far camera (or a keyless scene) stays fully idle; the
|
||||
// distance is only computed for still-unsampled stems.
|
||||
if (
|
||||
canSampleGround &&
|
||||
!record.groundSampled &&
|
||||
@@ -1013,7 +1013,8 @@ export function createLocalGeoJsonLayer(
|
||||
Cesium.Cartesian3.distance(
|
||||
viewer.camera.positionWC,
|
||||
record.base,
|
||||
) < GROUND_SAMPLE_MAX_DISTANCE_M
|
||||
) < GROUND_SAMPLE_MAX_DISTANCE_M &&
|
||||
groundSampleInView(viewer, record)
|
||||
) {
|
||||
groundRetryPending = true;
|
||||
}
|
||||
@@ -1143,9 +1144,84 @@ function refreshLocalTerrainFloor(viewer, record) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Made on first use: on a page that starts on Navara the Cesium SDK loads
|
||||
// only with the first Cesium globe, after this module.
|
||||
let groundScratch = null;
|
||||
const groundSample = () =>
|
||||
(groundScratch ??= {
|
||||
occluder: new Cesium.EllipsoidalOccluder(Cesium.Ellipsoid.WGS84),
|
||||
carto: new Cesium.Cartographic(),
|
||||
low: new Cesium.Cartesian3(),
|
||||
high: new Cesium.Cartesian3(),
|
||||
});
|
||||
|
||||
/** The record's vertical at `height` metres above the ellipsoid. */
|
||||
function groundSamplePoint(record, height, result) {
|
||||
const { carto } = groundSample();
|
||||
carto.longitude = record.carto.longitude;
|
||||
carto.latitude = record.carto.latitude;
|
||||
carto.height = height;
|
||||
return Cesium.Cartographic.toCartesian(carto, Cesium.Ellipsoid.WGS84, result);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the camera can see the ground under the record: inside the view
|
||||
* frustum and above the horizon. scene.sampleHeight reads only surface
|
||||
* rendered for the current view, so a sample of unseen ground passes through
|
||||
* the Earth (about -6,344 km near Ashburn on Esri) and fails on every 2 s
|
||||
* retry, each one a full offscreen render; 110 unseen data centres there held
|
||||
* rest frames at 58-589 ms. Unsampled bases sit on the ellipsoid, so the test
|
||||
* uses loaded globe terrain when there is some. Otherwise (a hidden globe) it
|
||||
* tests the vertical across +/-GROUND_SAMPLE_MAX_ABS_HEIGHT_M, every height a
|
||||
* sample can accept, so high or below-ellipsoid ground in view is never
|
||||
* mistaken for an unseen base. Unseen ground is sampled on the first walk that
|
||||
* sees it.
|
||||
*/
|
||||
function groundSampleInView(viewer, record) {
|
||||
const scratch = groundSample();
|
||||
const camera = viewer.camera;
|
||||
const globe = viewer.scene.globe;
|
||||
const terrain = globe?.show ? globe.getHeight?.(record.carto) : undefined;
|
||||
const known =
|
||||
Number.isFinite(terrain) &&
|
||||
Math.abs(terrain) <= GROUND_SAMPLE_MAX_ABS_HEIGHT_M;
|
||||
const low = groundSamplePoint(
|
||||
record,
|
||||
known ? terrain : -GROUND_SAMPLE_MAX_ABS_HEIGHT_M,
|
||||
scratch.low,
|
||||
);
|
||||
const high = known
|
||||
? low
|
||||
: groundSamplePoint(record, GROUND_SAMPLE_MAX_ABS_HEIGHT_M, scratch.high);
|
||||
// The vertical is unseen only when both ends are outside the same plane.
|
||||
const { planes } = camera.frustum.computeCullingVolume(
|
||||
camera.positionWC,
|
||||
camera.directionWC,
|
||||
camera.upWC,
|
||||
);
|
||||
for (const plane of planes) {
|
||||
if (
|
||||
Cesium.Cartesian3.dot(plane, low) + plane.w < 0 &&
|
||||
Cesium.Cartesian3.dot(plane, high) + plane.w < 0
|
||||
)
|
||||
return false;
|
||||
}
|
||||
// The ellipsoidal occluder hides every point below the ellipsoid from a
|
||||
// camera near it, so ground below 0 m (low-geoid coasts, the Dead Sea) is
|
||||
// tested at 0 m; unknown ground at the top of the vertical.
|
||||
const horizonHeight = known
|
||||
? Math.max(terrain, 0)
|
||||
: GROUND_SAMPLE_MAX_ABS_HEIGHT_M;
|
||||
scratch.occluder.cameraPosition = camera.positionWC;
|
||||
return scratch.occluder.isPointVisible(
|
||||
groundSamplePoint(record, horizonHeight, scratch.high),
|
||||
);
|
||||
}
|
||||
|
||||
function sampleLocalGroundHeight(viewer, record, now) {
|
||||
if (record.groundSampled || !viewer.scene.sampleHeightSupported) return false;
|
||||
if (now - record.lastGroundSampleMs < GROUND_SAMPLE_RETRY_MS) return false;
|
||||
if (!groundSampleInView(viewer, record)) return false;
|
||||
record.lastGroundSampleMs = now;
|
||||
const globe = viewer.scene.globe;
|
||||
if (globe?.show && globe.tilesLoaded === false) return false;
|
||||
|
||||
Reference in new issue
Block a user