@kimap/indoor-positioning-sdk-vue2 6.0.0 → 6.0.2

package/package.json

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

package/src/core/KimapSDK.js

@@ -739,19 +739,34 @@ KimapSDK.prototype._adjustCameraToFloor = function(floorIndex) {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
-    var dist = maxSize * 1.2;
 
-    // -60° 俯角：camera.y = center.y + dist*0.866, camera.z = center.z + dist*0.5
+    // 俯角45°、方位角-37.94°，从侧面斜俯视，模型占屏幕80%（与SceneCore一致）
+    var azimuthDeg = -37.94;
+    var pitchDeg = 45;
+    var screenFillFactor = 0.8;
+    var aspect = (this.core.camera && this.core.camera.aspect) || (window.innerWidth / window.innerHeight);
+    var fovRad = (this.core.camera && this.core.camera.fov) ? this.core.camera.fov * Math.PI / 180 : (60 * Math.PI / 180);
+    var hDist = maxSize / 2 / screenFillFactor / Math.tan(Math.atan(Math.tan(fovRad / 2) / aspect));
+    var vDist = maxSize / 2 / screenFillFactor / Math.tan(fovRad / 2);
+    var distance = Math.max(hDist, vDist);
+
+    var azimuthRad = azimuthDeg * Math.PI / 180;
+    var pitchRad = pitchDeg * Math.PI / 180;
+    var cosPitch = Math.cos(pitchRad);
+    var sinPitch = Math.sin(pitchRad);
+    var sinAzimuth = Math.sin(azimuthRad);
+    var cosAzimuth = Math.cos(azimuthRad);
+
     var targetPosition = new THREE.Vector3(
-      center.x,
-      center.y + dist * 0.866,
-      center.z + dist * 0.5
+      center.x + distance * sinAzimuth * cosPitch,
+      center.y + distance * sinPitch,
+      center.z + distance * cosAzimuth * cosPitch
     );
 
     this._animateCamera({
       position: targetPosition,
       lookAt: center
-    }, 1200, function() {
+    }, 500, function() {
       console.log('KimapSDK: 已切换到楼层 ' + (floorIndex + 1) + 'F（动画完成）');
     });
   } catch (e) {
@@ -782,7 +797,7 @@ KimapSDK.prototype.showAllFloors = function() {
 };
 
 /**
- * 多楼层：相机动画飞到能看到所有楼层的位置（ALL 外景视角，俯角约 -15°）
+ * 多楼层：相机动画飞到能看到所有楼层的位置（ALL 外景视角，从侧方斜俯视，俯角约 45°）
  * @private
  */
 KimapSDK.prototype._zoomToShowAllFloors = function() {
@@ -805,19 +820,34 @@ KimapSDK.prototype._zoomToShowAllFloors = function() {
     box.getCenter(center);
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
-    var dist = maxSize * 1.2;
 
-    // -60° 俯角：sin(60°)=0.866, cos(60°)=0.5（从模型斜上方俯视）
+    // ALL侧方斜俯视：方位角-45°，俯角45°，模型占屏幕80%
+    var azimuthDeg = -45;
+    var pitchDeg = 45;
+    var screenFillFactor = 0.8;
+    var aspect = (this.core.camera && this.core.camera.aspect) || (window.innerWidth / window.innerHeight);
+    var fovRad = (this.core.camera && this.core.camera.fov) ? this.core.camera.fov * Math.PI / 180 : (60 * Math.PI / 180);
+    var hDist = maxSize / 2 / screenFillFactor / Math.tan(Math.atan(Math.tan(fovRad / 2) / aspect));
+    var vDist = maxSize / 2 / screenFillFactor / Math.tan(fovRad / 2);
+    var distance = Math.max(hDist, vDist);
+
+    var azimuthRad = azimuthDeg * Math.PI / 180;
+    var pitchRad = pitchDeg * Math.PI / 180;
+    var cosPitch = Math.cos(pitchRad);
+    var sinPitch = Math.sin(pitchRad);
+    var sinAzimuth = Math.sin(azimuthRad);
+    var cosAzimuth = Math.cos(azimuthRad);
+
     var targetPosition = new THREE.Vector3(
-      center.x,
-      center.y + dist * 0.866,
-      center.z + dist * 0.5
+      center.x + distance * sinAzimuth * cosPitch,
+      center.y + distance * sinPitch,
+      center.z + distance * cosAzimuth * cosPitch
     );
 
     this._animateCamera({
       position: targetPosition,
       lookAt: center
-    }, 1200, function() {
+    }, 500, function() {
       console.log('KimapSDK: 已切换到ALL模式（动画完成）');
     });
   } catch (e) {
@@ -1035,7 +1065,7 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
     return self;
   }
 
-  // 单楼层模式
+  // 单楼层模式：从侧面斜俯视，俯角45°，方位角-37.94°，镜头拉近（模型占屏幕80%）
   if (!self.core || !self.core.mapModel) {
     console.warn('KimapSDK: 地图模型未加载，无法调整相机');
     return;
@@ -1048,13 +1078,30 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
   box.getCenter(center);
   box.getSize(size);
 
-  var maxDim = Math.max(size.x, size.y, size.z);
-  var distance = maxDim * distanceFactor;
+  var maxSize = Math.max(size.x, size.z);
+
+  var azimuthDeg = -37.94;
+  var pitchDeg = 45;
+  // 镜头拉近：模型占屏幕约80%，留20%边距；根据视锥FOV计算实际需要的距离
+  var screenFillFactor = 0.8;
+  var aspect = (self.core.camera && self.core.camera.aspect) || (window.innerWidth / window.innerHeight);
+  var fovRad = (self.core.camera && self.core.camera.fov) ? self.core.camera.fov * Math.PI / 180 : (60 * Math.PI / 180);
+  // 水平方向：model宽/2 对应屏幕半宽/0.8；竖直方向：model深/2 对应 (fov/2)/0.8；取较大值
+  var hDist = maxSize / 2 / screenFillFactor / Math.tan(Math.atan(Math.tan(fovRad / 2) / aspect));
+  var vDist = maxSize / 2 / screenFillFactor / Math.tan(fovRad / 2);
+  var distance = Math.max(hDist, vDist);
+
+  var azimuthRad = azimuthDeg * Math.PI / 180;
+  var pitchRad = pitchDeg * Math.PI / 180;
+  var cosPitch = Math.cos(pitchRad);
+  var sinPitch = Math.sin(pitchRad);
+  var cosAzimuth = Math.cos(azimuthRad);
+  var sinAzimuth = Math.sin(azimuthRad);
 
   self.core.camera.position.set(
-    center.x + distance * xFactor,
-    center.y + distance * yFactor,
-    center.z + distance * zFactor
+    center.x + distance * sinAzimuth * cosPitch,
+    center.y + distance * sinPitch,
+    center.z + distance * cosAzimuth * cosPitch
   );
 
   self.core.camera.lookAt(center);
@@ -1064,7 +1111,7 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
     self.core.controls.update();
   }
 
-  console.log('KimapSDK: 相机已自动调整', {
+  console.log('KimapSDK: 相机已自动调整（单楼层，俯角45°/方位角-37.94°，模型占屏80%）', {
     center: center,
     distance: distance,
     size: size

package/src/core/SceneCore.js

@@ -138,14 +138,18 @@ SceneCore.prototype.setCameraPosition = function() {
   var centerZ = origin.z;
   var maxSize = Math.max(maxX, maxY);
 
-  // 单模型默认相机参数：俯仰角45°，方位角-37.94°，基准距离9（拉近）
-  var pitchDeg = 45;
+  // 单模型默认相机参数：俯仰角45°，方位角-37.94°，从侧面斜俯视，模型占屏幕80%
   var azimuthDeg = -37.94;
-  var baseDistance = 9;
-  var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+  var pitchDeg = 45;
+  var screenFillFactor = 0.8;
+  var aspect = this.camera ? this.camera.aspect : (this.container.clientWidth / this.container.clientHeight);
+  var fovRad = this.camera ? this.camera.fov * Math.PI / 180 : (60 * Math.PI / 180);
+  var hDist = maxSize / 2 / screenFillFactor / Math.tan(Math.atan(Math.tan(fovRad / 2) / aspect));
+  var vDist = maxSize / 2 / screenFillFactor / Math.tan(fovRad / 2);
+  var distance = Math.max(hDist, vDist);
 
-  var pitchRad = pitchDeg * Math.PI / 180;
   var azimuthRad = azimuthDeg * Math.PI / 180;
+  var pitchRad = pitchDeg * Math.PI / 180;
   var cosPitch = Math.cos(pitchRad);
   var sinPitch = Math.sin(pitchRad);
   var cosAzimuth = Math.cos(azimuthRad);
@@ -506,13 +510,11 @@ SceneCore.prototype._adjustCameraToAllFloors = function() {
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
 
-    // ALL 多模型：与 Orbit 调试一致，调试里「俯仰角」= 极角 polar=acos(dy/dist)；
-    // 本处 pitchDeg 为仰角（相对水平面），polar ≈ 90° - pitchDeg，故 polar≈60° 时取 pitchDeg≈30°。
-    // 参考 ALL 斜俯视、前侧方看整体：略抬高视角并留边距。
-    var pitchDeg = 30;
-    var azimuthDeg = -48;
-    var baseDistance = 13.2;
-    var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+    // 从侧方斜俯视：方位角 -45°（侧方），俯角 45°（polar≈60°，与调试值对应）
+    var pitchDeg = 45;
+    var azimuthDeg = -45;
+    var baseDistance = maxSize > 0 ? maxSize * 0.8 : 10;
+    var distance = baseDistance;
 
     var pitchRad = pitchDeg * Math.PI / 180;
     var azimuthRad = azimuthDeg * Math.PI / 180;
@@ -563,14 +565,18 @@ SceneCore.prototype.adjustCameraToFloor = function(floorIndex) {
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
 
-    // 单模型相机参数：俯仰角45°，方位角-37.94°，基准距离9（拉近）
-    var pitchDeg = 45;
+    // 单楼层相机：俯仰角45°，方位角-37.94°，从侧面斜俯视，模型占屏幕80%
     var azimuthDeg = -37.94;
-    var baseDistance = 9;
-    var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+    var pitchDeg = 45;
+    var screenFillFactor = 0.8;
+    var aspect = this.camera ? this.camera.aspect : (this.container.clientWidth / this.container.clientHeight);
+    var fovRad = this.camera ? this.camera.fov * Math.PI / 180 : (60 * Math.PI / 180);
+    var hDist = maxSize / 2 / screenFillFactor / Math.tan(Math.atan(Math.tan(fovRad / 2) / aspect));
+    var vDist = maxSize / 2 / screenFillFactor / Math.tan(fovRad / 2);
+    var distance = Math.max(hDist, vDist);
 
-    var pitchRad = pitchDeg * Math.PI / 180;
     var azimuthRad = azimuthDeg * Math.PI / 180;
+    var pitchRad = pitchDeg * Math.PI / 180;
     var cosPitch = Math.cos(pitchRad);
     var sinPitch = Math.sin(pitchRad);
     var cosAzimuth = Math.cos(azimuthRad);
@@ -979,14 +985,18 @@ SceneCore.prototype._adjustCameraToModel = function() {
     finalBox.getSize(finalSize);
     var maxSize = Math.max(finalSize.x, finalSize.z);
 
-    // 单模型相机参数：俯仰角45°，方位角-37.94°，基准距离9（拉近）
-    var pitchDeg = 45;
+    // 单模型相机：俯仰角45°，方位角-37.94°，从侧面斜俯视，模型占屏幕80%
     var azimuthDeg = -37.94;
-    var baseDistance = 9;
-    var distance = maxSize > 0 ? (baseDistance / 10) * maxSize : baseDistance;
+    var pitchDeg = 45;
+    var screenFillFactor = 0.8;
+    var aspect = this.camera ? this.camera.aspect : (this.container.clientWidth / this.container.clientHeight);
+    var fovRad = this.camera ? this.camera.fov * Math.PI / 180 : (60 * Math.PI / 180);
+    var hDist = maxSize / 2 / screenFillFactor / Math.tan(Math.atan(Math.tan(fovRad / 2) / aspect));
+    var vDist = maxSize / 2 / screenFillFactor / Math.tan(fovRad / 2);
+    var distance = Math.max(hDist, vDist);
 
-    var pitchRad = pitchDeg * Math.PI / 180;
     var azimuthRad = azimuthDeg * Math.PI / 180;
+    var pitchRad = pitchDeg * Math.PI / 180;
     var cosPitch = Math.cos(pitchRad);
     var sinPitch = Math.sin(pitchRad);
     var cosAzimuth = Math.cos(azimuthRad);