@kimap/indoor-positioning-sdk-vue2 5.7.4 → 5.7.6

package/package.json

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

package/src/core/KimapSDK.js

@@ -604,8 +604,18 @@ KimapSDK.prototype.changeFloor = function(floorIdOrIndex) {
  */
 KimapSDK.prototype.showSingleFloor = function(floorIndex) {
   if (!this.floorGroups || this.floorGroups.length === 0) return;
+  var self = this;
   this.floorGroups.forEach(function(group, index) {
-    group.visible = index === floorIndex;
+    if (index === floorIndex) {
+      // 单层模式：将该楼层移动到贴地位置（y = 0）
+      group.visible = true;
+      group.position.y = 0;
+    } else {
+      // 隐藏其他楼层，同时移到下方避免干扰
+      group.visible = false;
+      var originalY = self.core.floorOriginalY[index] || 0;
+      group.position.y = -originalY - 1; // 移到地面以下
+    }
   });
 };
 
@@ -615,8 +625,12 @@ KimapSDK.prototype.showSingleFloor = function(floorIndex) {
  */
 KimapSDK.prototype.showAllFloors = function() {
   if (!this.floorGroups || this.floorGroups.length === 0) return;
-  this.floorGroups.forEach(function(group) {
+  var self = this;
+  this.floorGroups.forEach(function(group, index) {
     group.visible = true;
+    // 恢复原始世界 Y 偏移（含间隙）
+    var originalY = self.core.floorOriginalY[index] || 0;
+    group.position.y = originalY;
   });
 };
 
@@ -742,11 +756,6 @@ KimapSDK.prototype.getCoordinateSystem = function() {
  */
 KimapSDK.prototype.autoAdjustCamera = function(options) {
   var self = this;
-  
-  if (!self.core || !self.core.mapModel) {
-    console.warn('KimapSDK: 地图模型未加载，无法调整相机');
-    return;
-  }
 
   var opts = options || {};
   var distanceFactor = opts.distanceFactor !== undefined ? opts.distanceFactor : 1.0;
@@ -754,6 +763,43 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
   var yFactor = opts.yFactor !== undefined ? opts.yFactor : 0.4;
   var zFactor = opts.zFactor !== undefined ? opts.zFactor : 0.5;
 
+  // 多楼层模式：基于 floorGroups 计算包围盒
+  if (self.isMultiFloor && self.floorGroups && self.floorGroups.length > 0) {
+    var allMeshes = [];
+    self.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 center = new THREE.Vector3();
+    var size = new THREE.Vector3();
+    box.getCenter(center);
+    box.getSize(size);
+
+    var maxDim = Math.max(size.x, size.z);
+    var distance = maxDim * distanceFactor * 2;
+
+    self.core.camera.position.set(center.x, center.y + distance * 1.5, center.z + distance);
+    self.core.camera.lookAt(center);
+    if (self.core.controls) {
+      self.core.controls.target.copy(center);
+      self.core.controls.update();
+    }
+
+    console.log('KimapSDK: 相机已自动调整（多楼层模式）', { center: center, distance: distance, size: size });
+    return self;
+  }
+
+  // 单楼层模式
+  if (!self.core || !self.core.mapModel) {
+    console.warn('KimapSDK: 地图模型未加载，无法调整相机');
+    return;
+  }
+
   var box = new THREE.Box3().setFromObject(self.core.mapModel);
   var center = new THREE.Vector3();
   var size = new THREE.Vector3();
@@ -771,7 +817,7 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
   );
 
   self.core.camera.lookAt(center);
-  
+
   if (self.core.controls) {
     self.core.controls.target.copy(center);
     self.core.controls.update();
@@ -782,7 +828,7 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
     distance: distance,
     size: size
   });
-  
+
   return self;
 };
 

package/src/core/SceneCore.js

@@ -64,6 +64,7 @@ function SceneCore(config) {
   this.floorGroups = [];
   this.floorHeight = 3; // 米
   this.isMultiFloor = Array.isArray(config.objUrl);
+  this.floorOriginalY = []; // 每个楼层的原始世界Y偏移（含间隙）
 }
 
 /**
@@ -363,8 +364,6 @@ SceneCore.prototype._loadKimapFileToGroup = function(kimapUrl, themeUrl, objLoad
             if (borderInfo) self._borderInfo = borderInfo;
             var mapConfig = extractMapConfigFromOBJ(objContent);
             if (mapConfig && mapConfig.isCalibrated) self._mapConfig = mapConfig;
-            var textElements = extractTextElementsFromOBJ(objContent);
-            if (textElements && textElements.length > 0) self._textElements = textElements;
             var wallOpacity = extractWallOpacityFromOBJ(objContent);
             if (wallOpacity && Object.keys(wallOpacity).length > 0) self._wallOpacity = wallOpacity;
             var shapeOpacity = extractShapeOpacityFromOBJ(objContent);
@@ -373,6 +372,16 @@ SceneCore.prototype._loadKimapFileToGroup = function(kimapUrl, themeUrl, objLoad
           var colorMap = materials ? {} : extractColorsFromOBJ(objContent);
           var object = objLoader.parse(objContent);
           self._processLoadedModelToGroup(object, materials, colorMap, floorGroup, floorIndex);
+
+          // 提取文字元素（每个楼层都提取，以第一个楼层为准）
+          if (!self._textElements || self._textElements.length === 0) {
+            var textElements = extractTextElementsFromOBJ(objContent);
+            if (textElements && textElements.length > 0) {
+              self._textElements = textElements;
+              self.renderTextElements(self._textElements);
+            }
+          }
+
           resolve();
         } catch (error) {
           reject(error);
@@ -410,8 +419,24 @@ SceneCore.prototype._processLoadedModelToGroup = function(object, materials, col
   floorGroup.add(object);
 
   var box = new THREE.Box3().setFromObject(object);
-  var floorY = floorIndex * self.floorHeight;
-  object.position.set(-box.min.x, -box.min.y + floorY, -box.min.z);
+  var boxHeight = box.max.y - box.min.y;
+
+  // 逐层累积高度：每个楼层的地面 = 前几个楼层的总高度
+  var floorY = 0;
+  for (var i = 0; i < floorIndex; i++) {
+    var prevGroup = self.floorGroups[i];
+    if (prevGroup) {
+      var prevBox = new THREE.Box3().setFromObject(prevGroup);
+      floorY += (prevBox.max.y - prevBox.min.y);
+    }
+  }
+
+  // 修正当前楼层的 Y 偏移：使用 box.max.y（顶面高度）作为该楼层占据的高度基准，
+  // 这样每个楼层的地面（min.y）都对齐到正确的世界高度
+  object.position.set(-box.min.x, floorY - box.min.y, -box.min.z);
+
+  // 记录每个楼层的原始世界 Y 偏移（ALL 模式时使用）
+  self.floorOriginalY[floorIndex] = floorY;
 
   // 复用 backup 的材质处理策略，不改渲染风格
   object.traverse(function(child) {