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

package/package.json

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

package/src/core/KimapSDK.js

@@ -652,6 +652,9 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
   if (!this.floorGroups || this.floorGroups.length === 0) return;
   var self = this;
 
+  // 切换单楼层时移除 ALL 周边建筑物
+  this.core._removeAllModeBuildings();
+
   var isFromAll = (this._currentMode === 'all');
   var ANIM_DURATION = 300; // ms
   var startTime = Date.now();
@@ -792,12 +795,15 @@ KimapSDK.prototype.showAllFloors = function() {
   // 相机动画飞到 ALL 外景视角（参考正式版 _zoomToShowAllFloors）
   this._zoomToShowAllFloors();
 
+  // 渲染 ALL 模式周边建筑物
+  this.core._addAllModeBuildings();
+
   this._currentShowingFloorIndex = -1; // ALL 状态
   this._currentMode = 'all';
 };
 
 /**
- * 多楼层：相机动画飞到能看到所有楼层的位置（ALL 外景视角，从侧方斜俯视，俯角约 45°）
+ * 多楼层：相机动画飞到能看到所有楼层的位置（ALL 外景视角，从侧方斜俯视，俯角25°，拉远）
  * @private
  */
 KimapSDK.prototype._zoomToShowAllFloors = function() {
@@ -821,10 +827,11 @@ KimapSDK.prototype._zoomToShowAllFloors = function() {
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
 
-    // ALL侧方斜俯视：方位角-45°，俯角45°，模型占屏幕80%
+    // ALL侧方斜俯视：方位角-45°，俯角25°（polar≈65°），模型占屏幕60%（拉远）
     var azimuthDeg = -45;
-    var pitchDeg = 45;
-    var screenFillFactor = 0.8;
+    var pitchDeg = 25;
+    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

@@ -70,6 +70,7 @@ function SceneCore(config) {
   this.floorOriginalY = []; // 每个楼层的原始世界Y偏移（含间隙）
   // 楼层切换动画状态
   this.floorAnim = null; // { running: bool, startTime: ms, duration: ms, steps: [] }
+  this._allModeBuildings = []; // ALL 模式下的周边模拟建筑物
 }
 
 /**
@@ -95,6 +96,7 @@ SceneCore.prototype.init = function() {
       self.initRenderer();
       self.initControls(OrbitControls);
       self.setupLights();
+      self.setupGround();
       self.addCoordinateHelper();
       return Promise.all([loadOBJLoader(), loadMTLLoader()]);
     })
@@ -230,6 +232,39 @@ SceneCore.prototype.setupLights = function() {
   this.scene.add(hemisphereLight);
 };
 
+/**
+ * 设置地面（纯色 + 网格）
+ */
+SceneCore.prototype.setupGround = function() {
+  var origin = this.coordinateSystem.origin;
+  var maxX = this.coordinateSystem.maxX;
+  var maxZ = this.coordinateSystem.maxY;
+
+  // 地面尺寸稍大于地图，留出边距
+  var groundSize = Math.max(maxX, maxZ) * 1.6;
+
+  // 地面纯色平面（不接收阴影、不投射阴影）
+  var groundGeo = new THREE.PlaneGeometry(groundSize, groundSize);
+  var groundMat = new THREE.MeshLambertMaterial({
+    color: 0xf7f7f7,
+    side: THREE.DoubleSide
+  });
+  var ground = new THREE.Mesh(groundGeo, groundMat);
+  ground.rotation.x = -Math.PI / 2;
+  ground.position.set(origin.x + maxX / 2, -0.001, origin.z);
+  ground.receiveShadow = false;
+  this.scene.add(ground);
+
+  // 网格线（与地面颜色协调，线色 #d0d0d0，格间距 maxX/10）
+  var gridSize = Math.max(maxX, maxZ) * 1.5;
+  var gridDivisions = Math.max(10, Math.round(gridSize / (maxX / 10)));
+  var grid = new THREE.GridHelper(gridSize, gridDivisions, 0xbdbdbd, 0xd0d0d0);
+  grid.position.set(origin.x + maxX / 2, 0, origin.z);
+  grid.material.opacity = 0.5;
+  grid.material.transparent = true;
+  this.scene.add(grid);
+};
+
 /**
  * 添加坐标辅助器
  */
@@ -510,11 +545,15 @@ SceneCore.prototype._adjustCameraToAllFloors = function() {
     box.getSize(size);
     var maxSize = Math.max(size.x, size.z);
 
-    // 从侧方斜俯视：方位角 -45°（侧方），俯角 45°（polar≈60°，与调试值对应）
-    var pitchDeg = 45;
+    // 从侧方斜俯视：方位角-45°，俯角25°（polar≈65°），模型占屏幕60%（拉远）
+    var pitchDeg = 25;
     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;
@@ -540,6 +579,84 @@ SceneCore.prototype._adjustCameraToAllFloors = function() {
   }
 };
 
+/**
+ * ALL 模式：在四周渲染 4 栋模拟建筑物（淡蓝色 0.5 透明度，无光遮挡）
+ * @private
+ */
+SceneCore.prototype._addAllModeBuildings = function() {
+  this._removeAllModeBuildings();
+
+  try {
+    var allMeshes = [];
+    this.floorGroups.forEach(function(group) {
+      group.traverse(function(child) {
+        if (child.isMesh) allMeshes.push(child);
+      });
+    });
+    if (allMeshes.length === 0) return;
+
+    var box = new THREE.Box3();
+    allMeshes.forEach(function(mesh) { box.expandByObject(mesh); });
+    var boxMin = new THREE.Vector3();
+    var boxMax = new THREE.Vector3();
+    box.getMin(boxMin);
+    box.getMax(boxMax);
+    var centerX = (boxMin.x + boxMax.x) / 2;
+    var centerZ = (boxMin.z + boxMax.z) / 2;
+    var modelW = boxMax.x - boxMin.x;
+    var modelD = boxMax.z - boxMin.z;
+    var modelH = boxMax.y - boxMin.y;
+
+    // 建筑物高度：取模型高度的 1.5~2.5 倍，宽度为模型宽度的 0.4~0.6 倍
+    var baseW = modelW * 0.45;
+    var baseD = modelD * 0.45;
+    var heights = [modelH * 1.8, modelH * 2.2, modelH * 1.5, modelH * 2.5];
+    // 四周分布：前后左右，距模型边缘约 0.6 倍模型尺寸
+    var offsets = [
+      { x: 0, z: -(modelD / 2 + modelD * 0.55), w: baseW * 1.1, d: baseD * 0.9 },
+      { x: 0, z: modelD / 2 + modelD * 0.55, w: baseW, d: baseD },
+      { x: modelW / 2 + modelW * 0.55, z: 0, w: baseW * 0.9, d: baseD * 1.1 },
+      { x: -(modelW / 2 + modelW * 0.55), z: 0, w: baseW, d: baseD * 1.0 }
+    ];
+
+    var self = this;
+    heights.forEach(function(h, i) {
+      var o = offsets[i];
+      var geo = new THREE.BoxGeometry(o.w, h, o.d);
+      var mat = new THREE.MeshBasicMaterial({
+        color: 0x9ecfef,
+        transparent: true,
+        opacity: 0.5,
+        depthWrite: false
+      });
+      var mesh = new THREE.Mesh(geo, mat);
+      mesh.position.set(centerX + o.x, h / 2, centerZ + o.z);
+      mesh.castShadow = false;
+      mesh.receiveShadow = false;
+      self.scene.add(mesh);
+      self._allModeBuildings.push(mesh);
+    });
+
+    console.log('ALL 模式：已添加 ' + self._allModeBuildings.length + ' 栋周边建筑物');
+  } catch (e) {
+    console.warn('添加 ALL 模式建筑物失败:', e);
+  }
+};
+
+/**
+ * 移除 ALL 模式的周边建筑物
+ * @private
+ */
+SceneCore.prototype._removeAllModeBuildings = function() {
+  var self = this;
+  this._allModeBuildings.forEach(function(mesh) {
+    self.scene.remove(mesh);
+    mesh.geometry.dispose();
+    mesh.material.dispose();
+  });
+  this._allModeBuildings = [];
+};
+
 /**
  * 相机对准指定楼层（多楼层切换/ALL 时分别调用）
  * @param {number} floorIndex - 楼层索引