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

package/package.json

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

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);