@d5techs/3dgs-lib 1.4.28 → 1.4.30

package/dist/3dgs-lib.js

@@ -623,22 +623,25 @@ const _OrbitControls = class _OrbitControls {
     __publicField(this, "maxPhi", Math.PI - 0.01);
     // 灵敏度
     __publicField(this, "rotateSpeed", 5e-3);
-    __publicField(this, "zoomSpeed", 8e-4);
+    __publicField(this, "zoomSpeed", 15e-4);
     __publicField(this, "panSpeed", 5e-3);
     // 移动端触摸灵敏度
     __publicField(this, "touchZoomSpeed", 0.01);
     __publicField(this, "touchPanSpeed", 3e-3);
-    // 阻尼（值越大越灵敏，越小越丝滑；0.12 约 5 帧消化 50% 增量）
+    // 阻尼：每帧应用全量 delta，然后 delta *= (1 - dampingFactor) 实现惯性
     __publicField(this, "enableDamping", true);
-    __publicField(this, "dampingFactor", 0.12);
+    __publicField(this, "dampingFactor", 0.1);
     // 状态
     __publicField(this, "isDragging", false);
     __publicField(this, "lastX", 0);
     __publicField(this, "lastY", 0);
-    // 阻尼速度（仅平移使用）
-    __publicField(this, "velocityPanX", 0);
-    __publicField(this, "velocityPanY", 0);
-    __publicField(this, "velocityPanZ", 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);
     // 键盘移动
     __publicField(this, "moveSpeed", 0.015);
     __publicField(this, "pressedKeys", /* @__PURE__ */ new Set());
@@ -734,9 +737,10 @@ const _OrbitControls = class _OrbitControls {
     const dx = -deltaX * scale;
     const dy = deltaY * scale;
     if (this.enableDamping) {
-      this.velocityPanX += dx * right[0] + dy * up[0];
-      this.velocityPanY += dx * right[1] + dy * up[1];
-      this.velocityPanZ += 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];
@@ -756,15 +760,19 @@ const _OrbitControls = class _OrbitControls {
     this.lastX = e.clientX;
     this.lastY = e.clientY;
     if (e.buttons === 1) {
-      this.theta -= deltaX * this.rotateSpeed;
-      this.phi -= deltaY * this.rotateSpeed;
-      this.phi = Math.max(this.minPhi, Math.min(this.maxPhi, this.phi));
-      this.applySpherical();
+      if (this.enableDamping) {
+        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;
+        this.phi = Math.max(this.minPhi, Math.min(this.maxPhi, this.phi));
+      }
     } else if (e.buttons === 2 || e.buttons === 4) {
       this.panByScreenDelta(deltaX, deltaY);
-      if (!this.enableDamping) {
-        this.applySpherical();
-      }
+    }
+    if (!this.enableDamping) {
+      this.applySpherical();
     }
   }
   onMouseUp() {
@@ -777,13 +785,17 @@ const _OrbitControls = class _OrbitControls {
     if (e.deltaMode === 1) delta *= 40;
     else if (e.deltaMode === 2) delta *= 800;
     const normalizedDelta = Math.sign(delta) * Math.min(Math.abs(delta), 120);
-    const factor = 1 + normalizedDelta * this.zoomSpeed;
-    this.distance *= factor;
-    this.distance = Math.max(
-      this.minDistance,
-      Math.min(this.maxDistance, this.distance)
-    );
-    this.applySpherical();
+    const zoomDelta = normalizedDelta * this.zoomSpeed;
+    if (this.enableDamping) {
+      this.deltaDistance += zoomDelta * this.dampingFactor;
+    } else {
+      this.distance *= Math.exp(zoomDelta);
+      this.distance = Math.max(
+        this.minDistance,
+        Math.min(this.maxDistance, this.distance)
+      );
+      this.applySpherical();
+    }
   }
   onKeyDown(e) {
     var _a2;
@@ -909,20 +921,29 @@ const _OrbitControls = class _OrbitControls {
       const deltaY = e.touches[0].clientY - this.lastY;
       this.lastX = e.touches[0].clientX;
       this.lastY = e.touches[0].clientY;
-      this.theta -= deltaX * this.rotateSpeed;
-      this.phi -= deltaY * this.rotateSpeed;
-      this.phi = Math.max(this.minPhi, Math.min(this.maxPhi, this.phi));
-      this.applySpherical();
+      if (this.enableDamping) {
+        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;
+        this.phi = Math.max(this.minPhi, Math.min(this.maxPhi, this.phi));
+        this.applySpherical();
+      }
     } else if (e.touches.length === 2) {
       const currentDistance = this.getTouchDistance(e.touches);
       const currentCenter = this.getTouchCenter(e.touches);
       if (this.lastTouchDistance > 0) {
         const ratio = currentDistance / this.lastTouchDistance;
-        this.distance /= ratio;
-        this.distance = Math.max(
-          this.minDistance,
-          Math.min(this.maxDistance, this.distance)
-        );
+        if (this.enableDamping) {
+          this.deltaDistance += -Math.log(ratio) * this.dampingFactor;
+        } else {
+          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;
@@ -931,9 +952,10 @@ const _OrbitControls = class _OrbitControls {
       const dx = -deltaX * scale;
       const dy = deltaY * scale;
       if (this.enableDamping) {
-        this.velocityPanX += dx * right[0] + dy * up[0];
-        this.velocityPanY += dx * right[1] + dy * up[1];
-        this.velocityPanZ += 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];
@@ -941,7 +963,7 @@ const _OrbitControls = class _OrbitControls {
       }
       this.lastTouchDistance = currentDistance;
       this.lastTouchCenter = currentCenter;
-      this.applySpherical();
+      if (!this.enableDamping) this.applySpherical();
     }
   }
   onTouchEnd(e) {
@@ -987,17 +1009,32 @@ const _OrbitControls = class _OrbitControls {
     this.applyKeyboardMovement();
     if (this.enableDamping) {
       const EPS = 1e-6;
-      const f = this.dampingFactor;
-      this.camera.target[0] += this.velocityPanX * f;
-      this.camera.target[1] += this.velocityPanY * f;
-      this.camera.target[2] += this.velocityPanZ * f;
-      const decay = 1 - f;
-      this.velocityPanX *= decay;
-      this.velocityPanY *= decay;
-      this.velocityPanZ *= decay;
-      if (Math.abs(this.velocityPanX) < EPS) this.velocityPanX = 0;
-      if (Math.abs(this.velocityPanY) < EPS) this.velocityPanY = 0;
-      if (Math.abs(this.velocityPanZ) < EPS) this.velocityPanZ = 0;
+      const decay = 1 - this.dampingFactor;
+      this.theta += this.deltaTheta;
+      this.phi += this.deltaPhi;
+      this.phi = Math.max(this.minPhi, Math.min(this.maxPhi, this.phi));
+      this.deltaTheta *= decay;
+      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;
+      this.deltaPanX *= decay;
+      this.deltaPanY *= decay;
+      this.deltaPanZ *= decay;
+      if (Math.abs(this.deltaPanX) < EPS) this.deltaPanX = 0;
+      if (Math.abs(this.deltaPanY) < EPS) this.deltaPanY = 0;
+      if (Math.abs(this.deltaPanZ) < EPS) this.deltaPanZ = 0;
     }
     this.applySpherical();
   }
@@ -1103,9 +1140,12 @@ const _OrbitControls = class _OrbitControls {
     requestAnimationFrame(animate);
   }
   clearVelocity() {
-    this.velocityPanX = 0;
-    this.velocityPanY = 0;
-    this.velocityPanZ = 0;
+    this.deltaTheta = 0;
+    this.deltaPhi = 0;
+    this.deltaDistance = 0;
+    this.deltaPanX = 0;
+    this.deltaPanY = 0;
+    this.deltaPanZ = 0;
   }
 };
 /** 移动键 */