fl-web-component 2.1.1-beta.4 → 2.1.1-beta.6

package/packages/components/com-graphics/index.vue

@@ -215,6 +215,7 @@ export default {
         isPaused: false,
       },
       isolateMode: false,
+      sceneBoundingBoxDebugEnabled: false,
       // collisionObbDebugEnabled: isDebug,
       collisionObbDebugEnabled: false,
     };
@@ -225,6 +226,13 @@ export default {
         this.detachTransformControls();
       }
     },
+    sceneBoundingBoxDebugEnabled(val) {
+      if (val) {
+        this.refreshSceneBoundingBoxHelper(true);
+      } else {
+        this.hideSceneBoundingBox();
+      }
+    },
   },
   beforeCreate() {
     this.spaceUp = true;
@@ -366,6 +374,7 @@ export default {
       isObserverEnabled: true, // 标记相机变更观察者是否启用
       sceneBoxes: new Map(),
       documentModelIds: new Map(),
+      documentSceneBoundsIds: new Map(),
       outlineInstanceProxyMap: new Map(),
       occlusionWorker: null,
       occlusionWorkerRequestMap: new Map(),
@@ -1470,71 +1479,108 @@ export default {
     updateGlobalSceneBoundingBox() {
       const state = this.noObserver || {};
       const occScene = state.occlusionState && state.occlusionState._occScene;
+      const mergedBox = new this.THREE.Box3();
+      let hasValidBox = false;
+      const mergeBox = box => {
+        if (!box || !box.isBox3 || box.isEmpty()) return;
+        if (!hasValidBox) {
+          mergedBox.copy(box);
+          hasValidBox = true;
+          return;
+        }
+        mergedBox.union(box);
+      };
 
-      // 优先使用由 boxIndex 构建出的离屏全场景，作为整体居中与 home 的统一范围
+      // 离屏遮挡场景只包含参与遮挡的模型，需要继续合并场景范围索引中的二维图形范围。
       if (occScene && occScene.children && occScene.children.length > 0) {
         const occBox = new this.THREE.Box3().setFromObject(occScene);
-        if (!occBox.isEmpty()) {
-          this.sceneBoundingBox = occBox;
-          return this.sceneBoundingBox;
-        }
+        mergeBox(occBox);
       }
 
-      // 离屏场景尚未完成时，回退到 boxIndex 联合包围盒，确保每次 add boxIndex 都能更新全场景范围
-      if (this._boxIndex && this._boxIndex.size > 0) {
-        let minX = Infinity,
-          minY = Infinity,
-          minZ = Infinity;
-        let maxX = -Infinity,
-          maxY = -Infinity,
-          maxZ = -Infinity;
-        this._boxIndex.forEach(box => {
-          if (!box || !box.isBox3 || box.isEmpty()) return;
-          const mn = box.min;
-          const mx = box.max;
-          if (mn.x < minX) minX = mn.x;
-          if (mn.y < minY) minY = mn.y;
-          if (mn.z < minZ) minZ = mn.z;
-          if (mx.x > maxX) maxX = mx.x;
-          if (mx.y > maxY) maxY = mx.y;
-          if (mx.z > maxZ) maxZ = mx.z;
+      // sceneBoundsIndex 包含二维和三维图形，是全场景 dolly 距离的主要范围来源。
+      if (this._sceneBoundsIndex && this._sceneBoundsIndex.size > 0) {
+        this._sceneBoundsIndex.forEach(box => {
+          mergeBox(box);
         });
-        if (
-          Number.isFinite(minX) &&
-          Number.isFinite(minY) &&
-          Number.isFinite(minZ) &&
-          Number.isFinite(maxX) &&
-          Number.isFinite(maxY) &&
-          Number.isFinite(maxZ)
-        ) {
-          this.sceneBoundingBox = new this.THREE.Box3(
-            new this.THREE.Vector3(minX, minY, minZ),
-            new this.THREE.Vector3(maxX, maxY, maxZ)
-          );
-          return this.sceneBoundingBox;
-        }
       }
 
       const boxes = Array.from((state.sceneBoxes && state.sceneBoxes.values()) || []);
       if (boxes.length > 0) {
-        const firstBox = boxes[0].clone();
-        for (let i = 1; i < boxes.length; i++) {
-          firstBox.union(boxes[i]);
+        for (let i = 0; i < boxes.length; i++) {
+          mergeBox(boxes[i]);
         }
-        this.sceneBoundingBox = firstBox;
+      }
+
+      if (hasValidBox) {
+        this.sceneBoundingBox = mergedBox;
+        this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
         return this.sceneBoundingBox;
       }
 
       this.sceneBoundingBox = new this.THREE.Box3();
+      this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
       return this.sceneBoundingBox;
     },
+    upsertIndexedBox(indexMap, modelId, box) {
+      if (!indexMap || !modelId || !box || !box.isBox3) return null;
+      const key = String(modelId);
+      const existingBox = indexMap.get(key);
+      if (!existingBox) {
+        indexMap.set(key, box);
+        return box;
+      }
+      existingBox.union(box);
+      return existingBox;
+    },
+    mergeModelBoxUserData(targetBox, sourceUserData) {
+      if (!targetBox || !sourceUserData) return;
+      if (!targetBox.userData) {
+        targetBox.userData = sourceUserData;
+        return;
+      }
+
+      const targetUserData = targetBox.userData;
+      targetUserData.visible = targetUserData.visible !== false || sourceUserData.visible !== false;
+      targetUserData.sourceVisible =
+        targetUserData.sourceVisible !== false || sourceUserData.sourceVisible !== false;
+      targetUserData.transparent = !!targetUserData.transparent && !!sourceUserData.transparent;
+      targetUserData.mergedBoxCount = (targetUserData.mergedBoxCount || 1) + 1;
+      // 同一模型包含多个图元时，单个图元的遮挡代理不再可靠，改由视锥体合并盒兜底加载。
+      targetUserData.occlusionEnabled = false;
+
+      const targetObbs = Array.isArray(targetUserData.collisionObbs)
+        ? targetUserData.collisionObbs
+        : [];
+      const sourceObbs = Array.isArray(sourceUserData.collisionObbs)
+        ? sourceUserData.collisionObbs
+        : [];
+      if (sourceObbs.length > 0) {
+        targetUserData.collisionObbs = targetObbs.concat(sourceObbs);
+      }
+    },
+    upsertModelBox(modelId, box) {
+      if (!this._boxIndex || !modelId || !box || !box.isBox3) return;
+      const key = String(modelId);
+      const existingBox = this._boxIndex.get(key);
+      if (!existingBox) {
+        this._boxIndex.set(key, box);
+        return;
+      }
+      existingBox.union(box);
+      this.mergeModelBoxUserData(existingBox, box.userData);
+    },
     setBoxIndex(boxJson, documentId, isAdd = true) {
       if (!this._boxIndex) this._boxIndex = new Map();
+      if (!this._sceneBoundsIndex) this._sceneBoundsIndex = new Map();
       if (!documentId) {
         this._boxIndex.clear();
+        this._sceneBoundsIndex.clear();
         if (this.noObserver && this.noObserver.documentModelIds) {
           this.noObserver.documentModelIds.clear();
         }
+        if (this.noObserver && this.noObserver.documentSceneBoundsIds) {
+          this.noObserver.documentSceneBoundsIds.clear();
+        }
         this.hasExecutedCentering = false;
         this.buildOctreeFromBoxIndex();
         return;
@@ -1543,19 +1589,35 @@ export default {
       if (isAdd && boxJson) {
         const arr = boxJson ? boxJson : [];
         const modelIds = new Set();
+        const sceneBoundIds = new Set();
         const validGeomTypes = new Set(Object.values(GEOM_TYPES));
         for (let i = 0; i < arr.length; i++) {
           const it = arr[i];
           if (!validGeomTypes.has(it.geomType)) {
             continue;
           }
-          if (it.obb.length == 0) {
+          const minSource = it.min;
+          const maxSource = it.max;
+          const hasValidMinMax =
+            minSource &&
+            maxSource &&
+            minSource.length >= 3 &&
+            maxSource.length >= 3 &&
+            Number.isFinite(minSource[0]) &&
+            Number.isFinite(minSource[1]) &&
+            Number.isFinite(minSource[2]) &&
+            Number.isFinite(maxSource[0]) &&
+            Number.isFinite(maxSource[1]) &&
+            Number.isFinite(maxSource[2]);
+          if (!hasValidMinMax) {
             continue;
           }
+          const obbData = it.obb || [];
+          const modelId = String(it.id);
 
           // 使用新的 min/max 数据结构
-          const min = new this.THREE.Vector3(it.min[0], it.min[1], it.min[2]);
-          const max = new this.THREE.Vector3(it.max[0], it.max[1], it.max[2]);
+          const min = new this.THREE.Vector3(minSource[0], minSource[1], minSource[2]);
+          const max = new this.THREE.Vector3(maxSource[0], maxSource[1], maxSource[2]);
 
           const sourceBox = new this.THREE.Box3(min.clone(), max.clone());
           // 八叉树仍使用 AABB 粗筛，最终碰撞使用 sourceBox 派生的 OBB 精筛
@@ -1589,10 +1651,18 @@ export default {
             boxThree.applyMatrix4(collisionMatrix);
           }
 
+          this.upsertIndexedBox(this._sceneBoundsIndex, modelId, boxThree.clone());
+          sceneBoundIds.add(modelId);
+
+          // 没有 OBB 数据的二维图形只参与全场景范围，不纳入碰撞和遮挡索引。
+          if (obbData.length === 0) {
+            continue;
+          }
+
           const userData = {
             flag: it.flag || 1, // 默认为 1
             geomType: it.geomType,
-            obbData: it.obb, // 存储原始 OBB 数据
+            obbData, // 存储原始 OBB 数据
             transparent: it.transp > 0,
             sourceVisible: it.visible === false ? false : true,
             visible: it.visible === false ? false : true, // 默认显示
@@ -1606,8 +1676,7 @@ export default {
             // userData.matrix = new this.THREE.Matrix4().identity();
           }
           // 如果是 flag=3，解析并存储中心点、半轴长、旋转矩阵
-          else if (it.flag === 3 && it.obb && it.obb.length === 15) {
-            const obbData = it.obb;
+          else if (it.flag === 3 && obbData.length === 15) {
             const center = new this.THREE.Vector3(obbData[0], obbData[1], obbData[2]);
             const halfSize = new this.THREE.Vector3(obbData[3], obbData[4], obbData[5]);
             const rotation = new this.THREE.Matrix3().fromArray(obbData.slice(6, 15));
@@ -1637,13 +1706,13 @@ export default {
             userData.collisionObbs = [collisionObb];
           }
           // 如果是 flag=2，解析并存储多个子包围盒 (min, max)
-          else if (it.flag === 2 && it.obb && it.obb.length > 0) {
+          else if (it.flag === 2 && obbData.length > 0) {
             const subBoxes = [];
             const collisionObbs = [];
-            for (let k = 0; k < it.obb.length; k += 6) {
-              if (k + 5 < it.obb.length) {
-                const min = new this.THREE.Vector3(it.obb[k], it.obb[k + 1], it.obb[k + 2]);
-                const max = new this.THREE.Vector3(it.obb[k + 3], it.obb[k + 4], it.obb[k + 5]);
+            for (let k = 0; k < obbData.length; k += 6) {
+              if (k + 5 < obbData.length) {
+                const min = new this.THREE.Vector3(obbData[k], obbData[k + 1], obbData[k + 2]);
+                const max = new this.THREE.Vector3(obbData[k + 3], obbData[k + 4], obbData[k + 5]);
                 subBoxes.push({ min, max });
 
                 const subBox = new this.THREE.Box3(min.clone(), max.clone());
@@ -1670,11 +1739,11 @@ export default {
 
           boxThree.userData = userData;
 
-          const modelId = String(it.id);
-          this._boxIndex.set(modelId, boxThree);
+          this.upsertModelBox(modelId, boxThree);
           modelIds.add(modelId);
         }
         this.noObserver.documentModelIds.set(documentId, modelIds);
+        this.noObserver.documentSceneBoundsIds.set(documentId, sceneBoundIds);
       } else {
         const modelIds = this.noObserver.documentModelIds.get(documentId);
         if (modelIds) {
@@ -1688,6 +1757,15 @@ export default {
             this.hasExecutedCentering = false;
           }
         }
+        const sceneBoundIds =
+          this.noObserver.documentSceneBoundsIds &&
+          this.noObserver.documentSceneBoundsIds.get(documentId);
+        if (sceneBoundIds) {
+          sceneBoundIds.forEach(id => {
+            this._sceneBoundsIndex.delete(id);
+          });
+          this.noObserver.documentSceneBoundsIds.delete(documentId);
+        }
       }
       this.buildOctreeFromBoxIndex();
       this.refreshCollisionObbDebug();
@@ -1704,7 +1782,9 @@ export default {
         this.sceneBoundingBox.isEmpty()
       )
         return;
-      if (!this._boxIndex || this._boxIndex.size === 0) return;
+      const hasBoxIndex = this._boxIndex && this._boxIndex.size > 0;
+      const hasSceneBoundsIndex = this._sceneBoundsIndex && this._sceneBoundsIndex.size > 0;
+      if (!hasBoxIndex && !hasSceneBoundsIndex) return;
 
       this.smartModelCenter(this.sceneBoundingBox, 0);
     },
@@ -4247,12 +4327,37 @@ export default {
     },
     // 动态设置视角滚轮的距离
     setCameraConfig() {
+      if (
+        !this.sceneBoundingBox ||
+        !this.sceneBoundingBox.isBox3 ||
+        this.sceneBoundingBox.isEmpty()
+      ) {
+        return;
+      }
       // let box3 = new this.THREE.Box3().setFromObject(this.sceneBoundingBox);
       let size = new this.THREE.Vector3();
       this.sceneBoundingBox.getSize(size);
       const maxBorder = Math.max(size.x, size.y, size.z);
+      if (isDebug) {
+        const center = this.sceneBoundingBox.getCenter(new this.THREE.Vector3());
+        console.log('sceneBoundingBox 调试信息', {
+          size: {
+            x: size.x,
+            y: size.y,
+            z: size.z,
+          },
+          center: {
+            x: center.x,
+            y: center.y,
+            z: center.z,
+          },
+          maxBorder,
+        });
+        this.refreshSceneBoundingBoxHelper(this.sceneBoundingBoxDebugEnabled);
+      }
       // this.cameraControls.this.camera.far = maxBorder * 10; // 设置相机的远裁剪面
       this.cameraControls.minDistance = maxBorder * 0.2; // 动态设置视角滚轮的距离
+      // this.cameraControls.minDistance = 1000; // 动态设置视角滚轮的距离
       this.camera.updateProjectionMatrix();
     },
     // 获取mesh的中心点
@@ -7476,9 +7581,87 @@ export default {
     /**
      * 隐藏场景包围盒
      */
+    refreshSceneBoundingBoxHelper(forceVisible = this.boundingBoxVisible) {
+      if (this.sceneBoundingBoxHelper && this.scene) {
+        this.scene.remove(this.sceneBoundingBoxHelper);
+        this.sceneBoundingBoxHelper.geometry && this.sceneBoundingBoxHelper.geometry.dispose();
+        if (Array.isArray(this.sceneBoundingBoxHelper.material)) {
+          this.sceneBoundingBoxHelper.material.forEach(material => {
+            material && material.dispose && material.dispose();
+          });
+        } else if (
+          this.sceneBoundingBoxHelper.material &&
+          this.sceneBoundingBoxHelper.material.dispose
+        ) {
+          this.sceneBoundingBoxHelper.material.dispose();
+        }
+        this.sceneBoundingBoxHelper = null;
+      }
+
+      if (
+        !forceVisible ||
+        !this.scene ||
+        !this.sceneBoundingBox ||
+        !this.sceneBoundingBox.isBox3 ||
+        this.sceneBoundingBox.isEmpty()
+      ) {
+        this.boundingBoxVisible = false;
+        return false;
+      }
+
+      const helper = new this.THREE.Box3Helper(this.sceneBoundingBox, 0x00ff88);
+      helper.name = 'sceneBoundingBoxHelper';
+      helper.renderOrder = 999;
+      if (helper.material) {
+        helper.material.depthTest = false;
+        helper.material.transparent = true;
+        helper.material.opacity = 0.9;
+      }
+      this.scene.add(helper);
+      this.sceneBoundingBoxHelper = helper;
+      this.boundingBoxVisible = true;
+      return true;
+    },
+
+    showSceneBoundingBox() {
+      this.sceneBoundingBoxDebugEnabled = true;
+      const shown = this.refreshSceneBoundingBoxHelper(true);
+      if (!shown) {
+        console.warn('sceneBoundingBox 无有效范围，无法绘制调试线框');
+        return;
+      }
+
+      const size = this.sceneBoundingBox.getSize(new this.THREE.Vector3());
+      const center = this.sceneBoundingBox.getCenter(new this.THREE.Vector3());
+      console.log('sceneBoundingBox 线框已绘制', {
+        size: {
+          x: size.x,
+          y: size.y,
+          z: size.z,
+        },
+        center: {
+          x: center.x,
+          y: center.y,
+          z: center.z,
+        },
+      });
+    },
+
     hideSceneBoundingBox() {
+      this.sceneBoundingBoxDebugEnabled = false;
       if (this.sceneBoundingBoxHelper && this.scene) {
         this.scene.remove(this.sceneBoundingBoxHelper);
+        this.sceneBoundingBoxHelper.geometry && this.sceneBoundingBoxHelper.geometry.dispose();
+        if (Array.isArray(this.sceneBoundingBoxHelper.material)) {
+          this.sceneBoundingBoxHelper.material.forEach(material => {
+            material && material.dispose && material.dispose();
+          });
+        } else if (
+          this.sceneBoundingBoxHelper.material &&
+          this.sceneBoundingBoxHelper.material.dispose
+        ) {
+          this.sceneBoundingBoxHelper.material.dispose();
+        }
         this.sceneBoundingBoxHelper = null;
         this.boundingBoxVisible = false;
         console.log('场景包围盒已隐藏');
@@ -7489,7 +7672,7 @@ export default {
      * 切换场景包围盒显示状态
      */
     toggleSceneBoundingBox() {
-      if (this.boundingBoxVisible) {
+      if (this.sceneBoundingBoxDebugEnabled) {
         this.hideSceneBoundingBox();
       } else {
         this.showSceneBoundingBox();

package/src/utils/instance-parser.js

@@ -1068,10 +1068,10 @@ function draw3Dmodel(
  * @param {String} instanceName - 模型实例的名称
  * @returns {Object} - 包含所有 2D 模型的组对象
  */
-function draw2Dmodel(geom, instanceName, instanceCount, nColor, nOpacity, options = {}) {
-  const points = geom.points;
-  const normals = geom.normals;
-  const geometry = new THREE.BufferGeometry();
+function draw2Dmodel(geom, instanceName, instanceCount, nColor, nOpacity, options = {}) {
+  const points = geom.points;
+  const normals = geom.normals;
+  const geometry = new THREE.BufferGeometry();
 
   if (points && points.length) {
     const position = new Float32Array(points);
@@ -1082,18 +1082,18 @@ function draw2Dmodel(geom, instanceName, instanceCount, nColor, nOpacity, option
     const normal = new Float32Array(normals);
     geometry.setAttribute('normal', new THREE.BufferAttribute(normal, 3));
   }
-
-  const { color, linewidth } = geom.prop;
-  const formatLinewidth = (linewidth < 1 ? linewidth * 50 : linewidth) || 5;
-  const meshLineResolution = options.meshLineResolution || {};
-  const resolutionWidth = meshLineResolution.width || window.innerWidth || 1;
-  const resolutionHeight = meshLineResolution.height || window.innerHeight || 1;
-  const material = new MeshLineMaterial({
-    color: new THREE.Color(`rgb(${color[0]}, ${color[1]}, ${color[2]})`),
-    lineWidth: formatLinewidth,
-    resolution: new THREE.Vector2(resolutionWidth, resolutionHeight),
-    sizeAttenuation: 0,
-  });
+
+  const { color, linewidth } = geom.prop;
+  const formatLinewidth = (linewidth < 1 ? linewidth * 50 : linewidth) || 5;
+  const meshLineResolution = options.meshLineResolution || {};
+  const resolutionWidth = meshLineResolution.width || window.innerWidth || 1;
+  const resolutionHeight = meshLineResolution.height || window.innerHeight || 1;
+  const material = new MeshLineMaterial({
+    color: new THREE.Color(`rgb(${color[0]}, ${color[1]}, ${color[2]})`),
+    lineWidth: formatLinewidth,
+    resolution: new THREE.Vector2(resolutionWidth, resolutionHeight),
+    sizeAttenuation: 0,
+  });
 
   const lineGeometry = new MeshLineGeometry();
   lineGeometry.setPoints(geometry);