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

package/package.json

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

package/src/core/KimapSDK.js

@@ -914,12 +914,13 @@ KimapSDK.prototype._zoomToShowAllFloors = function() {
     box.getSize(size);
 
     var maxSize = Math.max(size.x, size.z);
-    var distance = maxSize * 2;
+    var distance = maxSize * 1.2;
 
-    // 计算目标位置
+    // 计算目标位置 - 从侧面-45度角看过去，镜头拉近
+    // X负方向偏移，Z方向也偏移，形成-45度角
     var targetPosition = new THREE.Vector3(
-      center.x,
-      center.y + distance * 1.5,
+      center.x - distance,
+      center.y + distance * 0.6,
       center.z + distance
     );
 
@@ -1198,6 +1199,8 @@ KimapSDK.prototype._createFallbackBuilding = function(x, z) {
 
   var buildingGroup = new THREE.Group();
   buildingGroup.position.set(x, 0, z);
+  buildingGroup.castShadow = false;
+  buildingGroup.receiveShadow = false;
 
   // 主楼体 - 淡蓝色半透明
   var geometry = new THREE.BoxGeometry(width, height, depth);
@@ -1211,11 +1214,15 @@ KimapSDK.prototype._createFallbackBuilding = function(x, z) {
     transparent: true,
     opacity: 0.7,
     emissive: new THREE.Color(0x1e3d5c),
-    emissiveIntensity: 0.3
+    emissiveIntensity: 0.3,
+    castShadow: false,
+    receiveShadow: false
   });
 
   var building = new THREE.Mesh(geometry, material);
   building.position.y = height / 2;
+  building.castShadow = false;
+  building.receiveShadow = false;
   buildingGroup.add(building);
 
   // 添加窗户细节（较亮）
@@ -1310,6 +1317,8 @@ KimapSDK.prototype._createTechGround = function() {
   this.techGroundGroup = new THREE.Group();
   this.techGroundGroup.name = 'techGround';
   this.techGroundGroup.visible = false; // 默认隐藏
+  this.techGroundGroup.castShadow = false;
+  this.techGroundGroup.receiveShadow = false;
   this.core.scene.add(this.techGroundGroup);
 
   // 创建网格地面
@@ -1317,18 +1326,23 @@ KimapSDK.prototype._createTechGround = function() {
   gridHelper.position.y = -0.1;
   gridHelper.material.opacity = 0.3;
   gridHelper.material.transparent = true;
+  gridHelper.castShadow = false;
+  gridHelper.receiveShadow = false;
   this.techGroundGroup.add(gridHelper);
 
-  // 创建地面平面
+  // 创建地面平面 - 降低透明度，不遮挡光线
   var groundGeometry = new THREE.PlaneGeometry(groundSize, groundSize);
   var groundMaterial = new THREE.MeshBasicMaterial({
     color: 0x0a1628,
     transparent: true,
-    opacity: 0.8
+    opacity: 0.4,
+    depthWrite: false
   });
   var ground = new THREE.Mesh(groundGeometry, groundMaterial);
   ground.rotation.x = -Math.PI / 2;
   ground.position.y = -0.2;
+  ground.castShadow = false;
+  ground.receiveShadow = false;
   this.techGroundGroup.add(ground);
 };
 

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;
 
 /**
@@ -182,27 +183,23 @@ SceneCore.prototype.initControls = function(OrbitControls) {
  * 设置灯光
  */
 SceneCore.prototype.setupLights = function() {
-  // 环境光
-  var ambientLight = new THREE.AmbientLight(0xffffff, 0.25);
+  // 环境光 - 提高亮度
+  var ambientLight = new THREE.AmbientLight(0xffffff, 0.8);
   this.scene.add(ambientLight);
-  
-  // 主光源（从上方）
-  var directionalLight1 = new THREE.DirectionalLight(0xffffff, 0.05);
+
+  // 主光源（从上方）- 提高亮度
+  var directionalLight1 = new THREE.DirectionalLight(0xffffff, 0.6);
   directionalLight1.position.set(10, 20, 10);
-  directionalLight1.castShadow = true;
-  directionalLight1.shadow.camera.left = -50;
-  directionalLight1.shadow.camera.right = 50;
-  directionalLight1.shadow.camera.top = 50;
-  directionalLight1.shadow.camera.bottom = -50;
+  directionalLight1.castShadow = false;
   this.scene.add(directionalLight1);
-  
-  // 辅助光源
-  var directionalLight2 = new THREE.DirectionalLight(0xffffff, 0);
+
+  // 辅助光源 - 提高亮度
+  var directionalLight2 = new THREE.DirectionalLight(0xffffff, 0.4);
   directionalLight2.position.set(-10, 15, -10);
   this.scene.add(directionalLight2);
-  
-  // 半球光
-  var hemisphereLight = new THREE.HemisphereLight(0xffffff, 0x444444, 0.3);
+
+  // 半球光 - 提高亮度
+  var hemisphereLight = new THREE.HemisphereLight(0xffffff, 0x444444, 0.5);
   this.scene.add(hemisphereLight);
 };
 
@@ -452,7 +449,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 +624,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 +1154,21 @@ 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;
+      // 强制设置区域透明度为0.3
+      opacity = 0.3;
+      transparent = opacity < 1.0;
+      // 添加轻微emissive提亮区域颜色
+      emissiveEnabled = true;
+      emissiveColor = mtlColor;
+      emissiveIntensity = 0.2;
       // 区域通常是高透明度的，关闭depthWrite避免与3D家具的深度冲突
       depthWrite = false;
     } else if (child.material.name.startsWith('Wall_')) {
@@ -1196,6 +1214,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
 };