fl-web-component 2.0.19-beta.1 → 2.0.19-beta.3

package/src/utils/threejs/measure-clear-distance.js

@@ -45,10 +45,17 @@ MeasureClearDistance.prototype = {
 
     _this.raycaster.setFromCamera(mouse, this.camera);
     let intersects = _this.raycaster.intersectObjects(_this.scene.children, true);
-    if (intersects.length > 0) {
-      return intersects[0]
+    let l = intersects.length
+    let obj = null
+    if (l > 0) {
+      for (let index = 0; index < l; index++) {
+        if (intersects[index].object.type === 'Mesh') {
+          obj = intersects[index]
+          break
+        }
+      }
     }
-    return null
+    return obj
   },
   createLine(p1, p2, config = { color: 0xff0000 }) {
     const lineMaterial = new THREE.LineBasicMaterial({
@@ -91,10 +98,15 @@ MeasureClearDistance.prototype = {
     let lastTime = new Date().getTime();
     if (lastTime - this.firstTime < 300) {
       const measureObj = _this.getPosition(e);
-
+      console.log(measureObj)
       if (measureObj) {
         _this.selectedObjects.push(measureObj)
-
+        // 高亮选中的
+        // const instanceInfo = measureObj.object.userData?.instancesMap?.get(measureObj.object.name);
+        // const { instanceIndex } = instanceInfo;
+        let instanceIndex = measureObj.instanceId
+        measureObj.object.setColorAt(instanceIndex, new THREE.Color(0x53a8ff));
+        measureObj.object.instanceColor.needsUpdate = true;
         if (_this.selectedObjects.length % 2 === 0) {
           _this.calculateClearDistance()
         }
@@ -109,13 +121,29 @@ MeasureClearDistance.prototype = {
     const obj1 = this.selectedObjects[l - 2];
     const obj2 = this.selectedObjects[l - 1];
     const isParallel = this.checkParallelism(obj1.object, obj1.instanceId, obj2.object, obj2.instanceId);
-    console.log(isParallel)
-    const pts1 = this.getInstanceSurfacePoints(obj1.object, obj1.instanceId, 600);
-    const pts2 = this.getInstanceSurfacePoints(obj2.object, obj2.instanceId, 600);
-    if (pts1.length === 0 || pts2.length === 0) {
+
+    if (!isParallel) {
+      Message.warning('请选择两个平行的物体');
       return
     }
-    const closestPair = this.findClosestPair(pts1, pts2);
+    // 全局采样
+    const localPts1 = this.sampleGlobal(obj1.object.geometry, 1000);
+    const localPts2 = this.sampleGlobal(obj2.object.geometry, 1000);
+    const wm1 = this.getInstanceWorldMatrix(obj1.object, obj1.instanceId);
+    const wm2 = this.getInstanceWorldMatrix(obj2.object, obj2.instanceId);
+    const worldPts1 = localPts1.map(p => p.clone().applyMatrix4(wm1));
+    const worldPts2 = localPts2.map(p => p.clone().applyMatrix4(wm2));
+    let closestPair = this.findClosestPair(worldPts1, worldPts2);
+    // 局部精细搜索
+    const radius = closestPair.distance * 2 + 0.1;
+    const localPts1Fine = this.sampleLocal(obj1.object, obj1.instanceId, closestPair.point1, radius, 1000);
+    const localPts2Fine = this.sampleLocal(obj2.object, obj2.instanceId, closestPair.point2, radius, 1000);
+    const combined1 = worldPts1.filter(p => p.distanceTo(closestPair.point1) < radius).concat(localPts1Fine);
+    const combined2 = worldPts2.filter(p => p.distanceTo(closestPair.point2) < radius).concat(localPts2Fine);
+    if (combined1.length > 0 && combined2.length > 0) {
+      closestPair = this.findClosestPair(combined1, combined2, true);
+    }
+
     const position = new THREE.Vector3((closestPair.point1.x + closestPair.point2.x) / 2, (closestPair.point1.y + closestPair.point2.y) / 2, (closestPair.point1.z + closestPair.point2.z) / 2);
     // 将测量结果显示在页面中
     const circleTag1 = this.createLabel('circle-tag', '', closestPair.point1);
@@ -131,109 +159,84 @@ MeasureClearDistance.prototype = {
     this.scene.add(line);
     this.scene.add(label);
   },
-  getInstanceSurfacePoints(instancedMesh, instanceId, maxPoints = 1000) {
-    const geometry = instancedMesh.geometry;
-    // let localPoints = this.generateGenericLocalPoints(geometry, maxPoints);
-    let localPoints = this.sampleGeometrySurface(geometry, maxPoints);
-    const worldMatrix = this.getInstanceWorldMatrix(instancedMesh, instanceId);
-    const worldPoints = localPoints.map(p => p.clone().applyMatrix4(worldMatrix));
-    return worldPoints.slice(0, maxPoints);
-  },
-  sampleGeometrySurface(geometry, maxPoints = 600) {
-    const positions = geometry.getAttribute('position');
-    if (!positions) return [];
-
-    // 获取三角形（优先使用索引）
-    let triangles = [];
-    if (geometry.index) {
-      const index = geometry.index.array;
-      for (let i = 0; i < index.length; i += 3) {
-        const a = new THREE.Vector3(positions.getX(index[i]), positions.getY(index[i]), positions.getZ(index[i]));
-        const b = new THREE.Vector3(positions.getX(index[i + 1]), positions.getY(index[i + 1]), positions.getZ(index[i + 1]));
-        const c = new THREE.Vector3(positions.getX(index[i + 2]), positions.getY(index[i + 2]), positions.getZ(index[i + 2]));
-        triangles.push([a, b, c]);
-      }
-    } else {
-      // 无索引时，每三个顶点组成一个三角形
-      for (let i = 0; i < positions.count; i += 3) {
-        const a = new THREE.Vector3(positions.getX(i), positions.getY(i), positions.getZ(i));
-        const b = new THREE.Vector3(positions.getX(i + 1), positions.getY(i + 1), positions.getZ(i + 1));
-        const c = new THREE.Vector3(positions.getX(i + 2), positions.getY(i + 2), positions.getZ(i + 2));
-        triangles.push([a, b, c]);
-      }
-    }
-
+  // 全部采样
+  sampleGlobal(geometry, maxPoints = 600) {
+    const triangles = this.extractTriangles(geometry);
     if (triangles.length === 0) return [];
-
-    // 计算每个三角形的面积
-    const areas = triangles.map(([a, b, c]) => {
-      const ab = new THREE.Vector3().subVectors(b, a);
-      const ac = new THREE.Vector3().subVectors(c, a);
+    const areas = triangles.map(t => {
+      const ab = new THREE.Vector3().subVectors(t.b, t.a);
+      const ac = new THREE.Vector3().subVectors(t.c, t.a);
       return new THREE.Vector3().crossVectors(ab, ac).length() * 0.5;
     });
-    const totalArea = areas.reduce((sum, a) => sum + a, 0);
-
-    // 按面积比例分配采样点数
+    const totalArea = areas.reduce((s, a) => s + a, 0);
     const points = [];
     for (let i = 0; i < triangles.length; i++) {
-      const [a, b, c] = triangles[i];
-      const area = areas[i];
-      let samplesForFace = Math.round((area / totalArea) * maxPoints);
-      if (samplesForFace < 1 && points.length < maxPoints) samplesForFace = 1; // 确保每个面至少一个点
-
-      for (let j = 0; j < samplesForFace; j++) {
-        // 重心坐标随机采样
-        const u = Math.random();
-        const v = Math.random() * (1 - u);
-        const w = 1 - u - v;
-        const point = new THREE.Vector3()
-          .addScaledVector(a, u)
-          .addScaledVector(b, v)
-          .addScaledVector(c, w);
-        points.push(point);
+      const { a, b, c } = triangles[i];
+      const count = Math.max(1, Math.round((areas[i] / totalArea) * maxPoints));
+      for (let j = 0; j < count; j++) {
+        const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+        points.push(new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w));
       }
     }
-
-    // 如果点数不够，随机补充
     while (points.length < maxPoints) {
-      const triIdx = Math.floor(Math.random() * triangles.length);
-      const [a, b, c] = triangles[triIdx];
-      const u = Math.random();
-      const v = Math.random() * (1 - u);
-      const w = 1 - u - v;
-      points.push(new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w));
+      const t = triangles[Math.floor(Math.random() * triangles.length)];
+      const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+      points.push(new THREE.Vector3().addScaledVector(t.a, u).addScaledVector(t.b, v).addScaledVector(t.c, w));
     }
     return points.slice(0, maxPoints);
   },
-  generateGenericLocalPoints(geometry, maxPoints = 1000) {
+  // 局部采样
+  sampleLocal(instancedMesh, instanceId, centerWorld, radius, pointsCount = 300) {
+    const worldMatrix = this.getInstanceWorldMatrix(instancedMesh, instanceId);
+    const invMatrix = new THREE.Matrix4().copy(worldMatrix).invert();
+    const centerLocal = centerWorld.clone().applyMatrix4(invMatrix);
+    const triangles = this.extractTriangles(instancedMesh.geometry);
+    if (triangles.length === 0) return [];
+
+    const relevantTris = triangles.filter(t => {
+      const box = new THREE.Box3().setFromPoints([t.a, t.b, t.c]);
+      return box.distanceToPoint(centerLocal) <= radius;
+    });
+    if (relevantTris.length === 0) return [];
+
+    const localPoints = [];
+    const perTri = Math.ceil(pointsCount / relevantTris.length);
+    for (const { a, b, c } of relevantTris) {
+      for (let j = 0; j < perTri; j++) {
+        const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+        const pt = new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w);
+        if (pt.distanceTo(centerLocal) <= radius) localPoints.push(pt);
+      }
+    }
+    while (localPoints.length < pointsCount && relevantTris.length > 0) {
+      const { a, b, c } = relevantTris[Math.floor(Math.random() * relevantTris.length)];
+      const u = Math.random(), v = Math.random() * (1 - u), w = 1 - u - v;
+      const pt = new THREE.Vector3().addScaledVector(a, u).addScaledVector(b, v).addScaledVector(c, w);
+      if (pt.distanceTo(centerLocal) <= radius) localPoints.push(pt);
+    }
+    return localPoints.map(p => p.clone().applyMatrix4(worldMatrix));
+  },
+  extractTriangles(geometry) {
     const pos = geometry.getAttribute('position');
     if (!pos) return [];
-    const allVerts = [];
-    for (let i = 0; i < pos.count; i++) {
-      allVerts.push(new THREE.Vector3(pos.getX(i), pos.getY(i), pos.getZ(i)));
-    }
-    let sourceVerts = allVerts;
+    const triangles = [];
     if (geometry.index) {
-      const indexArr = geometry.index.array;
-      const seen = new Set();
-      sourceVerts = [];
-      for (let i = 0; i < indexArr.length; i++) {
-        const v = allVerts[indexArr[i]];
-        const key = `${v.x.toFixed(4)},${v.y.toFixed(4)},${v.z.toFixed(4)}`;
-        if (!seen.has(key)) {
-          seen.add(key);
-          sourceVerts.push(v.clone());
-        }
+      const idx = geometry.index.array;
+      for (let i = 0; i < idx.length; i += 3) {
+        const a = new THREE.Vector3(pos.getX(idx[i]), pos.getY(idx[i]), pos.getZ(idx[i]));
+        const b = new THREE.Vector3(pos.getX(idx[i + 1]), pos.getY(idx[i + 1]), pos.getZ(idx[i + 1]));
+        const c = new THREE.Vector3(pos.getX(idx[i + 2]), pos.getY(idx[i + 2]), pos.getZ(idx[i + 2]));
+        triangles.push({ a, b, c });
+      }
+    } else {
+      for (let i = 0; i < pos.count; i += 3) {
+        const a = new THREE.Vector3(pos.getX(i), pos.getY(i), pos.getZ(i));
+        const b = new THREE.Vector3(pos.getX(i + 1), pos.getY(i + 1), pos.getZ(i + 1));
+        const c = new THREE.Vector3(pos.getX(i + 2), pos.getY(i + 2), pos.getZ(i + 2));
+        triangles.push({ a, b, c });
       }
     }
-    if (sourceVerts.length > maxPoints) {
-      const step = Math.ceil(sourceVerts.length / maxPoints);
-      const sampled = [];
-      for (let i = 0; i < sourceVerts.length; i += step) sampled.push(sourceVerts[i]);
-      sourceVerts = sampled;
-    }
-    return sourceVerts;
-
+    return triangles;
   },
   findClosestPair(points1, points2) {
     let minDist = Infinity;
@@ -241,8 +244,8 @@ MeasureClearDistance.prototype = {
     const c2 = new THREE.Vector3();
     for (const p1 of points1) {
       for (const p2 of points2) {
-        const d = p1.distanceTo(p2);
-        if (d < minDist) {
+        const d = Number((p1.distanceTo(p2)).toFixed(2));
+        if (d <= minDist) {
           minDist = d;
           c1.copy(p1);
           c2.copy(p2);
@@ -251,38 +254,49 @@ MeasureClearDistance.prototype = {
     }
     return { point1: c1, point2: c2, distance: minDist };
   },
-
-  // 平行判断 (基于包围盒主轴方向)
   checkParallelism(inst1, id1, inst2, id2) {
+    // 1. 获取世界矩阵
     const mat1 = this.getInstanceWorldMatrix(inst1, id1);
     const mat2 = this.getInstanceWorldMatrix(inst2, id2);
-    const box1 = new THREE.Box3();
-    const box2 = new THREE.Box3();
-
-    // 确保包围盒存在
-    if (!inst1.geometry.boundingBox) inst1.geometry.computeBoundingBox();
-    if (!inst2.geometry.boundingBox) inst2.geometry.computeBoundingBox();
-
-    box1.copy(inst1.geometry.boundingBox).applyMatrix4(mat1);
-    box2.copy(inst2.geometry.boundingBox).applyMatrix4(mat2);
 
-    const size1 = new THREE.Vector3(); box1.getSize(size1);
-    const size2 = new THREE.Vector3(); box2.getSize(size2);
+    // 2. 提取纯旋转部分（消除缩放和位移）
+    const rotMat1 = new THREE.Matrix4().extractRotation(mat1);
+    const rotMat2 = new THREE.Matrix4().extractRotation(mat2);
 
-    const getMainDir = (s) => {
-      if (s.x >= s.y && s.x >= s.z) return new THREE.Vector3(1, 0, 0);
-      if (s.y >= s.x && s.y >= s.z) return new THREE.Vector3(0, 1, 0);
-      return new THREE.Vector3(0, 0, 1);
+    // 如果物体可能有非均匀缩放，extractRotation 可能会出错，
+    // 更稳健的方法是手动归一化列向量
+    const normalizeMatrix = (m) => {
+        const col0 = new THREE.Vector3().setFromMatrixColumn(m, 0).normalize();
+        const col1 = new THREE.Vector3().setFromMatrixColumn(m, 1).normalize();
+        const col2 = new THREE.Vector3().setFromMatrixColumn(m, 2).normalize();
+        const normMat = new THREE.Matrix4();
+        normMat.makeBasis(col0, col1, col2);
+        return normMat;
     };
-    const d1 = getMainDir(size1);
-    const d2 = getMainDir(size2);
+    const cleanRot1 = normalizeMatrix(rotMat1);
+    const cleanRot2 = normalizeMatrix(rotMat2);
 
-    const rot1 = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().extractRotation(mat1));
-    const rot2 = new THREE.Quaternion().setFromRotationMatrix(new THREE.Matrix4().extractRotation(mat2));
-    d1.applyQuaternion(rot1);
-    d2.applyQuaternion(rot2);
+    // 3. 定义三个基向量（局部坐标系的X, Y, Z轴）
+    const axes = [
+        new THREE.Vector3(1, 0, 0),
+        new THREE.Vector3(0, 1, 0),
+        new THREE.Vector3(0, 0, 1)
+    ];
 
-    return Math.abs(d1.dot(d2)) > 0.95;
+    // 4. 检查是否有任意一对基向量在世界空间中平行
+    const threshold = 0.99; // 提高阈值，更严格
+    for (const axis1 of axes) {
+        // 将局部基向量转换到世界方向
+        const worldDir1 = axis1.clone().applyMatrix4(cleanRot1).normalize();
+        for (const axis2 of axes) {
+            const worldDir2 = axis2.clone().applyMatrix4(cleanRot2).normalize();
+            const dot = Math.abs(worldDir1.dot(worldDir2));
+            if (dot > threshold) {
+                return true; // 只要有一对方向平行即判为平行
+            }
+        }
+    }
+    return false;
   },
   getInstanceWorldMatrix(instancedMesh, instanceId) {
     const matrix = new THREE.Matrix4();
@@ -303,10 +317,22 @@ MeasureClearDistance.prototype = {
       this.polyline.splice(0);
       this.labels.splice(0);
       this.firstTime = 0;
+      this.selectedObjects.forEach(item => {
+        let instanceIndex = item.instanceId
+        item.object.setColorAt(instanceIndex, item.object.material.userData.nColor);
+        item.object.instanceColor.needsUpdate = true;
+      })
+      this.selectedObjects.splice(0)
     }
     this.renderer.domElement.style.cursor = 'pointer';
   },
   clear() {
+    this.selectedObjects.forEach(item => {
+      let instanceIndex = item.instanceId
+      item.object.setColorAt(instanceIndex, item.object.material.userData.nColor);
+      item.object.instanceColor.needsUpdate = true;
+    })
+    this.selectedObjects.splice(0)
     this.remove(this.points);
     this.remove(this.polyline);
     this.remove(this.labels);