@d5techs/3dgs-lib 1.4.31 → 1.4.32

package/dist/3dgs-lib.js

@@ -635,9 +635,10 @@ 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);
@@ -785,11 +786,16 @@ 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;
-    this.distance *= Math.exp(zoomDelta);
-    this.distance = Math.max(
-      this.minDistance,
-      Math.min(this.maxDistance, this.distance)
-    );
+    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;
@@ -929,11 +935,15 @@ const _OrbitControls = class _OrbitControls {
       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;
@@ -1007,6 +1017,15 @@ 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;
@@ -1084,15 +1103,28 @@ const _OrbitControls = class _OrbitControls {
     const fovRad = this.camera.fov;
     const halfFov = fovRad / 2;
     const marginFactor = 1.5;
-    const targetDistance = radius / Math.tan(halfFov) * marginFactor;
-    const clampedDistance = Math.max(this.minDistance, targetDistance);
+    const totalDistance = radius / Math.tan(halfFov) * marginFactor;
+    const surfaceOffset = radius * 0.85;
+    const sinPhi = Math.sin(this.phi);
+    const cosPhi = Math.cos(this.phi);
+    const sinTheta = Math.sin(this.theta);
+    const cosTheta = Math.cos(this.theta);
+    const offsetTarget = [
+      center[0] + sinPhi * sinTheta * surfaceOffset,
+      center[1] + cosPhi * surfaceOffset,
+      center[2] + sinPhi * cosTheta * surfaceOffset
+    ];
+    const adjustedDistance = Math.max(
+      this.minDistance,
+      totalDistance - surfaceOffset
+    );
     if (animate) {
-      this.animateToFrame(center, clampedDistance);
+      this.animateToFrame(offsetTarget, adjustedDistance);
     } else {
-      this.camera.target[0] = center[0];
-      this.camera.target[1] = center[1];
-      this.camera.target[2] = center[2];
-      this.distance = clampedDistance;
+      this.camera.target[0] = offsetTarget[0];
+      this.camera.target[1] = offsetTarget[1];
+      this.camera.target[2] = offsetTarget[2];
+      this.distance = adjustedDistance;
       this.applySpherical();
     }
   }
@@ -1123,6 +1155,7 @@ const _OrbitControls = class _OrbitControls {
   clearVelocity() {
     this.deltaTheta = 0;
     this.deltaPhi = 0;
+    this.deltaDistance = 0;
     this.deltaPanX = 0;
     this.deltaPanY = 0;
     this.deltaPanZ = 0;