@kimap/indoor-positioning-sdk-vue2 4.2.0 → 4.2.1

package/package.json

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

package/src/core/KimapSDK.js

@@ -671,10 +671,169 @@ KimapSDK.prototype._loadFurnitureModels = function(kidataObj) {
     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) {
+      if (Array.isArray(child.material)) {
+        child.material.forEach(function(m) { m.dispose(); });
+      } else {
+        child.material.dispose();
+      }
+    }
+  }
+  
+  // 优先使用dataUrl，如果不存在则使用serverUrl（兼容旧版本）
+  var serverUrl = kidataObj.dataUrl || kidataObj.serverUrl;
+  var loadPromises = [];
+  var loadedCount = 0;
+  var failedCount = 0;
+  
   console.log('📦 开始加载', kidataObj.furnitures.length, '个家具模型');
   
-  // 简化版本:暂时返回成功,实际加载逻辑可以后续完善
-  return Promise.resolve({ loaded: 0, failed: 0, message: '家具加载功能需要完整实现' });
+  // 加载每个家具模型
+  kidataObj.furnitures.forEach(function(furniture) {
+    var promise = self._loadSingleFurniture(furniture, serverUrl)
+      .then(function(mesh) {
+        if (mesh) {
+          self.furnitureGroup.add(mesh);
+          loadedCount++;
+        } else {
+          failedCount++;
+        }
+      })
+      .catch(function(error) {
+        console.error('加载家具模型失败:', furniture.type, error);
+        failedCount++;
+      });
+    
+    loadPromises.push(promise);
+  });
+  
+  return Promise.all(loadPromises).then(function() {
+    return { loaded: loadedCount, failed: failedCount };
+  });
+};
+
+/**
+ * 加载单个家具模型
+ * @private
+ * @param {Object} furniture - 家具数据
+ * @param {string} serverUrl - 模型服务器URL
+ * @returns {Promise<THREE.Object3D>} 返回加载的模型对象
+ */
+KimapSDK.prototype._loadSingleFurniture = function(furniture, serverUrl) {
+  var self = this;
+  
+  return new Promise(function(resolve, reject) {
+    // 构建模型URL
+    var baseUrl = serverUrl || self.dataUrl;
+
+    // 从 id 中解析扩展名
+    var rawId = furniture.id || '';
+    var ext = '.obj';
+    var id = rawId;
+
+    if (typeof rawId === 'string') {
+      var dotIndex = rawId.lastIndexOf('.');
+      if (dotIndex >= 0) {
+        ext = rawId.substring(dotIndex).toLowerCase();
+        id = rawId.substring(0, dotIndex);
+      }
+    }
+
+    var modelUrl;
+    var loader;
+
+    if (ext === '.fbx' && typeof THREE.FBXLoader === 'function') {
+      modelUrl = baseUrl + '/' + furniture.type + '/' + id + ext;
+      loader = new THREE.FBXLoader();
+    } else {
+      modelUrl = baseUrl + '/' + furniture.type + '/' + id + '.obj';
+      loader = new THREE.OBJLoader();
+    }
+
+    loader.load(
+      modelUrl,
+      function(obj) {
+        // 应用旋转
+        obj.rotation.set(
+          furniture.rotation.x,
+          furniture.rotation.y,
+          furniture.rotation.z
+        );
+        
+        // 应用缩放
+        if (furniture.targetSize) {
+          // 计算模型的边界框
+          var box = new THREE.Box3().setFromObject(obj);
+          var size = new THREE.Vector3();
+          box.getSize(size);
+          
+          // 计算归一化缩放因子
+          var scaleX = size.x > 0 ? furniture.targetSize.width / size.x : 1;
+          var scaleY = size.y > 0 ? furniture.targetSize.height / size.y : 1;
+          var scaleZ = size.z > 0 ? furniture.targetSize.depth / size.z : 1;
+          var uniformScale = (scaleX + scaleY + scaleZ) / 3;
+          
+          // 应用归一化缩放和用户缩放
+          var finalScale = uniformScale * furniture.scale.x;
+          obj.scale.set(finalScale, finalScale, finalScale);
+        } else {
+          // 兼容旧版本kidata，直接使用scale值
+          obj.scale.set(
+            furniture.scale.x,
+            furniture.scale.y,
+            furniture.scale.z
+          );
+        }
+        
+        // 应用颜色（如果有）
+        if (furniture.color) {
+          var color = new THREE.Color(furniture.color);
+          obj.traverse(function(child) {
+            if (child instanceof THREE.Mesh) {
+              if (Array.isArray(child.material)) {
+                child.material.forEach(function(mat) {
+                  if (mat.color) mat.color.copy(color);
+                });
+              } else if (child.material && child.material.color) {
+                child.material.color.copy(color);
+              }
+            }
+          });
+        }
+        
+        // 重新计算边界框，将模型底部对齐到地面
+        var scaledBox = new THREE.Box3().setFromObject(obj);
+        var bottomOffset = -scaledBox.min.y;
+        
+        // 应用位置（包含底部对齐偏移）
+        obj.position.set(
+          furniture.position.x,
+          furniture.position.y + bottomOffset,
+          furniture.position.z
+        );
+        
+        obj.userData = {
+          type: 'furniture',
+          furnitureId: furniture.id,
+          furnitureType: furniture.type
+        };
+        
+        resolve(obj);
+      },
+      undefined,
+      function(error) {
+        console.error('❌ 家具模型加载失败:', furniture.type, error);
+        reject(error);
+      }
+    );
+  });
 };
 
 /**