@d5techs/3dgs-lib 1.4.27 → 1.4.28

package/dist/3dgs-lib.cjs

@@ -625,7 +625,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", 8e-4);
     __publicField(this, "panSpeed", 5e-3);
     // 移动端触摸灵敏度
     __publicField(this, "touchZoomSpeed", 0.01);
@@ -637,10 +637,7 @@ const _OrbitControls = class _OrbitControls {
     __publicField(this, "isDragging", false);
     __publicField(this, "lastX", 0);
     __publicField(this, "lastY", 0);
-    // 阻尼速度
-    __publicField(this, "velocityTheta", 0);
-    __publicField(this, "velocityPhi", 0);
-    __publicField(this, "velocityDistance", 0);
+    // 阻尼速度（仅平移使用）
     __publicField(this, "velocityPanX", 0);
     __publicField(this, "velocityPanY", 0);
     __publicField(this, "velocityPanZ", 0);
@@ -761,22 +758,15 @@ const _OrbitControls = class _OrbitControls {
     this.lastX = e.clientX;
     this.lastY = e.clientY;
     if (e.buttons === 1) {
-      if (this.enableDamping) {
-        this.velocityTheta += -deltaX * this.rotateSpeed;
-        this.velocityPhi += -deltaY * this.rotateSpeed;
-        const maxRotVel = 0.5;
-        this.velocityTheta = Math.max(-maxRotVel, Math.min(maxRotVel, this.velocityTheta));
-        this.velocityPhi = Math.max(-maxRotVel, Math.min(maxRotVel, this.velocityPhi));
-      } else {
-        this.theta -= deltaX * this.rotateSpeed;
-        this.phi -= deltaY * this.rotateSpeed;
-        this.phi = Math.max(this.minPhi, Math.min(this.maxPhi, this.phi));
-      }
+      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.buttons === 2 || e.buttons === 4) {
       this.panByScreenDelta(deltaX, deltaY);
-    }
-    if (!this.enableDamping) {
-      this.applySpherical();
+      if (!this.enableDamping) {
+        this.applySpherical();
+      }
     }
   }
   onMouseUp() {
@@ -788,20 +778,14 @@ const _OrbitControls = class _OrbitControls {
     let delta = e.deltaY;
     if (e.deltaMode === 1) delta *= 40;
     else if (e.deltaMode === 2) delta *= 800;
-    const normalizedDelta = Math.sign(delta) * Math.min(Math.abs(delta), 150);
-    const zoomDelta = normalizedDelta * this.zoomSpeed;
-    if (this.enableDamping) {
-      this.velocityDistance += zoomDelta;
-      const maxVelocity = 2;
-      this.velocityDistance = Math.max(-maxVelocity, Math.min(maxVelocity, this.velocityDistance));
-    } else {
-      this.distance *= Math.exp(zoomDelta);
-      this.distance = Math.max(
-        this.minDistance,
-        Math.min(this.maxDistance, this.distance)
-      );
-      this.applySpherical();
-    }
+    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();
   }
   onKeyDown(e) {
     var _a2;
@@ -927,30 +911,20 @@ const _OrbitControls = class _OrbitControls {
       const deltaY = e.touches[0].clientY - this.lastY;
       this.lastX = e.touches[0].clientX;
       this.lastY = e.touches[0].clientY;
-      if (this.enableDamping) {
-        this.velocityTheta += -deltaX * this.rotateSpeed;
-        this.velocityPhi += -deltaY * this.rotateSpeed;
-      } 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();
-      }
+      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;
-        const zoomDelta = -Math.log(ratio) / (this.touchZoomSpeed * 100);
-        if (this.enableDamping) {
-          this.velocityDistance += zoomDelta;
-        } else {
-          this.distance *= Math.exp(zoomDelta);
-          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;
@@ -969,9 +943,7 @@ const _OrbitControls = class _OrbitControls {
       }
       this.lastTouchDistance = currentDistance;
       this.lastTouchCenter = currentCenter;
-      if (!this.enableDamping) {
-        this.applySpherical();
-      }
+      this.applySpherical();
     }
   }
   onTouchEnd(e) {
@@ -1018,27 +990,13 @@ const _OrbitControls = class _OrbitControls {
     if (this.enableDamping) {
       const EPS = 1e-6;
       const f = this.dampingFactor;
-      this.theta += this.velocityTheta * f;
-      this.phi += this.velocityPhi * f;
-      this.phi = Math.max(this.minPhi, Math.min(this.maxPhi, this.phi));
-      this.distance *= Math.exp(this.velocityDistance * f);
-      this.distance = Math.max(
-        this.minDistance,
-        Math.min(this.maxDistance, this.distance)
-      );
       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.velocityTheta *= decay;
-      this.velocityPhi *= decay;
-      this.velocityDistance *= decay;
       this.velocityPanX *= decay;
       this.velocityPanY *= decay;
       this.velocityPanZ *= decay;
-      if (Math.abs(this.velocityTheta) < EPS) this.velocityTheta = 0;
-      if (Math.abs(this.velocityPhi) < EPS) this.velocityPhi = 0;
-      if (Math.abs(this.velocityDistance) < EPS) this.velocityDistance = 0;
       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;
@@ -1147,9 +1105,6 @@ const _OrbitControls = class _OrbitControls {
     requestAnimationFrame(animate);
   }
   clearVelocity() {
-    this.velocityTheta = 0;
-    this.velocityPhi = 0;
-    this.velocityDistance = 0;
     this.velocityPanX = 0;
     this.velocityPanY = 0;
     this.velocityPanZ = 0;