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

package/package.json

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

package/src/core/KimapSDK.js

@@ -10,10 +10,6 @@ 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;
@@ -88,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
@@ -628,66 +625,38 @@ 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) {
-      // 目标层：先恢复到 ALL 位置（如果从 ALL 来），再从偏移位滑入
-      if (fromAll) {
-        var origY = self.core.floorOriginalY[idx] || 0;
-        group.position.y = origY;
-      } else {
-        group.position.y = targetFromAbove ? slideOffset : -slideOffset;
-      }
+      // 目标层：从偏移位滑入到 y=0
       group.visible = true;
+      group.position.y = targetFromAbove ? slideOffset : -slideOffset;
       steps.push({
         group: group,
-        fromY: group.position.y,
+        fromY: targetFromAbove ? slideOffset : -slideOffset,
         toY: 0,
         toVisible: true
       });
     } else {
-      // 离场层：若有动画在跑则先停止，否则立即移到隐藏位
-      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;
-      }
+      // 离场层：立即消失（移到下方，不做动画）
+      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 j = 0; j < cur.steps.length; j++) {
-      var cs2 = cur.steps[j];
-      cs2.group.position.y = cs2.fromY + (cs2.toY - cs2.fromY) * et;
+    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;
     }
   }
 
@@ -699,50 +668,10 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
   };
 
   this._currentShowingFloorIndex = floorIndex;
-
-  // 退出 ALL：相机从 ALL 视角平滑飞向单楼层位置
+  self.core._lastSingleFloorIndex = floorIndex;
+  // 退出 ALL 时：相机动画恢复到单楼层视角（保持当前位置，不重置）
   if (self.core.cameraPitchState === 1) {
-    // 停止已有相机动画并记录当前帧
-    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;
+    self.core.animateCameraToFloorView(600);
   }
 };
 

package/src/core/SceneCore.js

@@ -75,6 +75,7 @@ function SceneCore(config) {
   this.cameraPitchState = 0; // 0=正常视角, 1=ALL外景俯视
   this.cameraPrePitchPos = null; // 俯仰动画前的相机位置
   this.cameraPrePitchTarget = null; // 俯仰动画前的 controls.target
+  this._prevCameraPitchState = 0; // 上一帧的相机状态（用于检测状态变化触发动画）
 }
 
 /**
@@ -532,23 +533,16 @@ SceneCore.prototype.adjustCameraToFloor = function(floorIndex) {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.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
-    );
+    var distance = maxSize * 1.5;
+
+    // -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;
@@ -557,6 +551,14 @@ SceneCore.prototype.adjustCameraToFloor = function(floorIndex) {
   }
 };
 
+/**
+ * 首次加载 / ALL 退出时：单楼层 -60° 俯角相机定位（独立方法，不改变现有 adjustCameraToFloor）
+ * @param {number} floorIndex
+ */
+SceneCore.prototype.adjustCameraToSingleFloorView = function(floorIndex) {
+  this.adjustCameraToFloor(floorIndex);
+};
+
 /**
  * 加载 Kimap 加密文件（内部方法）
  * @private
@@ -1289,7 +1291,11 @@ SceneCore.prototype.tickAnimations = function(deltaMs) {
         this.controls.target.copy(toTarget);
         this.controls.update();
       }
+      // 动画结束：读取引入时保存的 targetState 归位
+      var finishedTargetState = this.cameraPitchAnim ? this.cameraPitchAnim.targetState : 0;
       this.cameraPitchAnim = null;
+      this.cameraPitchState = finishedTargetState;
+      this.camera.lookAtTarget = toTarget.clone();
     }
   }
 };
@@ -1349,12 +1355,12 @@ SceneCore.prototype.animateCameraToAllView = function(duration) {
   this.cameraPrePitchPos = this.camera.position.clone();
   this.cameraPrePitchTarget = this.controls ? this.controls.target.clone() : center.clone();
 
-  // 较高俯角 -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;
+  // 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;
   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.643, center.z + dist * 0.766);
+  var toPos = new THREE.Vector3(center.x, center.y - dist * 0.423, center.z + dist * 0.906);
   var toTarget = new THREE.Vector3(center.x, center.y, center.z);
 
   this.cameraPitchAnim = {
@@ -1364,7 +1370,8 @@ SceneCore.prototype.animateCameraToAllView = function(duration) {
     fromPos: fromPos,
     toPos: toPos,
     fromTarget: fromTarget,
-    toTarget: toTarget
+    toTarget: toTarget,
+    targetState: 1  // 动画结束后 cameraPitchState 应为 1（ALL 状态）
   };
   this.cameraPitchState = 1;
 };
@@ -1392,22 +1399,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;