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

package/package.json

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

package/src/core/KimapSDK.js

@@ -797,7 +797,7 @@ KimapSDK.prototype.showAllFloors = function() {
 };
 
 /**
- * 多楼层：相机动画飞到能看到所有楼层的位置（ALL 外景视角，从侧方斜俯视，俯角约 45°）
+ * 多楼层：相机动画飞到能看到所有楼层的位置（ALL 外景视角，从侧方斜俯视，俯角35°，拉远）
  * @private
  */
 KimapSDK.prototype._zoomToShowAllFloors = function() {
@@ -821,10 +821,10 @@ KimapSDK.prototype._zoomToShowAllFloors = function() {
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
 
-    // ALL侧方斜俯视：方位角-45°，俯角45°，模型占屏幕80%
+    // ALL侧方斜俯视：方位角-45°，俯角35°（polar≈55°），模型占屏幕60%（拉远）
     var azimuthDeg = -45;
-    var pitchDeg = 45;
-    var screenFillFactor = 0.8;
+    var pitchDeg = 35;
+    var screenFillFactor = 0.6;
     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));

package/src/core/SceneCore.js

@@ -510,11 +510,15 @@ SceneCore.prototype._adjustCameraToAllFloors = function() {
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
 
-    // 从侧方斜俯视：方位角 -45°（侧方），俯角 45°（polar≈60°，与调试值对应）
-    var pitchDeg = 45;
+    // 从侧方斜俯视：方位角-45°，俯角35°（polar≈55°），模型占屏幕60%（拉远）
+    var pitchDeg = 35;
     var azimuthDeg = -45;
-    var baseDistance = maxSize > 0 ? maxSize * 0.8 : 10;
-    var distance = baseDistance;
+    var screenFillFactor = 0.6;
+    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;