@kimap/indoor-positioning-sdk-vue2 5.9.6 → 5.9.8

package/package.json

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

package/src/core/KimapSDK.js

@@ -146,6 +146,41 @@ KimapSDK.prototype.handleClick = function(event) {
 KimapSDK.prototype.startRenderLoop = function() {
   var self = this;
   var lastTime = Date.now();
+  var _cameraMoving = false;
+  var _movementTimer = null;
+
+  // 检测相机停止后打印俯仰角和缩放距离
+  function checkCameraStopped() {
+    if (!self.core || !self.core.camera || !self.core.controls) return;
+    var cam = self.core.camera;
+    var ctl = self.core.controls;
+    // 计算球面坐标中的俯仰角（极角，从+Y方向看过去）
+    var dx = cam.position.x - ctl.target.x;
+    var dy = cam.position.y - ctl.target.y;
+    var dz = cam.position.z - ctl.target.z;
+    var dist = Math.sqrt(dx * dx + dy * dy + dz * dz);
+    // polar angle: 从+Y轴向下看的角度，0=正上方，PI/2=地平线
+    var polarRad = Math.acos(dy / dist);
+    // azimuth: 从+Z方向逆时针到XZ平面的角度
+    var azimuthRad = Math.atan2(dx, dz);
+    var polarDeg = (polarRad * 180 / Math.PI).toFixed(2);
+    var azimuthDeg = (azimuthRad * 180 / Math.PI).toFixed(2);
+    var distDeg = dist.toFixed(2);
+    console.log('[Camera Debug] 俯仰角: ' + polarDeg + '° | 方位角: ' + azimuthDeg + '° | 距离: ' + distDeg);
+  }
+
+  function onControlsChange() {
+    _cameraMoving = true;
+    if (_movementTimer) clearTimeout(_movementTimer);
+    _movementTimer = setTimeout(function() {
+      _cameraMoving = false;
+      checkCameraStopped();
+    }, 300);
+  }
+
+  if (this.core && this.core.controls) {
+    this.core.controls.addEventListener('change', onControlsChange);
+  }
 
   function animate() {
     self.animationFrameId = requestAnimationFrame(animate);
@@ -629,9 +664,9 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
   this.floorGroups.forEach(function(group, idx) {
     if (idx === floorIndex) {
       if (isFromAll) {
-        // ALL→单楼：目标层保持在 ALL 位置
+        // ALL→单楼：目标层回到 Y=0 贴地
         group.visible = true;
-        group.position.y = self.core.floorOriginalY[idx] || 0;
+        group.position.y = 0;
       } else {
         // 单楼→单楼：目标层滑入动画
         group.visible = true;
@@ -644,13 +679,9 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
         });
       }
     } else {
-      if (isFromAll) {
-        // ALL→单楼：其他楼层保持 ALL 位置，不隐藏
-        group.visible = true;
-        group.position.y = self.core.floorOriginalY[idx] || 0;
-      } else {
-        // 单楼→单楼：离场层立即消失
-        group.visible = false;
+      // 无论 ALL→单楼 还是 单楼→单楼，非目标楼层一律隐藏
+      group.visible = false;
+      if (!isFromAll) {
         var origY = self.core.floorOriginalY[idx] || 0;
         group.position.y = -origY - 1;
       }
@@ -708,13 +739,13 @@ KimapSDK.prototype._adjustCameraToFloor = function(floorIndex) {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
-    var dist = maxSize * 1.5;
+    var dist = maxSize * 1.2;
 
-    // -60° 俯角：camera.y = center.y + dist*1.732, camera.z = center.z + dist
+    // -60° 俯角：camera.y = center.y + dist*0.866, camera.z = center.z + dist*0.5
     var targetPosition = new THREE.Vector3(
       center.x,
-      center.y + dist * 1.732,
-      center.z + dist
+      center.y + dist * 0.866,
+      center.z + dist * 0.5
     );
 
     this._animateCamera({
@@ -774,13 +805,13 @@ KimapSDK.prototype._zoomToShowAllFloors = function() {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
-    var dist = maxSize * 2.5;
+    var dist = maxSize * 1.2;
 
-    // -15° 俯角：sin(-15°)≈0.259, cos(-15°)≈0.966（从建筑斜上方俯视）
+    // -60° 俯角：sin(60°)=0.866, cos(60°)=0.5（从模型斜上方俯视）
     var targetPosition = new THREE.Vector3(
       center.x,
-      center.y + dist * 0.259,
-      center.z + dist * 0.966
+      center.y + dist * 0.866,
+      center.z + dist * 0.5
     );
 
     this._animateCamera({
@@ -1652,15 +1683,15 @@ KimapSDK.prototype.destroy = function() {
   if (this.animationFrameId) {
     cancelAnimationFrame(this.animationFrameId);
   }
-  
+
   if (this.resizeHandler) {
     window.removeEventListener('resize', this.resizeHandler);
   }
-  
+
   if (this.clickHandler && this.core && this.core.renderer) {
     this.core.renderer.domElement.removeEventListener('click', this.clickHandler);
   }
-  
+
   if (this.core) {
     this.core.destroy();
   }

package/src/core/SceneCore.js

@@ -133,12 +133,29 @@ SceneCore.prototype.setCameraPosition = function() {
   var origin = this.coordinateSystem.origin;
   var maxX = this.coordinateSystem.maxX;
   var maxY = this.coordinateSystem.maxY;
-  
+
   var centerX = origin.x + maxX / 2;
   var centerZ = origin.z;
-  var distance = Math.max(maxX, maxY) * 1.5;
-  
-  this.camera.position.set(centerX, distance, centerZ + distance * 0.5);
+  var maxSize = Math.max(maxX, maxY);
+
+  // 单模型默认相机参数：俯仰角47.52°，方位角-37.94°，基准距离11.49
+  var pitchDeg = 47.52;
+  var azimuthDeg = -37.94;
+  var baseDistance = 11.49;
+  var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+
+  var pitchRad = pitchDeg * Math.PI / 180;
+  var azimuthRad = azimuthDeg * Math.PI / 180;
+  var cosPitch = Math.cos(pitchRad);
+  var sinPitch = Math.sin(pitchRad);
+  var cosAzimuth = Math.cos(azimuthRad);
+  var sinAzimuth = Math.sin(azimuthRad);
+
+  this.camera.position.set(
+    centerX + distance * sinAzimuth * cosPitch,
+    distance * sinPitch,
+    centerZ + distance * cosAzimuth * cosPitch
+  );
   this.camera.lookAt(centerX, 0, centerZ);
 };
 
@@ -488,9 +505,25 @@ SceneCore.prototype._adjustCameraToAllFloors = function() {
     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);
+    // ALL多模型相机参数：俯仰角61.19°，方位角-47.86°，基准距离12.21
+    var pitchDeg = 61.19;
+    var azimuthDeg = -47.86;
+    var baseDistance = 12.21;
+    var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+
+    var pitchRad = pitchDeg * Math.PI / 180;
+    var azimuthRad = azimuthDeg * Math.PI / 180;
+    var cosPitch = Math.cos(pitchRad);
+    var sinPitch = Math.sin(pitchRad);
+    var cosAzimuth = Math.cos(azimuthRad);
+    var sinAzimuth = Math.sin(azimuthRad);
+
+    this.camera.position.set(
+      center.x + distance * sinAzimuth * cosPitch,
+      center.y + distance * sinPitch,
+      center.z + distance * cosAzimuth * cosPitch
+    );
     this.camera.lookAt(center);
     if (this.controls) {
       this.controls.target.copy(center);
@@ -527,10 +560,25 @@ SceneCore.prototype.adjustCameraToFloor = function(floorIndex) {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
-    var distance = maxSize * 1.5;
 
-    // -60° 俯角（与 ALL -45° 区分，单楼层更俯视）
-    this.camera.position.set(center.x, center.y - distance * 1.732, center.z + distance);
+    // 单模型相机参数：俯仰角47.52°，方位角-37.94°，基准距离11.49
+    var pitchDeg = 47.52;
+    var azimuthDeg = -37.94;
+    var baseDistance = 11.49;
+    var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+
+    var pitchRad = pitchDeg * Math.PI / 180;
+    var azimuthRad = azimuthDeg * Math.PI / 180;
+    var cosPitch = Math.cos(pitchRad);
+    var sinPitch = Math.sin(pitchRad);
+    var cosAzimuth = Math.cos(azimuthRad);
+    var sinAzimuth = Math.sin(azimuthRad);
+
+    this.camera.position.set(
+      center.x + distance * sinAzimuth * cosPitch,
+      center.y + distance * sinPitch,
+      center.z + distance * cosAzimuth * cosPitch
+    );
     var lookAtTgt = new THREE.Vector3(center.x, center.y, center.z);
     this.camera.lookAt(lookAtTgt);
     if (this.controls) {
@@ -919,7 +967,7 @@ SceneCore.prototype._processMaterial = function(child, materials, colorMap) {
  */
 SceneCore.prototype._adjustCameraToModel = function() {
   var self = this;
-  
+
   try {
     var finalBox = new THREE.Box3().setFromObject(self.mapModel);
     var finalCenter = new THREE.Vector3();
@@ -929,12 +977,23 @@ SceneCore.prototype._adjustCameraToModel = function() {
     finalBox.getSize(finalSize);
     var maxSize = Math.max(finalSize.x, finalSize.z);
 
-    var distance = maxSize * 1.5;
+    // 单模型相机参数：俯仰角47.52°，方位角-37.94°，基准距离11.49
+    var pitchDeg = 47.52;
+    var azimuthDeg = -37.94;
+    var baseDistance = 11.49;
+    var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+
+    var pitchRad = pitchDeg * Math.PI / 180;
+    var azimuthRad = azimuthDeg * Math.PI / 180;
+    var cosPitch = Math.cos(pitchRad);
+    var sinPitch = Math.sin(pitchRad);
+    var cosAzimuth = Math.cos(azimuthRad);
+    var sinAzimuth = Math.sin(azimuthRad);
 
     self.camera.position.set(
-      finalCenter.x,
-      finalCenter.y + distance,
-      finalCenter.z + distance * 0.5
+      finalCenter.x + distance * sinAzimuth * cosPitch,
+      finalCenter.y + distance * sinPitch,
+      finalCenter.z + distance * cosAzimuth * cosPitch
     );
     self.camera.lookAt(finalCenter.x, finalCenter.y, finalCenter.z);