@kimap/indoor-positioning-sdk-vue2 5.9.0 → 5.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kimap/indoor-positioning-sdk-vue2",
-  "version": "5.9.0",
+  "version": "5.9.3",
   "description": "Vue2自包含室内定位SDK - 完全兼容Webpack3+Babel6 | Vue2 Self-Contained Indoor Positioning SDK",
   "main": "index.js",
   "files": [

package/src/core/KimapSDK.js

@@ -669,10 +669,8 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
 
   this._currentShowingFloorIndex = floorIndex;
   self.core._lastSingleFloorIndex = floorIndex;
-  // 退出 ALL 时：相机动画恢复到单楼层视角（保持当前位置，不重置）
-  if (self.core.cameraPitchState === 1) {
-    self.core.animateCameraToFloorView(600);
-  }
+  // 始终触发动画（animateCameraToFloorView 内部判断 from/to 是否相同，相同则立即完成）
+  self.core.animateCameraToFloorView(600);
 };
 
 /**

package/src/core/SceneCore.js

@@ -291,9 +291,9 @@ SceneCore.prototype._loadMultiFloorMaps = function(OBJLoader, MTLLoader, objUrls
       return self._loadSingleMapWithFloorIndex(OBJLoader, MTLLoader, url, floorIndex++);
     });
   }, Promise.resolve()).then(function() {
-    // 多楼层：相机默认以第一个楼层为准（之后切换 ALL 时再重新调整）
+    // 多楼层：相机默认以第一个楼层为准（showSingleFloor(0) 会触发动画，这里不再重复）
     if (self.floorGroups.length > 0) {
-      self.adjustCameraToFloor(0);
+      self._lastSingleFloorIndex = 0;
     }
   });
 };
@@ -1355,12 +1355,13 @@ SceneCore.prototype.animateCameraToAllView = function(duration) {
   this.cameraPrePitchPos = this.camera.position.clone();
   this.cameraPrePitchTarget = this.controls ? this.controls.target.clone() : center.clone();
 
-  // ALL 外景俯角 -25°：camera.y - center.y = distance × sin(-25°) ≈ -distance × 0.423
-  // camera.z - center.z = distance × cos(-25°) ≈ distance × 0.906
-  var dist = maxSize * 2;
+  // ALL 外景俯角 -20°：camera.y - center.y = distance × sin(-20°) ≈ -distance × 0.342
+  // camera.z - center.z = distance × cos(-20°) ≈ distance × 0.940
+  // 距离 2.5×，从建筑斜上方俯视，视角平缓舒适
+  var dist = maxSize * 2.5;
   var fromPos = this.camera.position.clone();
   var fromTarget = this.controls ? this.controls.target.clone() : center.clone();
-  var toPos = new THREE.Vector3(center.x, center.y - dist * 0.423, center.z + dist * 0.906);
+  var toPos = new THREE.Vector3(center.x, center.y - dist * 0.342, center.z + dist * 0.940);
   var toTarget = new THREE.Vector3(center.x, center.y, center.z);
 
   this.cameraPitchAnim = {
@@ -1436,7 +1437,8 @@ SceneCore.prototype.animateCameraToFloorView = function(duration) {
     fromPos: fromPos,
     toPos: toPos,
     fromTarget: fromTarget,
-    toTarget: toTarget
+    toTarget: toTarget,
+    targetState: 0  // 动画结束后 cameraPitchState 应为 0（单楼层状态）
   };
   this.cameraPitchState = 0;
   this.cameraPrePitchPos = null;