@thatopen/components 2.4.10 → 2.4.11

package/dist/core/Components/index.d.ts

@@ -6,7 +6,7 @@ export declare class Components implements Disposable {
     /**
      * The version of the @thatopen/components library.
      */
-    static readonly release = "2.4.10";
+    static readonly release = "2.4.11";
     /** {@link Disposable.onDisposed} */
     readonly onDisposed: Event<void>;
     /**

package/dist/index.cjs

@@ -6609,7 +6609,7 @@ const _Components = class _Components {
 /**
  * The version of the @thatopen/components library.
  */
-__publicField(_Components, "release", "2.4.10");
+__publicField(_Components, "release", "2.4.11");
 let Components = _Components;
 class SimpleWorld extends Base {
   constructor() {
@@ -7179,24 +7179,20 @@ const ACTION = Object.freeze({
   NONE: 0,
   ROTATE: 1,
   TRUCK: 2,
-  SCREEN_PAN: 4,
-  OFFSET: 8,
-  DOLLY: 16,
-  ZOOM: 32,
-  TOUCH_ROTATE: 64,
-  TOUCH_TRUCK: 128,
-  TOUCH_SCREEN_PAN: 256,
-  TOUCH_OFFSET: 512,
-  TOUCH_DOLLY: 1024,
-  TOUCH_ZOOM: 2048,
-  TOUCH_DOLLY_TRUCK: 4096,
-  TOUCH_DOLLY_SCREEN_PAN: 8192,
-  TOUCH_DOLLY_OFFSET: 16384,
-  TOUCH_DOLLY_ROTATE: 32768,
-  TOUCH_ZOOM_TRUCK: 65536,
-  TOUCH_ZOOM_OFFSET: 131072,
-  TOUCH_ZOOM_SCREEN_PAN: 262144,
-  TOUCH_ZOOM_ROTATE: 524288
+  OFFSET: 4,
+  DOLLY: 8,
+  ZOOM: 16,
+  TOUCH_ROTATE: 32,
+  TOUCH_TRUCK: 64,
+  TOUCH_OFFSET: 128,
+  TOUCH_DOLLY: 256,
+  TOUCH_ZOOM: 512,
+  TOUCH_DOLLY_TRUCK: 1024,
+  TOUCH_DOLLY_OFFSET: 2048,
+  TOUCH_DOLLY_ROTATE: 4096,
+  TOUCH_ZOOM_TRUCK: 8192,
+  TOUCH_ZOOM_OFFSET: 16384,
+  TOUCH_ZOOM_ROTATE: 32768
 });
 const DOLLY_DIRECTION = {
   NONE: 0,
@@ -7396,7 +7392,7 @@ class EventDispatcher {
   }
 }
 var _a;
-const VERSION = "2.10.1";
+const VERSION = "2.9.0";
 const TOUCH_DOLLY_FACTOR = 1 / 8;
 const isMac = /Mac/.test((_a = globalThis === null || globalThis === void 0 ? void 0 : globalThis.navigator) === null || _a === void 0 ? void 0 : _a.platform);
 let THREE;
@@ -7495,12 +7491,6 @@ class CameraControls extends EventDispatcher {
   static get ACTION() {
     return ACTION;
   }
-  /**
-   * @deprecated Use `cameraControls.mouseButtons.left = CameraControls.ACTION.SCREEN_PAN` instead.
-   */
-  set verticalDragToForward(_) {
-    console.warn("camera-controls: `verticalDragToForward` was removed. Use `mouseButtons.left = CameraControls.ACTION.SCREEN_PAN` instead.");
-  }
   /**
    * Creates a `CameraControls` instance.
    *
@@ -7539,6 +7529,7 @@ class CameraControls extends EventDispatcher {
     this.truckSpeed = 2;
     this.dollyToCursor = false;
     this.dragToOffset = false;
+    this.verticalDragToForward = false;
     this.boundaryFriction = 0;
     this.restThreshold = 0.01;
     this.colliderMeshes = [];
@@ -7571,7 +7562,7 @@ class CameraControls extends EventDispatcher {
     this._targetVelocity = new THREE.Vector3();
     this._focalOffsetVelocity = new THREE.Vector3();
     this._zoomVelocity = { value: 0 };
-    this._truckInternal = (deltaX, deltaY, dragToOffset, screenSpacePanning) => {
+    this._truckInternal = (deltaX, deltaY, dragToOffset) => {
       let truckX;
       let pedestalY;
       if (isPerspectiveCamera(this._camera)) {
@@ -7582,12 +7573,12 @@ class CameraControls extends EventDispatcher {
         pedestalY = this.truckSpeed * deltaY * targetDistance / this._elementRect.height;
       } else if (isOrthographicCamera(this._camera)) {
         const camera2 = this._camera;
-        truckX = this.truckSpeed * deltaX * (camera2.right - camera2.left) / camera2.zoom / this._elementRect.width;
-        pedestalY = this.truckSpeed * deltaY * (camera2.top - camera2.bottom) / camera2.zoom / this._elementRect.height;
+        truckX = deltaX * (camera2.right - camera2.left) / camera2.zoom / this._elementRect.width;
+        pedestalY = deltaY * (camera2.top - camera2.bottom) / camera2.zoom / this._elementRect.height;
       } else {
         return;
       }
-      if (screenSpacePanning) {
+      if (this.verticalDragToForward) {
         dragToOffset ? this.setFocalOffset(this._focalOffsetEnd.x + truckX, this._focalOffsetEnd.y, this._focalOffsetEnd.z, true) : this.truck(truckX, 0, true);
         this.forward(-pedestalY, true);
       } else {
@@ -7790,7 +7781,7 @@ class CameraControls extends EventDispatcher {
         lastScrollTimeStamp = now;
       }
       const deltaYFactor = isMac ? -1 : -3;
-      const delta = event.deltaMode === 1 || event.ctrlKey ? event.deltaY / deltaYFactor : event.deltaY / (deltaYFactor * 10);
+      const delta = event.deltaMode === 1 ? event.deltaY / deltaYFactor : event.deltaY / (deltaYFactor * 10);
       const x = this.dollyToCursor ? (event.clientX - this._elementRect.x) / this._elementRect.width * 2 - 1 : 0;
       const y = this.dollyToCursor ? (event.clientY - this._elementRect.y) / this._elementRect.height * -2 + 1 : 0;
       switch (this.mouseButtons.wheel) {
@@ -7800,17 +7791,12 @@ class CameraControls extends EventDispatcher {
           break;
         }
         case ACTION.TRUCK: {
-          this._truckInternal(event.deltaX, event.deltaY, false, false);
-          this._isUserControllingTruck = true;
-          break;
-        }
-        case ACTION.SCREEN_PAN: {
-          this._truckInternal(event.deltaX, event.deltaY, false, true);
+          this._truckInternal(event.deltaX, event.deltaY, false);
           this._isUserControllingTruck = true;
           break;
         }
         case ACTION.OFFSET: {
-          this._truckInternal(event.deltaX, event.deltaY, true, false);
+          this._truckInternal(event.deltaX, event.deltaY, true);
           this._isUserControllingOffset = true;
           break;
         }
@@ -7890,15 +7876,15 @@ class CameraControls extends EventDispatcher {
         this._thetaVelocity.value = 0;
         this._phiVelocity.value = 0;
       }
-      if ((this._state & ACTION.TRUCK) === ACTION.TRUCK || (this._state & ACTION.SCREEN_PAN) === ACTION.SCREEN_PAN || (this._state & ACTION.TOUCH_TRUCK) === ACTION.TOUCH_TRUCK || (this._state & ACTION.TOUCH_SCREEN_PAN) === ACTION.TOUCH_SCREEN_PAN || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_DOLLY_SCREEN_PAN) === ACTION.TOUCH_DOLLY_SCREEN_PAN || (this._state & ACTION.TOUCH_ZOOM_TRUCK) === ACTION.TOUCH_ZOOM_TRUCK || (this._state & ACTION.TOUCH_ZOOM_SCREEN_PAN) === ACTION.TOUCH_DOLLY_SCREEN_PAN) {
+      if ((this._state & ACTION.TRUCK) === ACTION.TRUCK || (this._state & ACTION.TOUCH_TRUCK) === ACTION.TOUCH_TRUCK || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_ZOOM_TRUCK) === ACTION.TOUCH_ZOOM_TRUCK) {
         this._targetEnd.copy(this._target);
         this._targetVelocity.set(0, 0, 0);
       }
-      if ((this._state & ACTION.DOLLY) === ACTION.DOLLY || (this._state & ACTION.TOUCH_DOLLY) === ACTION.TOUCH_DOLLY || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_DOLLY_SCREEN_PAN) === ACTION.TOUCH_DOLLY_SCREEN_PAN || (this._state & ACTION.TOUCH_DOLLY_OFFSET) === ACTION.TOUCH_DOLLY_OFFSET || (this._state & ACTION.TOUCH_DOLLY_ROTATE) === ACTION.TOUCH_DOLLY_ROTATE) {
+      if ((this._state & ACTION.DOLLY) === ACTION.DOLLY || (this._state & ACTION.TOUCH_DOLLY) === ACTION.TOUCH_DOLLY || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_DOLLY_OFFSET) === ACTION.TOUCH_DOLLY_OFFSET || (this._state & ACTION.TOUCH_DOLLY_ROTATE) === ACTION.TOUCH_DOLLY_ROTATE) {
         this._sphericalEnd.radius = this._spherical.radius;
         this._radiusVelocity.value = 0;
       }
-      if ((this._state & ACTION.ZOOM) === ACTION.ZOOM || (this._state & ACTION.TOUCH_ZOOM) === ACTION.TOUCH_ZOOM || (this._state & ACTION.TOUCH_ZOOM_TRUCK) === ACTION.TOUCH_ZOOM_TRUCK || (this._state & ACTION.TOUCH_ZOOM_SCREEN_PAN) === ACTION.TOUCH_ZOOM_SCREEN_PAN || (this._state & ACTION.TOUCH_ZOOM_OFFSET) === ACTION.TOUCH_ZOOM_OFFSET || (this._state & ACTION.TOUCH_ZOOM_ROTATE) === ACTION.TOUCH_ZOOM_ROTATE) {
+      if ((this._state & ACTION.ZOOM) === ACTION.ZOOM || (this._state & ACTION.TOUCH_ZOOM) === ACTION.TOUCH_ZOOM || (this._state & ACTION.TOUCH_ZOOM_TRUCK) === ACTION.TOUCH_ZOOM_TRUCK || (this._state & ACTION.TOUCH_ZOOM_OFFSET) === ACTION.TOUCH_ZOOM_OFFSET || (this._state & ACTION.TOUCH_ZOOM_ROTATE) === ACTION.TOUCH_ZOOM_ROTATE) {
         this._zoomEnd = this._zoom;
         this._zoomVelocity.value = 0;
       }
@@ -7934,7 +7920,7 @@ class CameraControls extends EventDispatcher {
           this._isUserControllingZoom = true;
         }
       }
-      if ((this._state & ACTION.TOUCH_DOLLY) === ACTION.TOUCH_DOLLY || (this._state & ACTION.TOUCH_ZOOM) === ACTION.TOUCH_ZOOM || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_ZOOM_TRUCK) === ACTION.TOUCH_ZOOM_TRUCK || (this._state & ACTION.TOUCH_DOLLY_SCREEN_PAN) === ACTION.TOUCH_DOLLY_SCREEN_PAN || (this._state & ACTION.TOUCH_ZOOM_SCREEN_PAN) === ACTION.TOUCH_ZOOM_SCREEN_PAN || (this._state & ACTION.TOUCH_DOLLY_OFFSET) === ACTION.TOUCH_DOLLY_OFFSET || (this._state & ACTION.TOUCH_ZOOM_OFFSET) === ACTION.TOUCH_ZOOM_OFFSET || (this._state & ACTION.TOUCH_DOLLY_ROTATE) === ACTION.TOUCH_DOLLY_ROTATE || (this._state & ACTION.TOUCH_ZOOM_ROTATE) === ACTION.TOUCH_ZOOM_ROTATE) {
+      if ((this._state & ACTION.TOUCH_DOLLY) === ACTION.TOUCH_DOLLY || (this._state & ACTION.TOUCH_ZOOM) === ACTION.TOUCH_ZOOM || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_ZOOM_TRUCK) === ACTION.TOUCH_ZOOM_TRUCK || (this._state & ACTION.TOUCH_DOLLY_OFFSET) === ACTION.TOUCH_DOLLY_OFFSET || (this._state & ACTION.TOUCH_ZOOM_OFFSET) === ACTION.TOUCH_ZOOM_OFFSET || (this._state & ACTION.TOUCH_DOLLY_ROTATE) === ACTION.TOUCH_DOLLY_ROTATE || (this._state & ACTION.TOUCH_ZOOM_ROTATE) === ACTION.TOUCH_ZOOM_ROTATE) {
         const dx = _v2$1.x - this._activePointers[1].clientX;
         const dy = _v2$1.y - this._activePointers[1].clientY;
         const distance = Math.sqrt(dx * dx + dy * dy);
@@ -7942,7 +7928,7 @@ class CameraControls extends EventDispatcher {
         dollyStart.set(0, distance);
         const dollyX = this.dollyToCursor ? (lastDragPosition.x - this._elementRect.x) / this._elementRect.width * 2 - 1 : 0;
         const dollyY = this.dollyToCursor ? (lastDragPosition.y - this._elementRect.y) / this._elementRect.height * -2 + 1 : 0;
-        if ((this._state & ACTION.TOUCH_DOLLY) === ACTION.TOUCH_DOLLY || (this._state & ACTION.TOUCH_DOLLY_ROTATE) === ACTION.TOUCH_DOLLY_ROTATE || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_DOLLY_SCREEN_PAN) === ACTION.TOUCH_DOLLY_SCREEN_PAN || (this._state & ACTION.TOUCH_DOLLY_OFFSET) === ACTION.TOUCH_DOLLY_OFFSET) {
+        if ((this._state & ACTION.TOUCH_DOLLY) === ACTION.TOUCH_DOLLY || (this._state & ACTION.TOUCH_DOLLY_ROTATE) === ACTION.TOUCH_DOLLY_ROTATE || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_DOLLY_OFFSET) === ACTION.TOUCH_DOLLY_OFFSET) {
           this._dollyInternal(dollyDelta * TOUCH_DOLLY_FACTOR, dollyX, dollyY);
           this._isUserControllingDolly = true;
         } else {
@@ -7951,15 +7937,11 @@ class CameraControls extends EventDispatcher {
         }
       }
       if ((this._state & ACTION.TRUCK) === ACTION.TRUCK || (this._state & ACTION.TOUCH_TRUCK) === ACTION.TOUCH_TRUCK || (this._state & ACTION.TOUCH_DOLLY_TRUCK) === ACTION.TOUCH_DOLLY_TRUCK || (this._state & ACTION.TOUCH_ZOOM_TRUCK) === ACTION.TOUCH_ZOOM_TRUCK) {
-        this._truckInternal(deltaX, deltaY, false, false);
-        this._isUserControllingTruck = true;
-      }
-      if ((this._state & ACTION.SCREEN_PAN) === ACTION.SCREEN_PAN || (this._state & ACTION.TOUCH_SCREEN_PAN) === ACTION.TOUCH_SCREEN_PAN || (this._state & ACTION.TOUCH_DOLLY_SCREEN_PAN) === ACTION.TOUCH_DOLLY_SCREEN_PAN || (this._state & ACTION.TOUCH_ZOOM_SCREEN_PAN) === ACTION.TOUCH_ZOOM_SCREEN_PAN) {
-        this._truckInternal(deltaX, deltaY, false, true);
+        this._truckInternal(deltaX, deltaY, false);
         this._isUserControllingTruck = true;
       }
       if ((this._state & ACTION.OFFSET) === ACTION.OFFSET || (this._state & ACTION.TOUCH_OFFSET) === ACTION.TOUCH_OFFSET || (this._state & ACTION.TOUCH_DOLLY_OFFSET) === ACTION.TOUCH_DOLLY_OFFSET || (this._state & ACTION.TOUCH_ZOOM_OFFSET) === ACTION.TOUCH_ZOOM_OFFSET) {
-        this._truckInternal(deltaX, deltaY, true, false);
+        this._truckInternal(deltaX, deltaY, true);
         this._isUserControllingOffset = true;
       }
       this.dispatchEvent({ type: "control" });
@@ -9022,6 +9004,7 @@ class CameraControls extends EventDispatcher {
     this._camera.lookAt(this._target);
     const affectOffset = !approxZero(this._focalOffset.x) || !approxZero(this._focalOffset.y) || !approxZero(this._focalOffset.z);
     if (affectOffset) {
+      this._camera.updateMatrixWorld();
       _xColumn.setFromMatrixColumn(this._camera.matrix, 0);
       _yColumn.setFromMatrixColumn(this._camera.matrix, 1);
       _zColumn.setFromMatrixColumn(this._camera.matrix, 2);
@@ -9030,7 +9013,6 @@ class CameraControls extends EventDispatcher {
       _zColumn.multiplyScalar(this._focalOffset.z);
       _v3A.copy(_xColumn).add(_yColumn).add(_zColumn);
       this._camera.position.add(_v3A);
-      this._camera.updateMatrixWorld();
     }
     if (this._boundaryEnclosesCamera) {
       this._encloseToBoundary(this._camera.position.copy(this._target), _v3A.setFromSpherical(this._spherical).applyQuaternion(this._yAxisUpSpaceInverse), 1);
@@ -9075,6 +9057,7 @@ class CameraControls extends EventDispatcher {
       dollySpeed: this.dollySpeed,
       truckSpeed: this.truckSpeed,
       dollyToCursor: this.dollyToCursor,
+      verticalDragToForward: this.verticalDragToForward,
       target: this._targetEnd.toArray(),
       position: _v3A.setFromSpherical(this._sphericalEnd).add(this._targetEnd).toArray(),
       zoom: this._zoomEnd,
@@ -9107,6 +9090,7 @@ class CameraControls extends EventDispatcher {
     this.dollySpeed = obj.dollySpeed;
     this.truckSpeed = obj.truckSpeed;
     this.dollyToCursor = obj.dollyToCursor;
+    this.verticalDragToForward = obj.verticalDragToForward;
     this._target0.fromArray(obj.target0);
     this._position0.fromArray(obj.position0);
     this._zoom0 = obj.zoom0;
@@ -9322,8 +9306,6 @@ class CameraControls extends EventDispatcher {
       if (!object.isMesh)
         return;
       const mesh = object;
-      if (!mesh.geometry)
-        return;
       const geometry = mesh.geometry.clone();
       geometry.applyMatrix4(mesh.matrixWorld);
       const bufferGeometry = geometry;