rm-graphical-computing-node 1.0.53 → 1.0.55

package/dist/index.mjs

@@ -3506,6 +3506,11 @@ var voxelDownsample2DForContour = (points, cellSize) => {
   }
   return result;
 };
+var setPointsSameZ = (points, z) => {
+  for (let i = 0; i < points.length; i++)
+    points[i].z = z;
+  return points;
+};
 
 // src/utils/updateLine.mjs
 import * as THREE4 from "three";
@@ -4614,7 +4619,7 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
               let line3TmpDoor = new THREE5.Line3(doorTmpSt.clone(), doorTmpEd.clone());
               let nearWallDist = -1;
               for (let x = 0; x < lines.length; x++) {
-                if (lines[x].length < 0.5 || x == index) continue;
+                if (lines[x].length < 0.5 || x == index || lines[x].isLine2) continue;
                 let startPt2 = new THREE5.Vector3(lines[x].start.x, lines[x].start.y, lines[x].start.z);
                 let endPt2 = new THREE5.Vector3(lines[x].end.x, lines[x].end.y, lines[x].end.z);
                 let result = classifySegments(startPt2, endPt2, doorTmpSt, doorTmpEd);
@@ -10998,6 +11003,7 @@ function getPathZ(path3, points) {
 // src/geometry/window.mjs
 import * as THREE10 from "three";
 import { mergeGeometries as mergeGeometries5 } from "three/examples/jsm/utils/BufferGeometryUtils.js";
+import { retarget } from "three/examples/jsm/utils/SkeletonUtils.js";
 var getWindowData = (lines, pcdData, lineReader) => {
   if (lines.length <= 0 || !pcdData)
     return lines;
@@ -11095,7 +11101,7 @@ var getWindowData = (lines, pcdData, lineReader) => {
   const windowDatas = [];
   for (let i = 0; i < pcdData.length; i++) {
     const window = pcdData[i];
-    window.isFindBeam = false;
+    window.isFindWindow = false;
     if (window.category == "window") {
       let boxPoints = [];
       window.coordinatesByArea.coordinates.forEach((p) => {
@@ -11123,7 +11129,8 @@ var getWindowData = (lines, pcdData, lineReader) => {
         isFind: false,
         inWall: false,
         //是否在墙内
-        name: window.name
+        name: window.name,
+        rectPts: window.coordinatesByArea.coordinates
       });
     }
   }
@@ -11235,7 +11242,7 @@ var getWindowData = (lines, pcdData, lineReader) => {
             continue;
           let addData = false;
           let isWindow = false;
-          let beforePcdDoorIsFindBeam = false;
+          let beforePcdDoorisFindWindow = false;
           let doorOpenVector = new THREE10.Vector3(0, 0, 0);
           let pcbDoorIndexs = [];
           let beamTmpSt = tmpRegion.facePoints[2].clone();
@@ -11295,8 +11302,8 @@ var getWindowData = (lines, pcdData, lineReader) => {
                           pcbDoorIndexs.push(windowDatas[n].index);
                           windowDatas[n].isFind = true;
                           findDoorDataIndex = n;
-                          beforePcdDoorIsFindBeam = pcdData[windowDatas[n].index].isFindBeam;
-                          pcdData[windowDatas[n].index].isFindBeam = true;
+                          beforePcdDoorisFindWindow = pcdData[windowDatas[n].index].isFindWindow;
+                          pcdData[windowDatas[n].index].isFindWindow = true;
                           let beamVec = new THREE10.Vector3().subVectors(beamSt, beamEd).normalize();
                           let doorLength = doorSt.distanceTo(doorEd) - result.overlap;
                           if (dist22 < dist1)
@@ -11323,8 +11330,8 @@ var getWindowData = (lines, pcdData, lineReader) => {
                             isWindow = true;
                             pcbDoorIndexs.push(windowDatas[n].index);
                             windowDatas[n].isFind = true;
-                            beforePcdDoorIsFindBeam = pcdData[windowDatas[n].index].isFindBeam;
-                            pcdData[windowDatas[n].index].isFindBeam = true;
+                            beforePcdDoorisFindWindow = pcdData[windowDatas[n].index].isFindWindow;
+                            pcdData[windowDatas[n].index].isFindWindow = true;
                             findDoorDataIndex = n;
                           }
                         }
@@ -11347,7 +11354,7 @@ var getWindowData = (lines, pcdData, lineReader) => {
                     let beamStExtended = beamSt.clone().addScaledVector(vec2, nExtend);
                     let beamEdExtended = beamEd.clone().addScaledVector(vec2.clone().negate(), nExtend);
                     let isPPP = getParallelism(doorStExtended, doorEdExtended, beamStExtended, beamEdExtended);
-                    if (isPPP.isParallel)
+                    if (isPPP.isParallel || isPPP.angleDeg > 45)
                       continue;
                     let insertPt = segmentsIntersect2D(doorStExtended, doorEdExtended, beamStExtended, beamEdExtended);
                     let bIsTrue = true;
@@ -11357,8 +11364,8 @@ var getWindowData = (lines, pcdData, lineReader) => {
                     let dist44 = doorEd.distanceTo(beamEd);
                     let isNear = dist11 < nearDist || dist22 < nearDist || dist33 < nearDist || dist44 < nearDist;
                     if ((isNear || insertPt) && bIsTrue) {
-                      beforePcdDoorIsFindBeam = pcdData[windowDatas[n].index].isFindBeam;
-                      pcdData[windowDatas[n].index].isFindBeam = true;
+                      beforePcdDoorisFindWindow = pcdData[windowDatas[n].index].isFindWindow;
+                      pcdData[windowDatas[n].index].isFindWindow = true;
                       isWindow = true;
                       windowDatas[n].isFind = true;
                       findDoorDataIndex = n;
@@ -11457,8 +11464,8 @@ var getWindowData = (lines, pcdData, lineReader) => {
             }
             if (isOverlap) {
               if (findDoorDataIndex != -1) {
-                if (!beforePcdDoorIsFindBeam) {
-                  pcdData[windowDatas[findDoorDataIndex].index].isFindBeam = false;
+                if (!beforePcdDoorisFindWindow) {
+                  pcdData[windowDatas[findDoorDataIndex].index].isFindWindow = false;
                   windowDatas[findDoorDataIndex].isFind = false;
                 }
               }
@@ -11467,32 +11474,94 @@ var getWindowData = (lines, pcdData, lineReader) => {
             let afterDoorLen = doorTmpEd.distanceTo(doorTmpSt);
             if (afterDoorLen < 0.4 && !isWindow || afterDoorLen < 0.3 && isWindow)
               continue;
-            const windowLine = new THREE10.Line3(new THREE10.Vector3(doorTmpSt.x, doorTmpSt.y, 0), new THREE10.Vector3(doorTmpEd.x, doorTmpEd.y, 0));
+            const windowLine = new THREE10.Line3(doorTmpSt, doorTmpEd);
             const windowPcd = windowDatas[findDoorDataIndex];
             const windowPcdSt = windowPcd.windowStartPt.clone();
             const windowPcdEd = windowPcd.windowEndPt.clone();
-            windowPcdSt.z = windowPcdEd.z = doorTmpSt.z;
-            let dist11 = doorTmpSt.distanceTo(windowPcdSt);
-            let dist22 = doorTmpSt.distanceTo(windowPcdEd);
-            let dist33 = doorTmpEd.distanceTo(windowPcdSt);
-            let dist44 = doorTmpEd.distanceTo(windowPcdEd);
-            let minDist = Math.min(dist11, dist22, dist33, dist44);
-            let windowLen = windowPcdSt.distanceTo(windowPcdEd);
-            let wZ = doorTmpSt.z;
+            const windowLen = windowPcdSt.distanceTo(windowPcdEd);
+            let rectPts = windowPcd.rectPts.map((p) => new THREE10.Vector3(p.x, p.y, p.z));
+            rectPts = setPointsSameZ(rectPts, doorTmpSt.z);
             let ptClose = new THREE10.Vector3();
             let vec2 = new THREE10.Vector3();
-            if (dist11 == minDist) {
-              ptClose = windowLine.closestPointToPoint(windowPcdSt, false, new THREE10.Vector3());
-              vec2 = new THREE10.Vector3().subVectors(doorTmpEd, doorTmpSt).normalize();
-            } else if (dist22 == minDist) {
-              ptClose = windowLine.closestPointToPoint(windowPcdEd, false, new THREE10.Vector3());
-              vec2 = new THREE10.Vector3().subVectors(doorTmpEd, doorTmpSt).normalize();
-            } else if (dist33 == minDist) {
-              ptClose = windowLine.closestPointToPoint(windowPcdSt, false, new THREE10.Vector3());
-              vec2 = new THREE10.Vector3().subVectors(doorTmpSt, doorTmpEd).normalize();
-            } else if (dist44 == minDist) {
-              ptClose = windowLine.closestPointToPoint(windowPcdEd, false, new THREE10.Vector3());
-              vec2 = new THREE10.Vector3().subVectors(doorTmpSt, doorTmpEd).normalize();
+            if (rectPts.length == 5)
+              rectPts.splice(4, 1);
+            let shortLinePt1 = rectPts[0];
+            let shortLinePt2 = rectPts[1];
+            let shortLinePt3 = rectPts[2];
+            let shortLinePt4 = rectPts[3];
+            if (rectPts[0].distanceTo(rectPts[1]) > rectPts[1].distanceTo(rectPts[2])) {
+              shortLinePt1 = rectPts[1];
+              shortLinePt2 = rectPts[2];
+              shortLinePt3 = rectPts[3];
+              shortLinePt4 = rectPts[0];
+            }
+            let addShortLen = 0.2;
+            let vecShort1 = new THREE10.Vector3().subVectors(shortLinePt2, shortLinePt1).normalize();
+            let vecShort2 = new THREE10.Vector3().subVectors(shortLinePt4, shortLinePt3).normalize();
+            shortLinePt1 = shortLinePt1.addScaledVector(vecShort1, -addShortLen);
+            shortLinePt2 = shortLinePt2.addScaledVector(vecShort1, addShortLen);
+            shortLinePt3 = shortLinePt3.addScaledVector(vecShort2, -addShortLen);
+            shortLinePt4 = shortLinePt4.addScaledVector(vecShort2, addShortLen);
+            let tmpVec = new THREE10.Vector3().subVectors(doorTmpEd, doorTmpSt).normalize();
+            let tmpDoorTmpSt = doorTmpSt.clone().addScaledVector(tmpVec, -addShortLen);
+            let tmpDoorTmpEd = doorTmpEd.clone().addScaledVector(tmpVec, addShortLen);
+            let intersect1 = segmentsIntersect2D(shortLinePt1, shortLinePt2, tmpDoorTmpSt, tmpDoorTmpEd);
+            let intersect2 = segmentsIntersect2D(shortLinePt3, shortLinePt4, tmpDoorTmpSt, tmpDoorTmpEd);
+            let distIntersect1 = 99999;
+            let distIntersect2 = 99999;
+            let near1St = false;
+            let near2St = false;
+            if (intersect1 != null) {
+              let dist55 = intersect1.point.distanceTo(doorTmpSt);
+              let dist66 = intersect1.point.distanceTo(doorTmpEd);
+              if (dist55 < 0.1 || dist66 < 0.1) {
+                if (dist55 < dist66) {
+                  near1St = true;
+                  distIntersect1 = dist55;
+                } else
+                  distIntersect1 = dist66;
+              }
+            }
+            if (intersect2 != null) {
+              let dist55 = intersect2.point.distanceTo(doorTmpSt);
+              let dist66 = intersect2.point.distanceTo(doorTmpEd);
+              if (dist55 < 0.1 || dist66 < 0.1) {
+                if (dist55 < dist66) {
+                  near2St = true;
+                  distIntersect2 = dist55;
+                } else
+                  distIntersect2 = dist66;
+              }
+            }
+            if (distIntersect1 == 99999 && distIntersect2 == 99999) {
+              windowPcdSt.z = windowPcdEd.z = doorTmpSt.z;
+              let dist11 = doorTmpSt.distanceTo(windowPcdSt);
+              let dist22 = doorTmpSt.distanceTo(windowPcdEd);
+              let dist33 = doorTmpEd.distanceTo(windowPcdSt);
+              let dist44 = doorTmpEd.distanceTo(windowPcdEd);
+              let minDist = Math.min(dist11, dist22, dist33, dist44);
+              let wZ = doorTmpSt.z;
+              if (dist11 == minDist) {
+                ptClose = windowLine.closestPointToPoint(windowPcdSt, false, new THREE10.Vector3());
+                vec2 = new THREE10.Vector3().subVectors(doorTmpEd, doorTmpSt).normalize();
+              } else if (dist22 == minDist) {
+                ptClose = windowLine.closestPointToPoint(windowPcdEd, false, new THREE10.Vector3());
+                vec2 = new THREE10.Vector3().subVectors(doorTmpEd, doorTmpSt).normalize();
+              } else if (dist33 == minDist) {
+                ptClose = windowLine.closestPointToPoint(windowPcdSt, false, new THREE10.Vector3());
+                vec2 = new THREE10.Vector3().subVectors(doorTmpSt, doorTmpEd).normalize();
+              } else if (dist44 == minDist) {
+                ptClose = windowLine.closestPointToPoint(windowPcdEd, false, new THREE10.Vector3());
+                vec2 = new THREE10.Vector3().subVectors(doorTmpSt, doorTmpEd).normalize();
+              }
+            } else {
+              if (distIntersect1 < distIntersect2) {
+                ptClose = intersect1.point.clone();
+                vec2 = near1St ? new THREE10.Vector3().subVectors(doorTmpEd, doorTmpSt).normalize() : new THREE10.Vector3().subVectors(doorTmpSt, doorTmpEd).normalize();
+              } else {
+                ptClose = intersect2.point.clone();
+                vec2 = near2St ? new THREE10.Vector3().subVectors(doorTmpEd, doorTmpSt).normalize() : new THREE10.Vector3().subVectors(doorTmpSt, doorTmpEd).normalize();
+              }
             }
             doorTmpSt = ptClose.clone();
             doorTmpEd = doorTmpSt.clone().addScaledVector(vec2, windowLen);
@@ -12480,6 +12549,7 @@ function findWindowWalls(windowObjs, wallSegments, options, preMerged) {
         if (!bs.drawWindow) bs.drawWindow = [];
         bs.drawWindow.push(dw_info);
         bs.isWindow = true;
+        win.isFindWindow = true;
       }
     }
     if (bestSeg) {
@@ -12705,13 +12775,13 @@ function processData(wallSegments, objects, options) {
         seg.isWindow = !!(seg.drawWindow && seg.drawWindow.length > 0);
       }
     }
-    return { segments: newFinal, matches };
+    return { segments: newFinal, matches, pcdData: objects };
   }
   for (const seg of finalSegments) {
     ;
     seg.isWindow = !!(seg.drawWindow && seg.drawWindow.length > 0);
   }
-  return { segments: finalSegments, matches };
+  return { segments: finalSegments, matches, pcdData: objects };
 }
 
 // src/wall-door-matcher/matcher.ts
@@ -14476,6 +14546,7 @@ function processDoorData(wallSegments, objects, options) {
             groundClearance: drawDoor[doorIndex].groundClearance
           };
           doorSeg.drawDoorData = ddData;
+          doorObj.isFindDoor = true;
         }
         finalSegments.push(doorSeg);
       }
@@ -14565,13 +14636,13 @@ function processDoorData(wallSegments, objects, options) {
       ;
       seg.isDoor = !!(seg.DrawDoor && seg.DrawDoor.length > 0);
     }
-    return { segments: newFinal, matches: dedupedMatches };
+    return { segments: newFinal, matches: dedupedMatches, pcdData: objects };
   }
   for (const seg of finalSegments) {
     ;
     seg.isDoor = !!(seg.DrawDoor && seg.DrawDoor.length > 0);
   }
-  return { segments: finalSegments, matches: dedupedMatches };
+  return { segments: finalSegments, matches: dedupedMatches, pcdData: objects };
 }
 
 // match-api.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rm-graphical-computing-node",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "墙体/梁线/点云语义计算库（依赖 Python 与 three.js）",
   "type": "module",
   "main": "dist/index.mjs",