@deck.gl/core 9.3.0-alpha.3 → 9.3.0-alpha.5

package/dist/controllers/terrain-controller.d.ts

@@ -1,7 +1,6 @@
 import MapController from "./map-controller.js";
 import { MapState, MapStateProps } from "./map-controller.js";
 import type { ControllerProps, InteractionState } from "./controller.js";
-import type { MjolnirGestureEvent, MjolnirWheelEvent } from 'mjolnir.js';
 /**
  * Controller that extends MapController with terrain-aware behavior.
  * The camera smoothly follows terrain elevation during pan/zoom.
@@ -11,18 +10,20 @@ export default class TerrainController extends MapController {
     private _terrainAltitude?;
     /** Raw (unsmoothed) terrain altitude from latest pick */
     private _terrainAltitudeTarget?;
+    /** rAF handle for periodic terrain altitude picking */
+    private _pickFrameId;
+    /** Timestamp of last pick */
+    private _lastPickTime;
     setProps(props: ControllerProps & MapStateProps & {
         rotationPivot?: 'center' | '2d' | '3d';
         getAltitude?: (pos: [number, number]) => number | undefined;
     }): void;
+    finalize(): void;
     protected updateViewport(newControllerState: MapState, extraProps?: Record<string, any> | null, interactionState?: InteractionState): void;
-    protected _onPanStart(event: MjolnirGestureEvent): boolean;
-    protected _onWheel(event: MjolnirWheelEvent): boolean;
-    protected _onDoubleClick(event: MjolnirGestureEvent): boolean;
     private _pickTerrainCenterAltitude;
     /**
-     * Utility function to return viewport that looks the same, but with
-     * a position shifted to [0, 0, altitude]
+     * Compute viewport adjustments to keep the view visually the same
+     * when shifting position to [0, 0, altitude].
      */
     private _rebaseViewport;
 }

package/dist/controllers/terrain-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terrain-controller.d.ts","sourceRoot":"","sources":["../../src/controllers/terrain-controller.ts"],"names":[],"mappings":"AAIA,OAAO,aAAa,4BAAyB;AAC7C,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,4BAAyB;AACzD,OAAO,KAAK,EAAC,eAAe,EAAE,gBAAgB,EAAC,wBAAqB;AACpE,OAAO,KAAK,EAAC,mBAAmB,EAAE,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAEvE;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,aAAa;IAC1D,+EAA+E;IAC/E,OAAO,CAAC,gBAAgB,CAAC,CAAqB;IAC9C,yDAAyD;IACzD,OAAO,CAAC,sBAAsB,CAAC,CAAqB;IAEpD,QAAQ,CACN,KAAK,EAAE,eAAe,GACpB,aAAa,GAAG;QACd,aAAa,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;QACvC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;KAC7D;IAoBL,SAAS,CAAC,cAAc,CACtB,kBAAkB,EAAE,QAAQ,EAC5B,UAAU,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAW,EAC7C,gBAAgB,GAAE,gBAAqB,GACtC,IAAI;IA6BP,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO;IAK1D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO;IAKrD,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO;IAK7D,OAAO,CAAC,0BAA0B;IAYlC;;;OAGG;IACH,OAAO,CAAC,eAAe;CAqCxB"}
+{"version":3,"file":"terrain-controller.d.ts","sourceRoot":"","sources":["../../src/controllers/terrain-controller.ts"],"names":[],"mappings":"AAIA,OAAO,aAAa,4BAAyB;AAC7C,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,4BAAyB;AACzD,OAAO,KAAK,EAAC,eAAe,EAAE,gBAAgB,EAAC,wBAAqB;AAGpE;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,aAAa;IAC1D,+EAA+E;IAC/E,OAAO,CAAC,gBAAgB,CAAC,CAAqB;IAC9C,yDAAyD;IACzD,OAAO,CAAC,sBAAsB,CAAC,CAAqB;IACpD,uDAAuD;IACvD,OAAO,CAAC,YAAY,CAAuB;IAC3C,6BAA6B;IAC7B,OAAO,CAAC,aAAa,CAAa;IAElC,QAAQ,CACN,KAAK,EAAE,eAAe,GACpB,aAAa,GAAG;QACd,aAAa,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAAC;QACvC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,MAAM,GAAG,SAAS,CAAC;KAC7D;IA0CL,QAAQ;IAQR,SAAS,CAAC,cAAc,CACtB,kBAAkB,EAAE,QAAQ,EAC5B,UAAU,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAW,EAC7C,gBAAgB,GAAE,gBAAqB,GACtC,IAAI;IAqBP,OAAO,CAAC,0BAA0B;IAWlC;;;OAGG;IACH,OAAO,CAAC,eAAe;CAoCxB"}

package/dist/controllers/terrain-controller.js

@@ -13,34 +13,66 @@ export default class TerrainController extends MapController {
         this._terrainAltitude = undefined;
         /** Raw (unsmoothed) terrain altitude from latest pick */
         this._terrainAltitudeTarget = undefined;
+        /** rAF handle for periodic terrain altitude picking */
+        this._pickFrameId = null;
+        /** Timestamp of last pick */
+        this._lastPickTime = 0;
     }
     setProps(props) {
         super.setProps({ rotationPivot: '3d', ...props });
-        // Drive smoothing animation when terrain altitude hasn't converged yet.
-        if (this._terrainAltitude !== undefined &&
-            this._terrainAltitudeTarget !== undefined &&
-            Math.abs(this._terrainAltitudeTarget - this._terrainAltitude) > 0.01) {
-            this.updateViewport(new this.ControllerState({
-                makeViewport: this.makeViewport,
-                ...this.props,
-                ...this.state
-            }));
+        // Periodically pick terrain altitude at the viewport center using rAF.
+        // Keeps the altitude cache warm so interactions don't need expensive
+        // synchronous GPU readbacks. rAF naturally pauses when tab is backgrounded.
+        if (this._pickFrameId === null) {
+            const loop = () => {
+                const now = Date.now();
+                if (now - this._lastPickTime > 500 && !this.isDragging()) {
+                    this._lastPickTime = now;
+                    this._pickTerrainCenterAltitude();
+                    // On first successful pick, rebase viewport to terrain altitude.
+                    // Runs from rAF (outside React render) so onViewStateChange won't loop.
+                    if (this._terrainAltitude === undefined && this._terrainAltitudeTarget !== undefined) {
+                        this._terrainAltitude = this._terrainAltitudeTarget;
+                        const controllerState = new this.ControllerState({
+                            makeViewport: this.makeViewport,
+                            ...this.props,
+                            ...this.state
+                        });
+                        const rebaseProps = this._rebaseViewport(this._terrainAltitudeTarget, controllerState);
+                        if (rebaseProps) {
+                            // Build a controllerState that includes the rebase adjustments so
+                            // internal state matches the rebased viewState after React round-trip.
+                            const rebasedState = new this.ControllerState({
+                                makeViewport: this.makeViewport,
+                                ...this.props,
+                                ...this.state,
+                                ...rebaseProps
+                            });
+                            super.updateViewport(rebasedState);
+                        }
+                    }
+                }
+                this._pickFrameId = requestAnimationFrame(loop);
+            };
+            this._pickFrameId = requestAnimationFrame(loop);
         }
     }
+    finalize() {
+        if (this._pickFrameId !== null) {
+            cancelAnimationFrame(this._pickFrameId);
+            this._pickFrameId = null;
+        }
+        super.finalize();
+    }
     updateViewport(newControllerState, extraProps = null, interactionState = {}) {
-        const SMOOTHING = 0.05;
-        // No interactions yet, do not update
-        if (this._terrainAltitudeTarget === undefined)
-            return;
+        // Not initialized yet — pass through to MapController
         if (this._terrainAltitude === undefined) {
-            // First interaction, rebase to avoid jump
-            this._terrainAltitude = this._terrainAltitudeTarget;
-            extraProps = this._rebaseViewport(this._terrainAltitudeTarget, newControllerState, extraProps);
-        }
-        else {
-            // Standard interaction, smoothly blend target into actual altitude
-            this._terrainAltitude += (this._terrainAltitudeTarget - this._terrainAltitude) * SMOOTHING;
+            super.updateViewport(newControllerState, extraProps, interactionState);
+            return;
         }
+        // Smoothly blend toward target altitude
+        const SMOOTHING = 0.05;
+        this._terrainAltitude += (this._terrainAltitudeTarget - this._terrainAltitude) * SMOOTHING;
         const viewportProps = newControllerState.getViewportProps();
         const pos = viewportProps.position || [0, 0, 0];
         extraProps = {
@@ -49,20 +81,7 @@ export default class TerrainController extends MapController {
         };
         super.updateViewport(newControllerState, extraProps, interactionState);
     }
-    _onPanStart(event) {
-        this._pickTerrainCenterAltitude();
-        return super._onPanStart(event);
-    }
-    _onWheel(event) {
-        this._pickTerrainCenterAltitude();
-        return super._onWheel(event);
-    }
-    _onDoubleClick(event) {
-        this._pickTerrainCenterAltitude();
-        return super._onDoubleClick(event);
-    }
     _pickTerrainCenterAltitude() {
-        // TODO use async picking?
         if (!this.pickPosition) {
             return;
         }
@@ -73,10 +92,10 @@ export default class TerrainController extends MapController {
         }
     }
     /**
-     * Utility function to return viewport that looks the same, but with
-     * a position shifted to [0, 0, altitude]
+     * Compute viewport adjustments to keep the view visually the same
+     * when shifting position to [0, 0, altitude].
      */
-    _rebaseViewport(altitude, newControllerState, extraProps) {
+    _rebaseViewport(altitude, newControllerState) {
         const viewportProps = newControllerState.getViewportProps();
         const oldViewport = this.makeViewport({ ...viewportProps, position: [0, 0, 0] });
         const oldCameraPos = oldViewport.cameraPosition;
@@ -84,7 +103,7 @@ export default class TerrainController extends MapController {
         const cameraHeightAboveOldCenter = oldCameraPos[2];
         const newCameraHeightAboveCenter = cameraHeightAboveOldCenter - centerZOffset;
         if (newCameraHeightAboveCenter <= 0) {
-            return extraProps;
+            return null;
         }
         const zoomDelta = Math.log2(cameraHeightAboveOldCenter / newCameraHeightAboveCenter);
         const newZoom = viewportProps.zoom + zoomDelta;
@@ -100,9 +119,9 @@ export default class TerrainController extends MapController {
             'panByPosition3D' in newViewport &&
             typeof newViewport.panByPosition3D === 'function') {
             const adjusted = newViewport.panByPosition3D(worldPoint, screenCenter);
-            return { ...extraProps, position: [0, 0, altitude], zoom: newZoom, ...adjusted };
+            return { position: [0, 0, altitude], zoom: newZoom, ...adjusted };
         }
-        return extraProps;
+        return null;
     }
 }
 //# sourceMappingURL=terrain-controller.js.map

package/dist/controllers/terrain-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"terrain-controller.js","sourceRoot":"","sources":["../../src/controllers/terrain-controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terrain-controller.js","sourceRoot":"","sources":["../../src/controllers/terrain-controller.ts"],"names":[],"mappings":"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"}