@kimap/indoor-positioning-sdk-vue2 3.9.0 → 3.9.1

package/package.json

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

package/src/KimapCore.js

@@ -19,18 +19,6 @@ function loadThree() {
   });
 }
 
-// FBXLoader 动态导入
-function loadFBXLoader() {
-  return new Promise(function(resolve, reject) {
-    try {
-      var module = require('three/examples/jsm/loaders/FBXLoader.js');
-      resolve(module.FBXLoader || module.default || module);
-    } catch (error) {
-      reject(new Error('Failed to load FBXLoader: ' + error.message));
-    }
-  });
-}
-
 // OrbitControls 动态导入
 function loadOrbitControls() {
   return new Promise(function(resolve, reject) {
@@ -345,7 +333,7 @@ SceneCore.prototype.initScene = function() {
   this.scene = new THREE.Scene();
   var bgColor = this.config.backgroundColor !== undefined 
     ? this.config.backgroundColor 
-    : 0xf5f5f5;
+    : 0xf0f0f0;
   this.scene.background = new THREE.Color(bgColor);
 };
 
@@ -370,7 +358,7 @@ SceneCore.prototype.setCameraPosition = function() {
 };
 
 SceneCore.prototype.initRenderer = function() {
-  this.renderer = new THREE.WebGLRenderer({ antialias: true, alpha: true });
+  this.renderer = new THREE.WebGLRenderer({ antialias: true });
   this.renderer.setSize(this.container.clientWidth, this.container.clientHeight);
   this.renderer.setPixelRatio(window.devicePixelRatio);
   
@@ -381,8 +369,8 @@ SceneCore.prototype.initRenderer = function() {
   // 设置输出色彩空间为sRGB
   this.renderer.outputColorSpace = THREE.SRGBColorSpace;
   
-  // 色调映射设置（与编辑器3D预览保持一致）
-  this.renderer.toneMapping = THREE.NoToneMapping;
+  // 色调映射设置（优化颜色显示）
+  this.renderer.toneMapping = THREE.CineonToneMapping;  // 3 = Cineon
   this.renderer.toneMappingExposure = 1.0;
   
   this.container.appendChild(this.renderer.domElement);
@@ -408,7 +396,7 @@ SceneCore.prototype.setupLights = function() {
   this.scene.add(ambientLight);
   
   // 主光源（从上方）
-  var directionalLight1 = new THREE.DirectionalLight(0xffffff, 0.8);
+  var directionalLight1 = new THREE.DirectionalLight(0xffffff, 0.75);
   directionalLight1.position.set(10, 20, 10);
   directionalLight1.castShadow = true;
   directionalLight1.shadow.camera.left = -50;
@@ -418,12 +406,12 @@ SceneCore.prototype.setupLights = function() {
   this.scene.add(directionalLight1);
   
   // 辅助光源
-  var directionalLight2 = new THREE.DirectionalLight(0xffffff, 0.4);
+  var directionalLight2 = new THREE.DirectionalLight(0xffffff, 0.15);
   directionalLight2.position.set(-10, 15, -10);
   this.scene.add(directionalLight2);
   
   // 半球光
-  var hemisphereLight = new THREE.HemisphereLight(0xffffff, 0x444444, 0.4);
+  var hemisphereLight = new THREE.HemisphereLight(0xffffff, 0x444444, 0.15);
   this.scene.add(hemisphereLight);
 };
 
@@ -598,31 +586,29 @@ SceneCore.prototype.loadMap = function(OBJLoader, MTLLoader) {
                   
                   // 提取颜色
                   var mtlColor = child.material.color ? child.material.color.getHex() : 0xdddddd;
-                  var baseColor = new THREE.Color(mtlColor);
                   var opacity = child.material.opacity !== undefined ? child.material.opacity : 1.0;
                   var transparent = opacity < 1.0;
                   
-                  // 根据材质名称判断元素类型，设置与编辑器预览接近的PBR参数
-                  var roughness = 0.95;
-                  var metalness = 0.0;
-
-                  // 墙体：颜色与白色混合 50%，使墙面更浅
-                  if (child.material.name.startsWith('Wall_')) {
-                    baseColor = baseColor.lerp(new THREE.Color(0xffffff), 0.5);
-                  }
-
-                  // 区域 / 形状 / 楼梯 与预览保持相似的高粗糙度、无金属反光
-                  // 区域通常需要透明度，由 MTL 的 opacity 控制，此处仅保留 transparent 标记
+                  // 根据材质名称判断元素类型，设置对应的PBR参数
+                  var roughness = 0.7;
+                  var metalness = 0.1;
+                  
                   if (child.material.name.startsWith('Area_')) {
-                    transparent = opacity < 1.0;
+                    roughness = 0.05;
+                    metalness = 0.3;
+                    transparent = true;
+                  } else if (child.material.name.startsWith('Wall_')) {
+                    roughness = 0.55;
+                    metalness = 0.1;
                   } else if (child.material.name.startsWith('Shape_') || 
                              child.material.name.startsWith('Stair_')) {
-                    // 使用同一套 roughness/metalness
+                    roughness = 0.7;
+                    metalness = 0.3;
                   }
                   
                   // 创建新的PBR材质
                   child.material = new THREE.MeshStandardMaterial({
-                    color: baseColor,
+                    color: mtlColor,
                     opacity: opacity,
                     transparent: transparent,
                     roughness: roughness,
@@ -643,11 +629,11 @@ SceneCore.prototype.loadMap = function(OBJLoader, MTLLoader) {
                   }
                   
                   console.log('⚪ 创建默认材质 for', child.name || child.parent.name);
-                  // 设置材质（与预览接近：高粗糙度、无金属反光）
+                  // 设置材质
                   child.material = new THREE.MeshStandardMaterial({
                     color: meshColor,
-                    roughness: 0.95,
-                    metalness: 0.0,
+                    roughness: 0.7,
+                    metalness: 0.1,
                     side: THREE.DoubleSide
                   });
                 }
@@ -1483,41 +1469,15 @@ KimapSDK.prototype._loadFurnitureModels = function(kidataObj) {
 KimapSDK.prototype._loadSingleFurniture = function(furniture, serverUrl) {
   var self = this;
   
-  return new Promise(function(resolve, reject) {
-    // 构建模型URL
-    // serverUrl已经包含了完整的路径（例如：http://server.com/KiMap_3D_Model）
-    // 使用dataUrl（如果serverUrl不可用）或serverUrl
-    var baseUrl = serverUrl || self.dataUrl;
-
-    // 解析文件扩展名：优先使用 kidata 中的 fileExt，其次从 id 中解析，最后默认为 .obj
-    var ext = furniture.fileExt || null;
-    var id = furniture.id;
-
-    if (!ext && typeof id === 'string') {
-      var dotIndex = id.lastIndexOf('.');
-      if (dotIndex >= 0) {
-        ext = id.substring(dotIndex).toLowerCase();
-        id = id.substring(0, dotIndex);
-      }
-    }
-
-    if (!ext) {
-      ext = '.obj';
-    }
-
-    var modelUrl = baseUrl + '/' + furniture.type + '/' + id + ext;
-
-    // 根据扩展名选择合适的加载器
-    var loaderPromise;
-    if (ext === '.fbx') {
-      loaderPromise = loadFBXLoader();
-    } else {
-      // 默认和其它格式暂时都走 OBJLoader，保证兼容旧数据
-      loaderPromise = loadOBJLoader();
-    }
-
-    loaderPromise.then(function(LoaderClass) {
-      var loader = new LoaderClass();
+  return loadOBJLoader().then(function(OBJLoader) {
+    return new Promise(function(resolve, reject) {
+      // 构建模型URL
+      // serverUrl已经包含了完整的路径（例如：http://server.com/KiMap_3D_Model）
+      // 使用dataUrl（如果serverUrl不可用）或serverUrl
+      var baseUrl = serverUrl || self.dataUrl;
+      var modelUrl = baseUrl + '/' + furniture.type + '/' + furniture.id + '.obj';
+      
+      var loader = new OBJLoader();
       loader.load(
         modelUrl,
         function(obj) {
@@ -1592,18 +1552,15 @@ KimapSDK.prototype._loadSingleFurniture = function(furniture, serverUrl) {
             furnitureType: furniture.type
           };
           
-          console.log('✅ 家具模型加载成功:', furniture.type, 'URL:', modelUrl);
+          console.log('✅ 家具模型加载成功:', furniture.type);
           resolve(obj);
         },
         undefined,
         function(error) {
-          console.error('❌ 家具模型加载失败:', furniture.type, 'URL:', modelUrl, error);
+          console.error('❌ 家具模型加载失败:', furniture.type, error);
           reject(error);
         }
       );
-    }).catch(function(error) {
-      console.error('❌ 加载家具模型加载器失败:', error);
-      reject(error);
     });
   });
 };