@kimap/indoor-positioning-sdk-vue2 5.3.2 → 5.3.3

package/package.json

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

package/src/core/KimapSDK.js

@@ -93,9 +93,6 @@ KimapSDK.prototype.init = function() {
       // 创建科技感地面背景
       self._createTechGround();
 
-      // 启动道路动画循环
-      self._startRoadAnimationLoop();
-
       // 加载背景建筑
       if (self.backgroundBuildingsConfig.enabled !== false) {
         self._loadBackgroundBuildings();
@@ -861,9 +858,22 @@ KimapSDK.prototype._showSingleFloor = function(floorIndex) {
     this.techGroundGroup.visible = false;
   }
 
-  // 显示家具
+  // 显示当前楼层的家具（按楼层分组显示）
   if (this.furnitureGroup) {
     this.furnitureGroup.visible = true;
+    // 如果有按楼层分组的家具子组，只显示当前楼层的
+    var currentFloorId = 'floor_' + floorIndex;
+    this.furnitureGroup.children.forEach(function(child) {
+      if (child.name && child.name.startsWith('furniture_')) {
+        // 检查是否是当前楼层的家具
+        if (child.name === 'furniture_' + currentFloorId ||
+            child.userData.floorId === currentFloorId) {
+          child.visible = true;
+        } else {
+          child.visible = false;
+        }
+      }
+    });
   }
 
   // 调整相机到该楼层（带动画）
@@ -937,8 +947,8 @@ KimapSDK.prototype._fadeInBackgroundBuildings = function(duration) {
 
   this.backgroundGroup.visible = true;
 
-  // 目标透明度为 0.5
-  var targetOpacity = 0.5;
+  // 目标透明度为 0.7
+  var targetOpacity = 0.7;
 
   // 设置初始透明度
   this.backgroundGroup.traverse(function(child) {
@@ -1138,15 +1148,15 @@ KimapSDK.prototype._createFallbackBuilding = function(x, z) {
   // 主楼体 - 淡蓝色半透明
   var geometry = new THREE.BoxGeometry(width, height, depth);
 
-  // 淡蓝色 - 0.5透明度效果
-  var baseColor = new THREE.Color(0x4488cc);
+  // 淡蓝色 - 0.7透明度效果，颜色加深约10%
+  var baseColor = new THREE.Color(0x3c79b7);
   var material = new THREE.MeshStandardMaterial({
     color: baseColor,
     roughness: 0.4,
     metalness: 0.3,
     transparent: true,
-    opacity: 0.5,
-    emissive: new THREE.Color(0x224466),
+    opacity: 0.7,
+    emissive: new THREE.Color(0x1e3d5c),
     emissiveIntensity: 0.3
   });
 
@@ -1234,7 +1244,7 @@ KimapSDK.prototype._addGlowingEdges = function(buildingGroup, width, height, dep
 };
 
 /**
- * 创建科技感地面背景
+ * 创建科技感地面背景（简化版：只保留颜色和网格）
  * @private
  */
 KimapSDK.prototype._createTechGround = function() {
@@ -1266,102 +1276,7 @@ KimapSDK.prototype._createTechGround = function() {
   ground.rotation.x = -Math.PI / 2;
   ground.position.y = -0.2;
   this.techGroundGroup.add(ground);
-
-  // 创建道路线条
-  this._createRoadLines(groundSize);
-};
-
-/**
- * 创建道路流光线条
- * @private
- */
-KimapSDK.prototype._createRoadLines = function(size) {
-  var roadGroup = new THREE.Group();
-  roadGroup.name = 'roadLines';
-  this.roadLinesGroup = roadGroup;
-
-  // 减少道路数量，简化效果
-  var lineCount = 8;
-  var roadWidth = 8;
-
-  for (var i = 0; i < lineCount; i++) {
-    var angle = Math.random() * Math.PI * 2;
-    var length = size * (0.3 + Math.random() * 0.5);
-    var x = Math.cos(angle) * size * 0.4;
-    var z = Math.sin(angle) * size * 0.4;
-
-    // 创建道路
-    var roadGeometry = new THREE.PlaneGeometry(length, roadWidth);
-    var roadMaterial = new THREE.MeshBasicMaterial({
-      color: 0x112233,
-      transparent: true,
-      opacity: 0.6
-    });
-    var road = new THREE.Mesh(roadGeometry, roadMaterial);
-    road.rotation.x = -Math.PI / 2;
-    road.rotation.z = angle;
-    road.position.set(x, 0, z);
-    roadGroup.add(road);
-
-    // 创建中心虚线（简化）
-    var dashCount = Math.floor(length / 5);
-    for (var d = 0; d < dashCount; d++) {
-      var dashGeometry = new THREE.PlaneGeometry(2, 0.3);
-      var dashMaterial = new THREE.MeshBasicMaterial({
-        color: 0x00aaff,
-        transparent: true,
-        opacity: 0.8
-      });
-      var dash = new THREE.Mesh(dashGeometry, dashMaterial);
-      dash.rotation.x = -Math.PI / 2;
-      dash.rotation.z = angle;
-      dash.position.set(
-        x + Math.cos(angle) * (d * 5 - length / 2 + 1),
-        0.05,
-        z + Math.sin(angle) * (d * 5 - length / 2 + 1)
-      );
-      dash.userData.baseOpacity = 0.4 + Math.random() * 0.4;
-      dash.userData.phase = Math.random() * Math.PI * 2;
-      dash.userData.speed = 0.5 + Math.random() * 1.5;
-      roadGroup.add(dash);
-    }
-  }
-
-  // 添加到科技感地面组
-  if (this.techGroundGroup) {
-    this.techGroundGroup.add(roadGroup);
-  } else {
-    this.core.scene.add(roadGroup);
-  }
-};
-
-/**
- * 更新道路流光动画（在render loop中调用）
- * @private
- */
-KimapSDK.prototype._updateRoadAnimation = function(time) {
-  if (!this.roadLinesGroup) return;
-
-  this.roadLinesGroup.traverse(function(child) {
-    if (child.userData && child.userData.baseOpacity !== undefined) {
-      var pulse = Math.sin(time * child.userData.speed + child.userData.phase) * 0.3 + 0.5;
-      child.material.opacity = child.userData.baseOpacity * pulse;
-    }
-  });
 };
-
-/**
- * 在渲染循环中添加道路动画更新
- * @private
- */
-KimapSDK.prototype._startRoadAnimationLoop = function() {
-  var self = this;
-  var originalStartRenderLoop = this.startRenderLoop.bind(this);
-
-  this.startRenderLoop = function() {
-    originalStartRenderLoop();
-
-    // 添加道路动画更新
     var animationLoop = function() {
       requestAnimationFrame(animationLoop);
       var time = performance.now() * 0.001;
@@ -1525,6 +1440,8 @@ KimapSDK.prototype.getCoordinateSystem = function() {
  * @param {number} [options.xFactor=0.5] - X轴偏移因子
  * @param {number} [options.yFactor=0.4] - Y轴偏移因子（高度）
  * @param {number} [options.zFactor=0.5] - Z轴偏移因子
+ * @param {boolean} [options.animate=false] - 是否使用动画过渡
+ * @param {number} [options.duration=600] - 动画持续时间（毫秒），仅当animate为true时有效
  */
 KimapSDK.prototype.autoAdjustCamera = function(options) {
   var self = this;
@@ -1539,6 +1456,8 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
   var xFactor = opts.xFactor !== undefined ? opts.xFactor : 0.5;
   var yFactor = opts.yFactor !== undefined ? opts.yFactor : 0.4;
   var zFactor = opts.zFactor !== undefined ? opts.zFactor : 0.5;
+  var animate = opts.animate === true;
+  var duration = opts.duration || 600;
 
   // 优先使用楼层组（多楼层模式），否则使用mapModel（单楼层模式）
   var targetObject = null;
@@ -1573,25 +1492,40 @@ KimapSDK.prototype.autoAdjustCamera = function(options) {
   var maxDim = Math.max(size.x, size.y, size.z);
   var distance = maxDim * distanceFactor;
 
-  self.core.camera.position.set(
+  var targetPosition = new THREE.Vector3(
     center.x + distance * xFactor,
     center.y + distance * yFactor,
     center.z + distance * zFactor
   );
 
-  self.core.camera.lookAt(center);
-  
-  if (self.core.controls) {
-    self.core.controls.target.copy(center);
-    self.core.controls.update();
+  // 根据animate参数决定是否使用动画
+  if (animate) {
+    self._animateCamera({
+      position: targetPosition,
+      lookAt: center
+    }, duration, function() {
+      console.log('KimapSDK: 相机动画调整完成', {
+        center: center,
+        distance: distance,
+        size: size
+      });
+    });
+  } else {
+    self.core.camera.position.copy(targetPosition);
+    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
+    });
   }
 
-  console.log('KimapSDK: 相机已自动调整', {
-    center: center,
-    distance: distance,
-    size: size
-  });
-  
   return self;
 };
 
@@ -1649,6 +1583,23 @@ KimapSDK.prototype.getConfig = function() {
   return config;
 };
 
+/**
+ * 加载3D家具模型数据
+ * 注意：此方法需要在SDK初始化成功后（init回调后）手动调用！
+ * 用法：
+ *   sdk.init().then(function(sdk) {
+ *     sdk.loadKMData().then(function(result) {
+ *       console.log('家具加载结果:', result);
+ *     });
+ *   });
+ *
+ * 多楼层模式说明：
+ *   - 如果kidata中包含floors信息，家具会按楼层分组
+ *   - 切换楼层时自动显示对应楼层的家具
+ *   - ALL模式下隐藏所有家具
+ *
+ * @returns {Promise<Object>} 返回加载结果 { success: true/false, loaded: number, failed: number }
+ */
 KimapSDK.prototype.loadKMData = function() {
   var self = this;
 
@@ -1745,23 +1696,23 @@ KimapSDK.prototype._decryptKidata = function(encrypted) {
 
 KimapSDK.prototype._loadFurnitureModels = function(kidataObj) {
   var self = this;
-  
+
   if (!kidataObj.furnitures || kidataObj.furnitures.length === 0) {
     return Promise.resolve({ loaded: 0, failed: 0 });
   }
-  
+
   // 创建家具组（如果不存在）
   if (!this.furnitureGroup) {
     this.furnitureGroup = new THREE.Group();
     this.furnitureGroup.name = 'furnitures';
     this.core.scene.add(this.furnitureGroup);
   }
-  
+
   // 清空现有家具
   while (this.furnitureGroup.children.length > 0) {
     var child = this.furnitureGroup.children[0];
     this.furnitureGroup.remove(child);
-    
+
     // 释放资源
     if (child.geometry) child.geometry.dispose();
     if (child.material) {
@@ -1772,31 +1723,62 @@ KimapSDK.prototype._loadFurnitureModels = function(kidataObj) {
       }
     }
   }
-  
+
   // 优先使用dataUrl，如果不存在则使用serverUrl（兼容旧版本）
   var serverUrl = kidataObj.dataUrl || kidataObj.serverUrl;
   var loadPromises = [];
   var loadedCount = 0;
   var failedCount = 0;
-  
-  // 加载每个家具模型
+
+  // 检查kidata是否包含楼层信息，用于多楼层家具分组
+  var hasFloorInfo = kidataObj.floors && kidataObj.floors.length > 0;
+
+  // 按楼层分组家具（如果kidata包含楼层信息）
+  var furnitureByFloor = {};
+  if (hasFloorInfo) {
+    kidataObj.floors.forEach(function(floor) {
+      furnitureByFloor[floor.id] = [];
+    });
+  }
+
+  // 收集所有家具到对应楼层
   kidataObj.furnitures.forEach(function(furniture) {
-    var promise = self._loadSingleFurniture(furniture, serverUrl)
-      .then(function(mesh) {
-        if (mesh) {
-          self.furnitureGroup.add(mesh);
-          loadedCount++;
-        } else {
+    var floorId = furniture.floorId || furniture.floor || 'floor_0';
+    if (!furnitureByFloor[floorId]) {
+      furnitureByFloor[floorId] = [];
+    }
+    furnitureByFloor[floorId].push(furniture);
+  });
+
+  // 加载每个楼层的家具
+  Object.keys(furnitureByFloor).forEach(function(floorId) {
+    var floorFurnitures = furnitureByFloor[floorId];
+    if (!floorFurnitures || floorFurnitures.length === 0) return;
+
+    // 为每个楼层创建子Group
+    var floorFurnitureGroup = new THREE.Group();
+    floorFurnitureGroup.name = 'furniture_' + floorId;
+    floorFurnitureGroup.userData.floorId = floorId;
+    self.furnitureGroup.add(floorFurnitureGroup);
+
+    floorFurnitures.forEach(function(furniture) {
+      var promise = self._loadSingleFurniture(furniture, serverUrl)
+        .then(function(mesh) {
+          if (mesh) {
+            floorFurnitureGroup.add(mesh);
+            loadedCount++;
+          } else {
+            failedCount++;
+          }
+        })
+        .catch(function(error) {
           failedCount++;
-        }
-      })
-      .catch(function(error) {
-        failedCount++;
-      });
-    
-    loadPromises.push(promise);
+        });
+
+      loadPromises.push(promise);
+    });
   });
-  
+
   return Promise.all(loadPromises).then(function() {
     return { loaded: loadedCount, failed: failedCount };
   });

package/src/core/SceneCore.js

@@ -265,6 +265,11 @@ SceneCore.prototype._loadMultiFloorMaps = function(OBJLoader, MTLLoader, objUrls
     });
   }, Promise.resolve()).then(function() {
     console.log('SceneCore: 多楼层模型加载完成，共', self.floorGroups.length, '个楼层');
+    // 所有楼层加载完成后，调整相机到所有楼层（确保包围盒包含所有层）
+    // 这只在有多个楼层时必要，单楼层会被SDK init中的_showSingleFloor处理
+    if (self.floorGroups.length > 1) {
+      self._adjustCameraToAllFloors();
+    }
   });
 };
 
@@ -693,8 +698,8 @@ SceneCore.prototype._processLoadedModel = function(object, materials, colorMap)
   var areaLevel = 1; // 区域层级从1开始
   
   self.mapModel.traverse(function(child) {
-    // 隐藏底平面交互层
-    if (child.name === 'HiddenGroundPlane' || child.name.includes('InteractionLayer')) {
+    // 隐藏底平面交互层（扩展匹配规则）
+    if (self._isHiddenGroundMesh(child.name)) {
       child.visible = false;
       console.log('✅ 隐藏交互层底平面:', child.name);
       return;
@@ -784,7 +789,7 @@ SceneCore.prototype._processLoadedModelToGroup = function(object, materials, col
 
   // 处理材质
   object.traverse(function(child) {
-    if (child.name === 'HiddenGroundPlane' || child.name.includes('InteractionLayer')) {
+    if (self._isHiddenGroundMesh(child.name)) {
       child.visible = false;
       return;
     }
@@ -793,11 +798,6 @@ SceneCore.prototype._processLoadedModelToGroup = function(object, materials, col
       self._processMaterial(child, materials, colorMap);
     }
   });
-
-  // 只在第一个楼层调整相机
-  if (floorIndex === 0) {
-    self._adjustCameraToAllFloors();
-  }
 };
 
 /**
@@ -853,6 +853,29 @@ SceneCore.prototype._adjustCameraToAllFloors = function() {
   }
 };
 
+/**
+ * 判断是否为需要隐藏的底面/交互层mesh
+ * @private
+ */
+SceneCore.prototype._isHiddenGroundMesh = function(name) {
+  if (!name) return false;
+  var lowerName = name.toLowerCase();
+  // 扩展匹配规则：包含以下关键字的mesh将被隐藏
+  var hiddenPatterns = [
+    'hiddengroundplane',
+    'interactionlayer',
+    'groundplane',
+    'baseplate',
+    'groundlayer',
+    'floor_ground',
+    'bottom',
+    'ground_base'
+  ];
+  return hiddenPatterns.some(function(pattern) {
+    return lowerName.includes(pattern);
+  });
+};
+
 /**
  * 处理材质（内部方法）
  * @private