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

package/dist/controllers/terrain-controller.js

@@ -0,0 +1,108 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import MapController from "./map-controller.js";
+/**
+ * Controller that extends MapController with terrain-aware behavior.
+ * The camera smoothly follows terrain elevation during pan/zoom.
+ */
+export default class TerrainController extends MapController {
+    constructor() {
+        super(...arguments);
+        /** Cached terrain altitude from depth picking at viewport center (smoothed) */
+        this._terrainAltitude = undefined;
+        /** Raw (unsmoothed) terrain altitude from latest pick */
+        this._terrainAltitudeTarget = undefined;
+    }
+    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
+            }));
+        }
+    }
+    updateViewport(newControllerState, extraProps = null, interactionState = {}) {
+        const SMOOTHING = 0.05;
+        // No interactions yet, do not update
+        if (this._terrainAltitudeTarget === undefined)
+            return;
+        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;
+        }
+        const viewportProps = newControllerState.getViewportProps();
+        const pos = viewportProps.position || [0, 0, 0];
+        extraProps = {
+            ...extraProps,
+            position: [pos[0], pos[1], this._terrainAltitude]
+        };
+        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;
+        }
+        const { x, y, width, height } = this.props;
+        const pickResult = this.pickPosition(x + width / 2, y + height / 2);
+        if (pickResult?.coordinate && pickResult.coordinate.length >= 3) {
+            this._terrainAltitudeTarget = pickResult.coordinate[2];
+        }
+    }
+    /**
+     * Utility function to return viewport that looks the same, but with
+     * a position shifted to [0, 0, altitude]
+     */
+    _rebaseViewport(altitude, newControllerState, extraProps) {
+        const viewportProps = newControllerState.getViewportProps();
+        const oldViewport = this.makeViewport({ ...viewportProps, position: [0, 0, 0] });
+        const oldCameraPos = oldViewport.cameraPosition;
+        const centerZOffset = altitude * oldViewport.distanceScales.unitsPerMeter[2];
+        const cameraHeightAboveOldCenter = oldCameraPos[2];
+        const newCameraHeightAboveCenter = cameraHeightAboveOldCenter - centerZOffset;
+        if (newCameraHeightAboveCenter <= 0) {
+            return extraProps;
+        }
+        const zoomDelta = Math.log2(cameraHeightAboveOldCenter / newCameraHeightAboveCenter);
+        const newZoom = viewportProps.zoom + zoomDelta;
+        const newViewport = this.makeViewport({
+            ...viewportProps,
+            zoom: newZoom,
+            position: [0, 0, altitude]
+        });
+        const { width, height } = viewportProps;
+        const screenCenter = [width / 2, height / 2];
+        const worldPoint = oldViewport.unproject(screenCenter, { targetZ: altitude });
+        if (worldPoint &&
+            'panByPosition3D' in newViewport &&
+            typeof newViewport.panByPosition3D === 'function') {
+            const adjusted = newViewport.panByPosition3D(worldPoint, screenCenter);
+            return { ...extraProps, position: [0, 0, altitude], zoom: newZoom, ...adjusted };
+        }
+        return extraProps;
+    }
+}
+//# sourceMappingURL=terrain-controller.js.map

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

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

package/dist/controllers/view-state.d.ts

@@ -2,7 +2,8 @@ import type Viewport from "../viewports/viewport.js";
 export default abstract class ViewState<T, Props extends Record<string, any>, State extends Record<string, any>> implements IViewState<T> {
     private _viewportProps;
     private _state;
-    constructor(props: Required<Props>, state: State);
+    makeViewport: (props: Record<string, any>) => Viewport;
+    constructor(props: Required<Props>, state: State, makeViewport: (props: Record<string, any>) => Viewport);
     getViewportProps(): Required<Props>;
     getState(): State;
     abstract applyConstraints(props: Required<Props>): Required<Props>;

package/dist/controllers/view-state.d.ts.map

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

package/dist/controllers/view-state.js

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 export default class ViewState {
-    constructor(props, state) {
+    constructor(props, state, makeViewport) {
+        this.makeViewport = makeViewport;
         this._viewportProps = this.applyConstraints(props);
         this._state = state;
     }

package/dist/controllers/view-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"view-state.js","sourceRoot":"","sources":["../../src/controllers/view-state.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,CAAC,OAAO,OAAgB,SAAS;IASrC,YAAY,KAAsB,EAAE,KAAY;QAC9C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CAsCF"}
+{"version":3,"file":"view-state.js","sourceRoot":"","sources":["../../src/controllers/view-state.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,CAAC,OAAO,OAAgB,SAAS;IAWrC,YACE,KAAsB,EACtB,KAAY,EACZ,YAAsD;QAEtD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CAsCF"}

package/dist/debug/loggers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loggers.d.ts","sourceRoot":"","sources":["../../src/debug/loggers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AAkBvC,eAAO,MAAM,UAAU,QAAS,GAAG,KAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAyH3D,CAAC"}
+{"version":3,"file":"loggers.d.ts","sourceRoot":"","sources":["../../src/debug/loggers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,eAAe,CAAC;AAkBvC,eAAO,MAAM,UAAU,QAAS,GAAG,KAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAqH3D,CAAC"}

package/dist/debug/loggers.js

@@ -89,7 +89,7 @@ export const getLoggers = (log) => ({
     },
     /* Render events */
     'deckRenderer.renderLayers': (deckRenderer, renderStats, opts) => {
-        const { pass, redrawReason, stats } = opts;
+        const { pass, redrawReason } = opts;
         for (const status of renderStats) {
             const { totalCount, visibleCount, compositeCount, pickableCount } = status;
             const primitiveCount = totalCount - compositeCount;
@@ -97,9 +97,6 @@ export const getLoggers = (log) => ({
             log.log(LOG_LEVEL_DRAW, `RENDER #${deckRenderer.renderCount} \
   ${visibleCount} (of ${totalCount} layers) to ${pass} because ${redrawReason} \
   (${hiddenCount} hidden, ${compositeCount} composite ${pickableCount} pickable)`)();
-            if (stats) {
-                stats.get('Redraw Layers').add(visibleCount);
-            }
         }
     }
 });

package/dist/debug/loggers.js.map

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