@kimap/indoor-positioning-sdk-vue2 5.4.7 → 5.4.8

package/package.json

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

package/src/core/KimapSDK.js

@@ -916,10 +916,11 @@ KimapSDK.prototype._zoomToShowAllFloors = function() {
     var maxSize = Math.max(size.x, size.z);
     var distance = maxSize * 2;
 
-    // 计算目标位置
+    // 计算目标位置 - 从侧面斜45度角看过去
+    // X方向偏移distance，Z方向也偏移distance，形成45度角
     var targetPosition = new THREE.Vector3(
-      center.x,
-      center.y + distance * 1.5,
+      center.x + distance,
+      center.y + distance * 0.8,
       center.z + distance
     );
 

package/src/core/SceneCore.js

@@ -29,6 +29,7 @@ var extractColorsFromOBJ = parsers.extractColorsFromOBJ;
 var extractTextElementsFromOBJ = parsers.extractTextElementsFromOBJ;
 var extractWallOpacityFromOBJ = parsers.extractWallOpacityFromOBJ;
 var extractShapeOpacityFromOBJ = parsers.extractShapeOpacityFromOBJ;
+var extractAreaOpacityFromOBJ = parsers.extractAreaOpacityFromOBJ;
 var extractCalibrationBoundaryAreaIdsFromOBJ = parsers.extractCalibrationBoundaryAreaIdsFromOBJ;
 
 /**
@@ -452,7 +453,13 @@ SceneCore.prototype._loadKimapFile = function(kimapUrl, themeUrl, objLoader, mtl
           if (shapeOpacity && Object.keys(shapeOpacity).length > 0) {
             self._shapeOpacity = shapeOpacity;
           }
-        
+
+          // 提取区域透明度信息
+          var areaOpacity = extractAreaOpacityFromOBJ(objContent);
+          if (areaOpacity && Object.keys(areaOpacity).length > 0) {
+            self._areaOpacity = areaOpacity;
+          }
+
           // 解析OBJ内容
           var object = objLoader.parse(objContent);
           
@@ -621,6 +628,11 @@ SceneCore.prototype._loadKimapFileToGroup = function(kimapUrl, themeUrl, objLoad
             if (shapeOpacity && Object.keys(shapeOpacity).length > 0) {
               self._shapeOpacity = shapeOpacity;
             }
+
+            var areaOpacity = extractAreaOpacityFromOBJ(objContent);
+            if (areaOpacity && Object.keys(areaOpacity).length > 0) {
+              self._areaOpacity = areaOpacity;
+            }
           }
 
           var object = objLoader.parse(objContent);
@@ -1146,11 +1158,26 @@ SceneCore.prototype._processMaterial = function(child, materials, colorMap) {
     // 与主应用 three-helper.ts 保持一致
     // =====================================================
     var depthWrite = true;
-    
+    var emissiveEnabled = false;
+    var emissiveColor = 0x000000;
+    var emissiveIntensity = 0;
+
     if (child.material.name.startsWith('Area_')) {
       roughness = 0.5;
       metalness = 0.2;
       transparent = true;
+      // 从OBJ提取的区域透明度数据中读取
+      if (self._areaOpacity) {
+        var areaId = child.material.name.replace('Area_', '');
+        if (self._areaOpacity[areaId]) {
+          opacity = self._areaOpacity[areaId].opacity;
+          transparent = opacity < 1.0;
+        }
+      }
+      // 添加轻微emissive提亮区域颜色
+      emissiveEnabled = true;
+      emissiveColor = mtlColor;
+      emissiveIntensity = 0.15;
       // 区域通常是高透明度的，关闭depthWrite避免与3D家具的深度冲突
       depthWrite = false;
     } else if (child.material.name.startsWith('Wall_')) {
@@ -1196,6 +1223,8 @@ SceneCore.prototype._processMaterial = function(child, materials, colorMap) {
       transparent: transparent,
       roughness: roughness,
       metalness: metalness,
+      emissive: emissiveEnabled ? new THREE.Color(emissiveColor) : new THREE.Color(0x000000),
+      emissiveIntensity: emissiveEnabled ? emissiveIntensity : 0,
       side: THREE.DoubleSide,
       depthWrite: depthWrite  // 高透明度时关闭depthWrite避免频闪
     });

package/src/core/parsers.js

@@ -242,6 +242,36 @@ function extractShapeOpacityFromOBJ(objContent) {
   return shapeOpacity;
 }
 
+/**
+ * 从OBJ内容中提取区域透明度信息
+ * 格式: # AREA_OPACITY 0.9
+ */
+function extractAreaOpacityFromOBJ(objContent) {
+  var areaOpacity = {};
+  var lines = objContent.split('\n');
+  var currentAreaId = null;
+
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i].trim();
+
+    if (line.indexOf('o Area_') === 0) {
+      // 提取区域ID（格式：Area_<id>）
+      var match = line.match(/Area_(.+)/);
+      if (match) {
+        currentAreaId = match[1];
+      }
+    } else if (currentAreaId && line.indexOf('# AREA_OPACITY') === 0) {
+      var opacity = parseFloat(line.split(' ')[2]);
+      if (!areaOpacity[currentAreaId]) {
+        areaOpacity[currentAreaId] = {};
+      }
+      areaOpacity[currentAreaId].opacity = opacity;
+    }
+  }
+
+  return areaOpacity;
+}
+
 /**
  * 从 OBJ 中提取「真实世界尺寸校准边界」区域 ID（与绘制端 objExporter 中 # KIMAP_AREA_CALIBRATION_BOUNDARY 对应）
  * 仅此类区域不应显示；普通 Area_ 地面应保留。
@@ -273,5 +303,6 @@ module.exports = {
   extractTextElementsFromOBJ: extractTextElementsFromOBJ,
   extractWallOpacityFromOBJ: extractWallOpacityFromOBJ,
   extractShapeOpacityFromOBJ: extractShapeOpacityFromOBJ,
+  extractAreaOpacityFromOBJ: extractAreaOpacityFromOBJ,
   extractCalibrationBoundaryAreaIdsFromOBJ: extractCalibrationBoundaryAreaIdsFromOBJ
 };