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

package/package.json

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

package/src/core/KimapSDK.js

@@ -10,6 +10,10 @@ var SceneCore = require('./SceneCore.js');
 // THREE.js 将在运行时加载
 var THREE = null;
 var loadThree = loaders.loadThree;
+
+function easeInOutCubic(t) {
+  return t < 0.5 ? 4 * t * t * t : 1 - Math.pow(-2 * t + 2, 3) / 2;
+}
 var loadOBJLoader = loaders.loadOBJLoader;
 var loadFBXLoader = loaders.loadFBXLoader;
 var loadGLTFLoader = loaders.loadGLTFLoader;
@@ -624,38 +628,66 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
   // 判断方向：目标层是从上方滑下（低→高）还是从下方滑上（高→低）
   var targetFromAbove = floorIndex > currentFloorIndex;
 
-  // 滑入起始偏移（减小幅度，约原值的50%）
+  // 滑入起始偏移
   var slideOffset = 4;
 
   var steps = [];
+  var fromAll = (currentFloorIndex === -1); // 是否从 ALL 模式切来
+
   this.floorGroups.forEach(function(group, idx) {
     if (idx === floorIndex) {
-      // 目标层：从偏移位滑入到 y=0
+      // 目标层：先恢复到 ALL 位置（如果从 ALL 来），再从偏移位滑入
+      if (fromAll) {
+        var origY = self.core.floorOriginalY[idx] || 0;
+        group.position.y = origY;
+      } else {
+        group.position.y = targetFromAbove ? slideOffset : -slideOffset;
+      }
       group.visible = true;
-      group.position.y = targetFromAbove ? slideOffset : -slideOffset;
       steps.push({
         group: group,
-        fromY: targetFromAbove ? slideOffset : -slideOffset,
+        fromY: group.position.y,
         toY: 0,
         toVisible: true
       });
     } else {
-      // 离场层：立即消失（移到下方，不做动画）
-      group.visible = false;
-      var origY = self.core.floorOriginalY[idx] || 0;
-      group.position.y = -origY - 1;
+      // 离场层：若有动画在跑则先停止，否则立即移到隐藏位
+      if (self.core.floorAnim && self.core.floorAnim.running) {
+        var cur = self.core.floorAnim;
+        var t = Math.min((Date.now() - cur.startTime) / cur.duration, 1);
+        var et = 1 - Math.pow(1 - t, 3);
+        for (var i = 0; i < cur.steps.length; i++) {
+          var cs = cur.steps[i];
+          if (cs.group === group) {
+            group.position.y = cs.fromY + (cs.toY - cs.fromY) * et;
+            break;
+          }
+        }
+      }
+      var origY2 = self.core.floorOriginalY[idx] || 0;
+      // 从 ALL 来：滑出动画到原始位置；普通切换：立即隐藏
+      if (fromAll) {
+        steps.push({
+          group: group,
+          fromY: group.position.y,
+          toY: origY2,
+          toVisible: true
+        });
+      } else {
+        group.visible = false;
+        group.position.y = -origY2 - 1;
+      }
     }
   });
 
-  // 合并/覆盖已有动画：先停止当前帧再以新起止值启动
+  // 合并/覆盖已有楼层动画：先瞬移再启动新动画
   if (self.core.floorAnim && self.core.floorAnim.running) {
     var cur = self.core.floorAnim;
     var t = Math.min((Date.now() - cur.startTime) / cur.duration, 1);
-    var et = 1 - Math.pow(1 - t, 3); // easeOutCubic reverse
-    // 把每个 group 瞬移到当前动画帧的位置
-    for (var i = 0; i < cur.steps.length; i++) {
-      var cs = cur.steps[i];
-      cs.group.position.y = cs.fromY + (cs.toY - cs.fromY) * et;
+    var et = 1 - Math.pow(1 - t, 3);
+    for (var j = 0; j < cur.steps.length; j++) {
+      var cs2 = cur.steps[j];
+      cs2.group.position.y = cs2.fromY + (cs2.toY - cs2.fromY) * et;
     }
   }
 
@@ -667,9 +699,50 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
   };
 
   this._currentShowingFloorIndex = floorIndex;
-  // 退出 ALL 时：相机动画恢复到单楼层视角（保持当前位置，不重置）
+
+  // 退出 ALL：相机从 ALL 视角平滑飞向单楼层位置
   if (self.core.cameraPitchState === 1) {
-    self.core.animateCameraToFloorView(600);
+    // 停止已有相机动画并记录当前帧
+    if (self.core.cameraPitchAnim && self.core.cameraPitchAnim.running) {
+      var cpa = self.core.cameraPitchAnim;
+      var tc = Math.min((Date.now() - cpa.startTime) / cpa.duration, 1);
+      var etc = easeInOutCubic(tc);
+      self.core.camera.position.lerpVectors(cpa.fromPos, cpa.toPos, etc);
+      self.core.camera.lookAt(
+        cpa.fromTarget.x + (cpa.toTarget.x - cpa.fromTarget.x) * etc,
+        cpa.fromTarget.y + (cpa.toTarget.y - cpa.fromTarget.y) * etc,
+        cpa.fromTarget.z + (cpa.toTarget.z - cpa.fromTarget.z) * etc
+      );
+      if (self.core.controls) self.core.controls.update();
+      self.core.cameraPitchAnim = null;
+    }
+    // 目标相机位置：单楼层 -60° 俯角，lookAt 稍偏高处
+    var floorMeshes = [];
+    self.floorGroups[floorIndex].traverse(function(child) {
+      if (child.isMesh) floorMeshes.push(child);
+    });
+    var box2 = new THREE.Box3();
+    floorMeshes.forEach(function(m) { box2.expandByObject(m); });
+    var ctr = new THREE.Vector3();
+    var sz = new THREE.Vector3();
+    box2.getCenter(ctr);
+    box2.getSize(sz);
+    var ms = Math.max(sz.x, sz.z);
+    var d = ms * 1.8;
+    var lookAtH = new THREE.Vector3(ctr.x, ctr.y + ms * 0.15, ctr.z);
+    var toPos = new THREE.Vector3(lookAtH.x, lookAtH.y - d * 0.866, lookAtH.z + d * 0.5);
+    var fromCP = self.core.camera.position.clone();
+    var fromTgt = self.core.lookAtTarget ? self.core.lookAtTarget.clone() : lookAtH.clone();
+    self.core.cameraPitchAnim = {
+      running: true,
+      startTime: Date.now(),
+      duration: 600,
+      fromPos: fromCP,
+      toPos: toPos,
+      fromTarget: fromTgt,
+      toTarget: lookAtH
+    };
+    self.core.cameraPitchState = 0;
   }
 };
 

package/src/core/SceneCore.js

@@ -532,10 +532,17 @@ SceneCore.prototype.adjustCameraToFloor = function(floorIndex) {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
-    var distance = maxSize * 2;
-
-    this.camera.position.set(center.x, center.y + distance * 1.5, center.z + distance);
-    var lookAtTgt = new THREE.Vector3(center.x, center.y, center.z);
+    // -60° 俯角（与 ALL 视角一致），y 高出包围盒中心让它稍偏斜上方看
+    var dist = maxSize * 1.8;
+
+    var lookAtTgt = new THREE.Vector3(center.x, center.y + maxSize * 0.15, center.z);
+    // camera.y - lookAt.y = dist * sin(-60°) = -dist * 0.866
+    // camera.z - lookAt.z = dist * cos(-60°) = dist * 0.5
+    this.camera.position.set(
+      lookAtTgt.x,
+      lookAtTgt.y - dist * 0.866,
+      lookAtTgt.z + dist * 0.5
+    );
     this.camera.lookAt(lookAtTgt);
     if (this.controls) {
       this.controls.target.copy(lookAtTgt);
@@ -1342,12 +1349,12 @@ SceneCore.prototype.animateCameraToAllView = function(duration) {
   this.cameraPrePitchPos = this.camera.position.clone();
   this.cameraPrePitchTarget = this.controls ? this.controls.target.clone() : center.clone();
 
-  // 较低俯角 -45°（-60°太极端）：camera.y - center.y = distance × sin(-45°) ≈ -distance × 0.707
-  // camera.z - center.z = distance × cos(-45°) ≈ distance × 0.707
-  var dist = maxSize * 1.8; // 适度拉近，视野更舒适
+  // 较高俯角 -40°（从单楼层的 -60° 稍抬高）：camera.y - center.y = distance × sin(-40°) ≈ -dist * 0.643
+  // camera.z - center.z = distance × cos(-40°) ≈ dist * 0.766
+  var dist = maxSize * 1.8;
   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.707, center.z + dist * 0.707);
+  var toPos = new THREE.Vector3(center.x, center.y - dist * 0.643, center.z + dist * 0.766);
   var toTarget = new THREE.Vector3(center.x, center.y, center.z);
 
   this.cameraPitchAnim = {