@d5techs/3dgs-lib 1.4.29 → 1.4.31

package/dist/3dgs-lib.js

@@ -623,7 +623,7 @@ const _OrbitControls = class _OrbitControls {
     __publicField(this, "maxPhi", Math.PI - 0.01);
     // 灵敏度
     __publicField(this, "rotateSpeed", 5e-3);
-    __publicField(this, "zoomSpeed", 1e-3);
+    __publicField(this, "zoomSpeed", 15e-4);
     __publicField(this, "panSpeed", 5e-3);
     // 移动端触摸灵敏度
     __publicField(this, "touchZoomSpeed", 0.01);
@@ -635,10 +635,9 @@ const _OrbitControls = class _OrbitControls {
     __publicField(this, "isDragging", false);
     __publicField(this, "lastX", 0);
     __publicField(this, "lastY", 0);
-    // 待应用的增量（每帧全量应用后衰减，实现惯性）
+    // 待应用的增量（每帧全量应用后衰减，实现旋转/平移惯性）
     __publicField(this, "deltaTheta", 0);
     __publicField(this, "deltaPhi", 0);
-    __publicField(this, "deltaDistance", 0);
     __publicField(this, "deltaPanX", 0);
     __publicField(this, "deltaPanY", 0);
     __publicField(this, "deltaPanZ", 0);
@@ -737,9 +736,10 @@ const _OrbitControls = class _OrbitControls {
     const dx = -deltaX * scale;
     const dy = deltaY * scale;
     if (this.enableDamping) {
-      this.deltaPanX += dx * right[0] + dy * up[0];
-      this.deltaPanY += dx * right[1] + dy * up[1];
-      this.deltaPanZ += dx * right[2] + dy * up[2];
+      const d = this.dampingFactor;
+      this.deltaPanX += (dx * right[0] + dy * up[0]) * d;
+      this.deltaPanY += (dx * right[1] + dy * up[1]) * d;
+      this.deltaPanZ += (dx * right[2] + dy * up[2]) * d;
     } else {
       this.camera.target[0] += dx * right[0] + dy * up[0];
       this.camera.target[1] += dx * right[1] + dy * up[1];
@@ -760,8 +760,8 @@ const _OrbitControls = class _OrbitControls {
     this.lastY = e.clientY;
     if (e.buttons === 1) {
       if (this.enableDamping) {
-        this.deltaTheta += -deltaX * this.rotateSpeed;
-        this.deltaPhi += -deltaY * this.rotateSpeed;
+        this.deltaTheta += -deltaX * this.rotateSpeed * this.dampingFactor;
+        this.deltaPhi += -deltaY * this.rotateSpeed * this.dampingFactor;
       } else {
         this.theta -= deltaX * this.rotateSpeed;
         this.phi -= deltaY * this.rotateSpeed;
@@ -785,16 +785,11 @@ const _OrbitControls = class _OrbitControls {
     else if (e.deltaMode === 2) delta *= 800;
     const normalizedDelta = Math.sign(delta) * Math.min(Math.abs(delta), 120);
     const zoomDelta = normalizedDelta * this.zoomSpeed;
-    if (this.enableDamping) {
-      this.deltaDistance += zoomDelta;
-    } else {
-      this.distance *= Math.exp(zoomDelta);
-      this.distance = Math.max(
-        this.minDistance,
-        Math.min(this.maxDistance, this.distance)
-      );
-      this.applySpherical();
-    }
+    this.distance *= Math.exp(zoomDelta);
+    this.distance = Math.max(
+      this.minDistance,
+      Math.min(this.maxDistance, this.distance)
+    );
   }
   onKeyDown(e) {
     var _a2;
@@ -921,8 +916,8 @@ const _OrbitControls = class _OrbitControls {
       this.lastX = e.touches[0].clientX;
       this.lastY = e.touches[0].clientY;
       if (this.enableDamping) {
-        this.deltaTheta += -deltaX * this.rotateSpeed;
-        this.deltaPhi += -deltaY * this.rotateSpeed;
+        this.deltaTheta += -deltaX * this.rotateSpeed * this.dampingFactor;
+        this.deltaPhi += -deltaY * this.rotateSpeed * this.dampingFactor;
       } else {
         this.theta -= deltaX * this.rotateSpeed;
         this.phi -= deltaY * this.rotateSpeed;
@@ -934,15 +929,11 @@ const _OrbitControls = class _OrbitControls {
       const currentCenter = this.getTouchCenter(e.touches);
       if (this.lastTouchDistance > 0) {
         const ratio = currentDistance / this.lastTouchDistance;
-        if (this.enableDamping) {
-          this.deltaDistance += -Math.log(ratio);
-        } else {
-          this.distance /= ratio;
-          this.distance = Math.max(
-            this.minDistance,
-            Math.min(this.maxDistance, this.distance)
-          );
-        }
+        this.distance /= ratio;
+        this.distance = Math.max(
+          this.minDistance,
+          Math.min(this.maxDistance, this.distance)
+        );
       }
       const deltaX = currentCenter.x - this.lastTouchCenter.x;
       const deltaY = currentCenter.y - this.lastTouchCenter.y;
@@ -951,9 +942,10 @@ const _OrbitControls = class _OrbitControls {
       const dx = -deltaX * scale;
       const dy = deltaY * scale;
       if (this.enableDamping) {
-        this.deltaPanX += dx * right[0] + dy * up[0];
-        this.deltaPanY += dx * right[1] + dy * up[1];
-        this.deltaPanZ += dx * right[2] + dy * up[2];
+        const d = this.dampingFactor;
+        this.deltaPanX += (dx * right[0] + dy * up[0]) * d;
+        this.deltaPanY += (dx * right[1] + dy * up[1]) * d;
+        this.deltaPanZ += (dx * right[2] + dy * up[2]) * d;
       } else {
         this.camera.target[0] += dx * right[0] + dy * up[0];
         this.camera.target[1] += dx * right[1] + dy * up[1];
@@ -1015,15 +1007,6 @@ const _OrbitControls = class _OrbitControls {
       this.deltaPhi *= decay;
       if (Math.abs(this.deltaTheta) < EPS) this.deltaTheta = 0;
       if (Math.abs(this.deltaPhi) < EPS) this.deltaPhi = 0;
-      if (Math.abs(this.deltaDistance) > EPS) {
-        this.distance *= Math.exp(this.deltaDistance);
-        this.distance = Math.max(
-          this.minDistance,
-          Math.min(this.maxDistance, this.distance)
-        );
-        this.deltaDistance *= decay;
-        if (Math.abs(this.deltaDistance) < EPS) this.deltaDistance = 0;
-      }
       this.camera.target[0] += this.deltaPanX;
       this.camera.target[1] += this.deltaPanY;
       this.camera.target[2] += this.deltaPanZ;
@@ -1140,7 +1123,6 @@ const _OrbitControls = class _OrbitControls {
   clearVelocity() {
     this.deltaTheta = 0;
     this.deltaPhi = 0;
-    this.deltaDistance = 0;
     this.deltaPanX = 0;
     this.deltaPanY = 0;
     this.deltaPanZ = 0;