@d5techs/3dgs-lib 1.4.37 → 1.4.38

package/dist/3dgs-lib.js

@@ -628,9 +628,10 @@ const _OrbitControls = class _OrbitControls {
     // 移动端触摸灵敏度
     __publicField(this, "touchZoomSpeed", 0.01);
     __publicField(this, "touchPanSpeed", 3e-3);
-    // 缩放步长上限：用 min(distance, zoomDistanceCap) 计算每步的绝对位移，
-    // 使远距离时缩放速度由模型尺寸而非 target 位置决定。frameModel 会自动设置为 radius。
+    // 缩放步长上限：取 min(distance, cameraToCenterDist, zoomDistanceCap)，
+    // 使缩放速度始终与相机到模型的真实距离匹配，而非 target 位置。
     __publicField(this, "zoomDistanceCap", Infinity);
+    __publicField(this, "_modelCenter", [0, 0, 0]);
     // 阻尼：每帧应用全量 delta，然后 delta *= (1 - dampingFactor) 实现惯性
     __publicField(this, "enableDamping", true);
     __publicField(this, "dampingFactor", 0.1);
@@ -795,7 +796,7 @@ const _OrbitControls = class _OrbitControls {
       this.deltaDistance = Math.sign(this.deltaDistance) * Math.min(Math.abs(this.deltaDistance), maxAccum);
     } else {
       const factor = Math.exp(zoomDelta);
-      const effectiveDist = Math.min(this.distance, this.zoomDistanceCap);
+      const effectiveDist = this.getEffectiveZoomDist();
       this.distance -= effectiveDist * (1 - factor);
       this.distance = Math.max(
         this.minDistance,
@@ -946,7 +947,7 @@ const _OrbitControls = class _OrbitControls {
           this.deltaDistance += -Math.log(ratio) * this.dampingFactor;
         } else {
           const factor = 1 / ratio;
-          const effectiveDist = Math.min(this.distance, this.zoomDistanceCap);
+          const effectiveDist = this.getEffectiveZoomDist();
           this.distance -= effectiveDist * (1 - factor);
           this.distance = Math.max(
             this.minDistance,
@@ -1010,6 +1011,17 @@ const _OrbitControls = class _OrbitControls {
     this.camera.position[2] = this.camera.target[2] + this.distance * sinPhi * cosTheta;
     this.camera.updateMatrix();
   }
+  /**
+   * 缩放有效距离：取 distance、相机到模型中心距离、zoomDistanceCap 三者最小值。
+   * 保证缩放步长始终与相机到模型的真实接近程度匹配。
+   */
+  getEffectiveZoomDist() {
+    const cp = this.camera.position;
+    const mc = this._modelCenter;
+    const dx = cp[0] - mc[0], dy = cp[1] - mc[1], dz = cp[2] - mc[2];
+    const camToCenter = Math.sqrt(dx * dx + dy * dy + dz * dz);
+    return Math.min(this.distance, camToCenter, this.zoomDistanceCap);
+  }
   /**
    * 每帧调用：应用阻尼衰减并更新相机
    * 在渲染循环中调用此方法以获得平滑惯性效果
@@ -1028,7 +1040,7 @@ const _OrbitControls = class _OrbitControls {
       if (Math.abs(this.deltaPhi) < EPS) this.deltaPhi = 0;
       if (Math.abs(this.deltaDistance) > EPS) {
         const factor = Math.exp(this.deltaDistance);
-        const effectiveDist = Math.min(this.distance, this.zoomDistanceCap);
+        const effectiveDist = this.getEffectiveZoomDist();
         this.distance -= effectiveDist * (1 - factor);
         this.distance = Math.max(
           this.minDistance,
@@ -1130,6 +1142,7 @@ const _OrbitControls = class _OrbitControls {
   frameModel(center, radius, animate = true) {
     this.clearVelocity();
     this.zoomDistanceCap = radius;
+    this._modelCenter = [center[0], center[1], center[2]];
     const fovRad = this.camera.fov;
     const halfFov = fovRad / 2;
     const marginFactor = 1.5;