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

package/package.json

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

package/src/core/KimapSDK.js

@@ -10,6 +10,9 @@ var SceneCore = require('./SceneCore.js');
 // THREE.js 将在运行时加载
 var THREE = null;
 var loadThree = loaders.loadThree;
+var loadOBJLoader = loaders.loadOBJLoader;
+var loadFBXLoader = loaders.loadFBXLoader;
+var loadGLTFLoader = loaders.loadGLTFLoader;
 
 /**
  * KimapSDK 构造函数
@@ -140,7 +143,98 @@ KimapSDK.prototype.startRenderLoop = function() {
  * @private
  */
 KimapSDK.prototype._extractWallsFromModel = function() {
-  // 实现省略，保持原有逻辑
+  var self = this;
+  
+  if (!self.core || !self.core.mapModel) {
+    console.warn('KimapSDK: 3D模型未加载，无法提取墙面数据');
+    return;
+  }
+  
+  var walls = [];
+  var floorGroups = {};
+  
+  // 遍历场景中的所有对象，查找墙面
+  self.core.mapModel.traverse(function(child) {
+    if (child.name && child.name.startsWith('Wall_')) {
+      var box = new THREE.Box3().setFromObject(child);
+      var min = box.min;
+      var max = box.max;
+      
+      var centerX = (min.x + max.x) / 2;
+      var centerZ = (min.z + max.z) / 2;
+      var width = max.x - min.x;
+      var depth = max.z - min.z;
+      var height = max.y - min.y;
+      
+      var isHorizontal = width > depth;
+      var thickness = isHorizontal ? depth : width;
+      
+      var points;
+      if (isHorizontal) {
+        points = [
+          { x: min.x * 100, y: centerZ * 100 },
+          { x: max.x * 100, y: centerZ * 100 }
+        ];
+      } else {
+        points = [
+          { x: centerX * 100, y: min.z * 100 },
+          { x: centerX * 100, y: max.z * 100 }
+        ];
+      }
+      
+      var floorLevel = Math.floor(min.y / 3);
+      
+      var wallData = {
+        type: 'wall',
+        id: child.name,
+        visible: true,
+        passable: false,
+        points: points,
+        thickness: thickness * 1000,
+        height: height * 1000,
+        floorLevel: floorLevel
+      };
+      
+      walls.push(wallData);
+      
+      if (!floorGroups[floorLevel]) {
+        floorGroups[floorLevel] = [];
+      }
+      floorGroups[floorLevel].push(wallData);
+    }
+  });
+  
+  console.log('✅ 从3D模型中提取墙面数据:', walls.length, '个墙面');
+  
+  var floors = [];
+  Object.keys(floorGroups).sort().forEach(function(level) {
+    var floorId = 'floor_' + level;
+    var floorName = (parseInt(level) + 1) + '楼';
+    
+    floors.push({
+      id: floorId,
+      name: floorName,
+      level: parseInt(level),
+      height: 3000,
+      elevation: parseInt(level) * 3000,
+      isDefault: level === '0',
+      layers: [
+        {
+          id: floorId + '_layer_walls',
+          name: '墙体图层',
+          visible: true,
+          elements: floorGroups[level]
+        }
+      ]
+    });
+  });
+  
+  if (floors.length > 0) {
+    self.setFloors(floors);
+    console.log('✅ 已自动设置楼层数据（从3D模型提取）');
+  } else {
+    console.warn('⚠️ 未从3D模型中提取到墙面数据');
+  }
 };
 
 // ==================== DOM 标记相关方法 ====================
@@ -306,19 +400,7 @@ KimapSDK.prototype.getDrawPoints = function() {
 };
 
 // ==================== 3D 模型加载相关方法 ====================
-// 注意：这部分代码较长，包含 kidata 加载、家具模型加载等
-// 为了保持文件精简，这里只保留核心方法签名
-// 完整实现请参考原 KimapCore.js 文件
-
-KimapSDK.prototype.loadKidata = function(kidataUrl) {
-  // 实现：加载 kidata 文件
-  // 原代码约 200 行
-};
-
-KimapSDK.prototype._loadFurnitureModels = function() {
-  // 实现：加载家具 3D 模型
-  // 原代码约 150 行
-};
+// loadKidata 和 _loadFurnitureModels 的完整实现在文件后面部分
 
 // ==================== 楼层管理相关方法 ====================
 
@@ -747,19 +829,34 @@ KimapSDK.prototype._loadSingleFurniture = function(furniture, serverUrl) {
     }
 
     var modelUrl;
-    var loader;
+    var loaderPromise;
 
-    if (ext === '.fbx' && typeof THREE.FBXLoader === 'function') {
+    // 根据文件扩展名选择合适的loader
+    if (ext === '.fbx') {
       modelUrl = baseUrl + '/' + furniture.type + '/' + id + ext;
-      loader = new THREE.FBXLoader();
+      loaderPromise = loadFBXLoader().then(function(FBXLoader) {
+        return new FBXLoader();
+      });
+    } else if (ext === '.glb' || ext === '.gltf') {
+      modelUrl = baseUrl + '/' + furniture.type + '/' + id + ext;
+      loaderPromise = loadGLTFLoader().then(function(GLTFLoader) {
+        return new GLTFLoader();
+      });
     } else {
+      // 默认使用OBJ格式
       modelUrl = baseUrl + '/' + furniture.type + '/' + id + '.obj';
-      loader = new THREE.OBJLoader();
+      loaderPromise = loadOBJLoader().then(function(OBJLoader) {
+        return new OBJLoader();
+      });
     }
-
-    loader.load(
-      modelUrl,
-      function(obj) {
+    
+    // 等待loader加载完成后再加载模型
+    loaderPromise.then(function(loader) {
+      loader.load(
+        modelUrl,
+        function(result) {
+          // GLTF/GLB格式返回的是gltf对象，需要提取scene
+          var obj = (ext === '.glb' || ext === '.gltf') ? result.scene : result;
         // 应用旋转
         obj.rotation.set(
           furniture.rotation.x,
@@ -825,14 +922,18 @@ KimapSDK.prototype._loadSingleFurniture = function(furniture, serverUrl) {
           furnitureType: furniture.type
         };
         
-        resolve(obj);
-      },
-      undefined,
-      function(error) {
-        console.error('❌ 家具模型加载失败:', furniture.type, error);
-        reject(error);
-      }
-    );
+          resolve(obj);
+        },
+        undefined,
+        function(error) {
+          console.error('❌ 家具模型加载失败:', furniture.type, error);
+          reject(error);
+        }
+      );
+    }).catch(function(error) {
+      console.error('❌ 加载家具模型loader失败:', furniture.type, error);
+      reject(error);
+    });
   });
 };
 

package/src/core/SceneCore.js

@@ -405,27 +405,47 @@ SceneCore.prototype._loadKimapFile = function(kimapUrl, themeUrl, objLoader, mtl
 SceneCore.prototype._loadOBJFile = function(url, objLoader, resolve, reject) {
   var self = this;
   
-  console.log('加载OBJ文件...');
-  
-  objLoader.load(
-    url,
-    function(object) {
-      console.log('OBJ文件下载完成，开始处理...');
-      self._processLoadedModel(object, null, {});
-      resolve();
-    },
-    function(progress) {
-      if (progress.lengthComputable) {
-        var percent = (progress.loaded / progress.total * 100).toFixed(2);
-        console.log('OBJ加载进度:', percent + '%');
+  console.log('加载OBJ文件...', url);
+  
+  // 先验证URL是否返回正确的内容
+  fetch(url, { method: 'HEAD' })
+    .then(function(response) {
+      if (!response.ok) {
+        throw new Error('文件不存在或无法访问 (HTTP ' + response.status + ')');
+      }
+      
+      var contentType = response.headers.get('content-type');
+      if (contentType && contentType.includes('text/html')) {
+        throw new Error('URL返回的是HTML页面而不是OBJ文件，请检查URL是否正确');
       }
-    },
-    function(error) {
-      console.error('❌ OBJ文件加载失败:', error);
+      
+      // URL验证通过，开始加载
+      objLoader.load(
+        url,
+        function(object) {
+          console.log('OBJ文件下载完成，开始处理...');
+          self._processLoadedModel(object, null, {});
+          resolve();
+        },
+        function(progress) {
+          if (progress.lengthComputable) {
+            var percent = (progress.loaded / progress.total * 100).toFixed(2);
+            console.log('OBJ加载进度:', percent + '%');
+          }
+        },
+        function(error) {
+          console.error('❌ OBJ文件加载失败:', error);
+          console.error('URL:', url);
+          reject(error);
+        }
+      );
+    })
+    .catch(function(error) {
+      console.error('❌ OBJ文件URL验证失败:', error.message);
       console.error('URL:', url);
+      console.error('提示: 请确保URL指向有效的.obj文件');
       reject(error);
-    }
-  );
+    });
 };
 
 /**

package/src/core/loaders.js

@@ -108,11 +108,31 @@ function loadMTLLoader() {
   });
 }
 
+/**
+ * 加载GLTFLoader
+ */
+function loadGLTFLoader() {
+  return new Promise(function(resolve, reject) {
+    if (!THREE) {
+      reject(new Error('Three.js未初始化，请先调用loadThree()'));
+      return;
+    }
+    
+    try {
+      var module = require('three/examples/jsm/loaders/GLTFLoader.js');
+      resolve(module.GLTFLoader);
+    } catch (error) {
+      reject(new Error('Failed to load GLTFLoader: ' + error.message));
+    }
+  });
+}
+
 module.exports = {
   setThreeInstance: setThreeInstance,
   loadThree: loadThree,
   loadOrbitControls: loadOrbitControls,
   loadOBJLoader: loadOBJLoader,
   loadFBXLoader: loadFBXLoader,
-  loadMTLLoader: loadMTLLoader
+  loadMTLLoader: loadMTLLoader,
+  loadGLTFLoader: loadGLTFLoader
 };