spacemap 0.1.16 → 0.1.17

package/index.d.ts

@@ -1104,6 +1104,12 @@ export declare interface MapEvents {
     loading: (loading: boolean) => void;
     /** Boot progress, 0 to 1, monotonic within one load. */
     progress: (fraction: number) => void;
+    /** The map is at rest. The camera does not move, and the view has every
+     *  picture, model, tile and terrain grid that it needs. The event fires once
+     *  each time that the map comes to rest after a change. The clock can run. A
+     *  covered map is not at rest. The catalogue points and the star background
+     *  do not count. */
+    idle: () => void;
     /** The data could not be loaded. The map stays mounted and empty. */
     error: (message: string) => void;
     /** The export was republished while this map was open: its data is now a

package/index.js

@@ -110,7 +110,7 @@ var noop = () => {};
 function run_all(arr) {
 	for (var i = 0; i < arr.length; i++) arr[i]();
 }
-function deferred() {
+function deferred$1() {
 	var resolve;
 	var reject;
 	return {
@@ -902,7 +902,7 @@ var Batch = class Batch {
 		this.#discard_callbacks.add(fn);
 	}
 	settled() {
-		return (this.#deferred ??= deferred()).promise;
+		return (this.#deferred ??= deferred$1()).promise;
 	}
 	static ensure() {
 		if (current_batch === null) {
@@ -13517,6 +13517,11 @@ function disposeChain(chain) {
 	chain.uniforms.map.value = null;
 	chain.uniforms.mask.value = null;
 }
+function chainSettled(chain, tiles) {
+	const store = chain.store;
+	if (!store || chain.dead || chain.uniforms.window.value[0].w === 0) return true;
+	return store.windows.every((win) => settled(chain, store, tiles, win));
+}
 function restChain(chain, now) {
 	switchOff(chain);
 	if (now - chain.lastUsed > IDLE_DISPOSE_S * 1e3) disposeChain(chain);
@@ -21100,6 +21105,7 @@ var SystemDataLoader = class {
 	lastBaryId = null;
 	pendingUnloads = /* @__PURE__ */ new Set();
 	prefetched = /* @__PURE__ */ new Set();
+	loads = 0;
 	constructor(scene, ctx, renderer, textureLoader, bodyObjects, clock, onLoaded) {
 		this.scene = scene;
 		this.ctx = ctx;
@@ -21145,10 +21151,14 @@ var SystemDataLoader = class {
 		return isTopLevelParent(baryId) ? null : baryId;
 	}
 	load(baryId) {
+		this.loads++;
 		loadSystemData(baryId, this.bodyObjects, this.scene, this.textureLoader, this.clock.jd, this.renderer.capabilities.maxTextureSize, this.ctx).then(() => {
 			this.onLoaded();
 			this.ctx.bodies.orientationVersion++;
-		});
+		}).finally(() => this.loads--);
+	}
+	isLoading() {
+		return this.loads > 0;
 	}
 	drainPendingUnloads() {
 		if (this.pendingUnloads.size === 0) return;
@@ -25571,6 +25581,10 @@ function gridGeometry(grid) {
 	return geometry;
 }
 var tiledStates = /* @__PURE__ */ new WeakMap();
+var deferred = /* @__PURE__ */ new WeakSet();
+function terrainSettled(bo) {
+	return !tiledStates.get(bo)?.abort && !deferred.has(bo);
+}
 var MAX_BUILD_FAILURES = 2;
 function heightTilesOf(bo) {
 	const tiles = bo.displacementMeta?.tiles;
@@ -25625,7 +25639,10 @@ function updateTiledWindow(bo, mesh, tiles, altitude, centerTheta, centerPhi, in
 	if (held) {
 		const still = drift(centerTheta, centerPhi, held.centerTheta, held.centerPhi);
 		if (kept === stepLevel && still < RECENTER_FRAC * held.angRadius) return true;
-		if (performance.now() - held.builtAt < REBUILD_MIN_MS) return true;
+		if (performance.now() - held.builtAt < REBUILD_MIN_MS) {
+			deferred.add(bo);
+			return true;
+		}
 	}
 	const grid = planNestedGrid(centerTheta, centerPhi, altitude, .5 * meta.scale_km / radiusKm, finest, bandCells, stepLevel);
 	const thetas = grid.rows.at;
@@ -25687,6 +25704,7 @@ function updateTiledWindow(bo, mesh, tiles, altitude, centerTheta, centerPhi, in
 	return !!held;
 }
 function updateTerrainWindow(bo, camera, eligible, invalidate) {
+	deferred.delete(bo);
 	const mesh = bo.mesh;
 	const tex = bo.displacementMap;
 	if (!eligible || !mesh || !tex) {
@@ -25725,7 +25743,10 @@ function updateTerrainWindow(bo, camera, eligible, invalidate) {
 		if (w.stepLevel === stepLevel) {
 			if (drift(centerTheta, centerPhi, w.centerTheta, w.centerPhi) < RECENTER_FRAC * w.angRadius) return true;
 		}
-		if (performance.now() - w.builtAt < REBUILD_MIN_MS) return true;
+		if (performance.now() - w.builtAt < REBUILD_MIN_MS) {
+			deferred.add(bo);
+			return true;
+		}
 	}
 	const thetaLo = Math.max(0, centerTheta - angRadius);
 	const thetaHi = Math.min(Math.PI, centerTheta + angRadius);
@@ -25822,6 +25843,15 @@ function desiredDemTier(altitudeRadii, current) {
 	if (tierRank(down) < tierRank(current)) return down;
 	return current;
 }
+function bodyLoading(bo) {
+	if (bo.textureLoading || bo.displacementLoading || bo.clouds?.textureLoading) return true;
+	if (bo.appearance?.loading || bo.modelLoadPromise) return true;
+	const surface = bo.tileOverlay;
+	if (surface && bo.surfaceTiles && !chainSettled(surface.chain, bo.surfaceTiles)) return true;
+	const relief = bo.reliefTiles;
+	if (relief && !chainSettled(relief.chain, relief.tiles)) return true;
+	return !terrainSettled(bo);
+}
 function updateTextureLOD(bodyObjects, camera, renderer, ctx, textureLoader, focusedId, jd, appearances, invalidate) {
 	appearances.apply(bodyObjects, textureLoader);
 	const fovRad = camera.fov * Math.PI / 180;
@@ -25876,6 +25906,13 @@ function updateTextureLOD(bodyObjects, camera, renderer, ctx, textureLoader, foc
 	}
 }
 
+//#endregion
+//#region src/lib/scene/perf/calibration-state.svelte.ts
+var calibrationUi = proxy({
+	progress: null,
+	bootPending: false
+});
+
 //#endregion
 //#region src/lib/scene/animation/focus.ts
 var FOCUS_DURATION_MS = FOCUS_ROT_PACING.refMs;
@@ -27262,6 +27299,11 @@ var SceneRenderer = class SceneRenderer {
 	lastRenderedFocusKey = "";
 	lastRenderedCamPos = new Vector3(NaN, NaN, NaN);
 	lastRenderedCamQuat = new Quaternion();
+	restCamPos = new Vector3(NaN, NaN, NaN);
+	restCamQuat = new Quaternion();
+	restFocusKey = "";
+	atRest = false;
+	focusLoads = 0;
 	unsubscribeBodiesAdded = null;
 	_trailView = {
 		camX: 0,
@@ -27766,7 +27808,27 @@ var SceneRenderer = class SceneRenderer {
 		this.renderModelOverlay();
 		this.labelRenderer.render(this.scene, this.camera);
 		if (this.haloDebug.active) this.haloDebug.draw(this.bodyObjects, this.camera, this.focus.focusTruePos, this.focusController.current?.data.id, this.renderer.domElement.clientWidth, this.renderer.domElement.clientHeight);
-	};
+		this.checkRest(nowMs);
+	};
+	checkRest(nowMs) {
+		const moved = this.cameraMovedFrom(this.restCamPos, this.restCamQuat) || this.focusKey() !== this.restFocusKey;
+		this.restCamPos.copy(this.camera.position);
+		this.restCamQuat.copy(this.camera.quaternion);
+		this.restFocusKey = this.focusKey();
+		if (moved || this.settling(nowMs)) this.atRest = false;
+		else if (!this.atRest) {
+			this.atRest = true;
+			this.callbacks.onIdle?.();
+		}
+	}
+	settling(nowMs) {
+		if (this.covered || this.ctx.loading || calibrationUi.bootPending) return true;
+		if (nowMs - this.focus.focusStartTime < this.focus.focusDurationMs) return true;
+		if (this.jumpJd !== null || this.seekAwaitsData) return true;
+		if (this.focusLoads > 0 || this.systemData.isLoading()) return true;
+		for (const bo of this.bodyObjects.values()) if (bo.group.visible && bodyLoading(bo)) return true;
+		return false;
+	}
 	syncSceneSamples(insideShell) {
 		const target = this.composer.readBuffer;
 		const samples = insideShell ? 0 : Math.min(this.tier.sceneSamples, this.maxSceneSamples);
@@ -28167,11 +28229,14 @@ var SceneRenderer = class SceneRenderer {
 		if (nowMs - this.focus.focusStartTime < this.focus.focusDurationMs || this.focusKey() !== this.lastRenderedFocusKey || this.ctx.bodies.minorStreaming || this.pointClouds.hasPendingSceneAdds() || this.systemData.hasPendingUnloads()) return true;
 		if (this.covered) return false;
 		if (this.frameIndex - this.lastRenderedFrame >= SceneRenderer.IDLE_HEARTBEAT_FRAMES) return true;
-		const cam = this.camera;
-		if (cam.position.distanceToSquared(this.lastRenderedCamPos) > cam.position.lengthSq() * 1e-10 || 8 * (1 - Math.abs(cam.quaternion.dot(this.lastRenderedCamQuat))) > 1e-8 || this.frameIndex < this.wakeUntilFrame || this.haloDebug.active) return true;
+		if (this.cameraMovedFrom(this.lastRenderedCamPos, this.lastRenderedCamQuat) || this.frameIndex < this.wakeUntilFrame || this.haloDebug.active) return true;
 		if (this.clock.jd === this.lastRenderedJd) return false;
 		return Math.abs(this.clock.timeScale) > 1 || nowMs - this.lastRenderMs >= SceneRenderer.REALTIME_FRAME_MS;
 	}
+	cameraMovedFrom(pos, quat) {
+		const cam = this.camera;
+		return !(cam.position.distanceToSquared(pos) <= cam.position.lengthSq() * 1e-10 && 8 * (1 - Math.abs(cam.quaternion.dot(quat))) <= 1e-8);
+	}
 	onControlsEnd = () => {
 		this.pendingUrlWrite = true;
 		this.focusController.clearPendingInitialView();
@@ -28187,13 +28252,15 @@ var SceneRenderer = class SceneRenderer {
 	maybeLoadTexture(body) {
 		const bo = this.bodyObjects.get(body.data.id);
 		if (!bo) return;
+		this.focusLoads += 2;
+		const done = () => this.focusLoads--;
 		loadBodyTexture(bo, this.textureLoader, this.sceneJd, this.scene, this.renderer.capabilities.maxTextureSize, this.ctx).then(() => {
 			if (this.focusController.current?.data.id !== body.data.id) return;
 			if (body.orientation && bo.mesh) {
 				applyOrientation(bo.mesh, body.orientation, this.sceneJd, body.nutPrec);
 				this.focusController.reapplyInitialViewIfPending();
 			}
-		});
+		}).finally(done);
 		loadBodyModel(bo, this.modelScene, this.ctx).then(() => {
 			if (this.focusController.current?.data.id === bo.body.data.id) this.controls.minDistance = minCameraDistance(bo.body, modelMinRadiusKm(bo));
 			if (this.ctx.layers.skipped.has("nomenclature")) return;
@@ -28203,7 +28270,7 @@ var SceneRenderer = class SceneRenderer {
 			});
 		}).then(() => {
 			if (this.selectedFeatureId !== null) setActiveFeatureLabel(bo, this.selectedFeatureId);
-		});
+		}).finally(done);
 	}
 	reapplyBodyLayers() {
 		const focused = this.focusController.current;
@@ -28661,7 +28728,8 @@ var SceneRenderer = class SceneRenderer {
 	setCovered(covered) {
 		if (this.covered === covered) return;
 		this.covered = covered;
-		if (!covered) this.invalidate();
+		if (covered) this.atRest = false;
+		else this.invalidate();
 	}
 	isContextLost() {
 		return this.renderer.getContext().isContextLost();
@@ -28754,13 +28822,6 @@ function disposeTexture(value) {
 	if (value && typeof value === "object" && value.isTexture) value.dispose();
 }
 
-//#endregion
-//#region src/lib/scene/perf/calibration-state.svelte.ts
-var calibrationUi = proxy({
-	progress: null,
-	bootPending: false
-});
-
 //#endregion
 //#region src/lib/scene/perf/atmosphere-benchmark.ts
 var EARTH_RADIUS_KM = 6371;
@@ -31223,6 +31284,7 @@ var SpaceMap = class {
 		clock: /* @__PURE__ */ new Set(),
 		loading: /* @__PURE__ */ new Set(),
 		progress: /* @__PURE__ */ new Set(),
+		idle: /* @__PURE__ */ new Set(),
 		error: /* @__PURE__ */ new Set(),
 		datastale: /* @__PURE__ */ new Set(),
 		notice: /* @__PURE__ */ new Set(),
@@ -31494,6 +31556,7 @@ var SpaceMap = class {
 					dtMs
 				});
 			},
+			onIdle: () => this.emit("idle"),
 			onCameraPosition: (latitude, longitude, zoom) => {
 				const body = this.focusedBody?.data.id;
 				if (body === void 0) return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "spacemap",
-	"version": "0.1.16",
+	"version": "0.1.17",
 	"description": "The map of the Solar System from spacemap.co, on your website!",
 	"keywords": ["solar system", "spacecraft", "orbits", "map", "three.js"],
 	"homepage": "https://spacemap.co",