@kimap/indoor-positioning-sdk-vue2 5.8.6 → 5.8.8

package/package.json

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

package/src/core/KimapSDK.js

@@ -84,9 +84,10 @@ KimapSDK.prototype.init = function() {
       self.startRenderLoop();
       self._extractWallsFromModel();
 
-      // 多楼层默认显示第一个楼层
+      // 多楼层默认显示第一个楼层，并设 -60° 俯角相机
       if (self.isMultiFloor && self.floorGroups && self.floorGroups.length > 0) {
         self.showSingleFloor(0);
+        self.core.adjustCameraToSingleFloorView(0);
       }
 
       // 渲染内置楼层选择器 UI
@@ -667,6 +668,7 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
   };
 
   this._currentShowingFloorIndex = floorIndex;
+  self.core._lastSingleFloorIndex = floorIndex;
   // 退出 ALL 时：相机动画恢复到单楼层视角（保持当前位置，不重置）
   if (self.core.cameraPitchState === 1) {
     self.core.animateCameraToFloorView(600);

package/src/core/SceneCore.js

@@ -532,16 +532,16 @@ SceneCore.prototype.adjustCameraToFloor = function(floorIndex) {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
-    var distance = maxSize * 2;
+    var distance = maxSize * 1.5;
 
-    this.camera.position.set(center.x, center.y + distance * 1.5, center.z + distance);
+    // -60° 俯角（与 ALL -45° 区分，单楼层更俯视）
+    this.camera.position.set(center.x, center.y - distance * 1.732, center.z + distance);
     var lookAtTgt = new THREE.Vector3(center.x, center.y, center.z);
     this.camera.lookAt(lookAtTgt);
     if (this.controls) {
       this.controls.target.copy(lookAtTgt);
       this.controls.update();
     }
-    // 记录当前 lookAt 目标（ALL 退场恢复用）
     this.camera.lookAtTarget = lookAtTgt;
     this.coordinateSystem.maxX = size.x;
     this.coordinateSystem.maxY = size.z;
@@ -550,6 +550,14 @@ SceneCore.prototype.adjustCameraToFloor = function(floorIndex) {
   }
 };
 
+/**
+ * 首次加载 / ALL 退出时：单楼层 -60° 俯角相机定位（独立方法，不改变现有 adjustCameraToFloor）
+ * @param {number} floorIndex
+ */
+SceneCore.prototype.adjustCameraToSingleFloorView = function(floorIndex) {
+  this.adjustCameraToFloor(floorIndex);
+};
+
 /**
  * 加载 Kimap 加密文件（内部方法）
  * @private
@@ -1385,22 +1393,49 @@ SceneCore.prototype.animateCameraToFloorView = function(duration) {
     this.cameraPitchAnim = null;
   }
 
-  // 退场恢复点
-  var toPos = this.cameraPrePitchPos || this.camera.position.clone();
-  var toTarget = this.cameraPrePitchTarget || this.camera.position.clone();
+  // 计算当前单楼层中心（-60° 单楼层俯角，不压低）
+  var floorIdx = this._lastSingleFloorIndex !== undefined ? this._lastSingleFloorIndex : 0;
+  var floorGroup = this.floorGroups[floorIdx];
+  var toTarget, toPos, dist, maxSize;
+
+  if (floorGroup) {
+    var meshes = [];
+    floorGroup.traverse(function(child) { if (child.isMesh) meshes.push(child); });
+    if (meshes.length > 0) {
+      var box = new THREE.Box3();
+      meshes.forEach(function(mesh) { box.expandByObject(mesh); });
+      toTarget = new THREE.Vector3();
+      var size = new THREE.Vector3();
+      box.getCenter(toTarget);
+      box.getSize(size);
+      maxSize = Math.max(size.x, size.z);
+      dist = maxSize * 1.5;
+      // -60° 俯角，与 ALL -45° 区分
+      toPos = new THREE.Vector3(toTarget.x, toTarget.y - dist * 1.732, toTarget.z + dist);
+    }
+  }
+
+  if (!toPos) {
+    toTarget = this.camera.lookAtTarget || this.camera.position.clone();
+    toPos = this.camera.position.clone();
+  }
+
+  var fromPos = this.camera.position.clone();
+  var fromTarget = this.camera.lookAtTarget ? this.camera.lookAtTarget.clone() : toTarget.clone();
 
   this.cameraPitchAnim = {
     running: true,
     startTime: Date.now(),
     duration: duration,
-    fromPos: this.camera.position.clone(),
+    fromPos: fromPos,
     toPos: toPos,
-    fromTarget: this.camera.lookAtTarget ? this.camera.lookAtTarget.clone() : toTarget.clone(),
+    fromTarget: fromTarget,
     toTarget: toTarget
   };
   this.cameraPitchState = 0;
   this.cameraPrePitchPos = null;
   this.cameraPrePitchTarget = null;
+  this.camera.lookAtTarget = toTarget.clone();
 };
 
 module.exports = SceneCore;