rm-graphical-computing-node 1.0.74 → 1.0.76

package/dist/index.mjs

@@ -9163,6 +9163,12 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
                   array1[e].isStaircaseBalconyRailing = true;
                   break;
                 }
+                if (type2 === "window sill" && containsObbPoints(obb1, array2[k].points)) {
+                  continue;
+                }
+                if (type2 === "window sill" && containsObbPoints(obb2, array1[e].points)) {
+                  continue;
+                }
               } else if (type1 === "door") {
                 if (type2 === "window") {
                   if (type2 === "window" && containsObbPoints(obb1, array2[k].points)) {
@@ -9223,6 +9229,18 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
                   array2[k].isDel = true;
                   continue;
                 }
+                if (type2 === "balcony railing" && containsObbPoints(obb1, array2[k].points)) {
+                  continue;
+                }
+                if (type2 === "balcony railing" && containsObbPoints(obb2, array1[e].points)) {
+                  continue;
+                }
+                if (type2 === "pipe" && containsObbPoints(obb1, array2[k].points)) {
+                  continue;
+                }
+                if (type2 === "pipe" && containsObbPoints(obb2, array1[e].points)) {
+                  continue;
+                }
               } else if (type1 === "Staircase") {
                 if (type2 === "balcony railing" && containsObbPoints(obb1, array2[k].points)) {
                   array2[k].isStaircaseBalconyRailing = true;
@@ -9236,6 +9254,13 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
                   array2[k].isStaircaseBalconyRailing = true;
                   continue;
                 }
+              } else if (type1 === "pipe") {
+                if (type2 === "window sill" && containsObbPoints(obb1, array2[k].points)) {
+                  continue;
+                }
+                if (type2 === "window sill" && containsObbPoints(obb2, array1[e].points)) {
+                  continue;
+                }
               }
               let isMax = false;
               let majorPoints = [];
@@ -11064,7 +11089,6 @@ var getFlatSlabData = (lines, runDataList, pointCloudCluster = null) => {
       let pathPoints = newPoints[u4].map((p) => [p.x, p.y]);
       let path3 = computeContour(pathPoints);
       let area2 = calculatePolygonArea(path3);
-      if (area2 < 0.5) continue;
       const slabData = {
         contour: path3,
         averagePz: averagePz2,
@@ -12279,16 +12303,24 @@ var getWindowPcdData = (lines, pcdData) => {
       let isp = getParallelism(ptMid1, ptMid2, ptStart2, ptEnd2);
       if (isp && isp.angleDeg < 25) {
         let tmpLine3 = new THREE10.Line3(ptMid1, ptMid2);
+        let tmpLine4 = new THREE10.Line3(ptLongSt1, ptLongEd1);
+        let tmpLine5 = new THREE10.Line3(ptLongSt2, ptLongEd2);
         let ptMid = getMid(ptStart2, ptEnd2);
-        let ptClose = tmpLine3.closestPointToPoint(ptMid, true, new THREE10.Vector3());
-        if (ptClose.distanceTo(ptMid) < pcdToLineDist) {
+        let ptClose3 = tmpLine3.closestPointToPoint(ptMid, true, new THREE10.Vector3());
+        let ptClose4 = tmpLine4.closestPointToPoint(ptMid, true, new THREE10.Vector3());
+        let ptClose5 = tmpLine5.closestPointToPoint(ptMid, true, new THREE10.Vector3());
+        if (ptClose3.distanceTo(ptMid) < pcdToLineDist || ptClose4.distanceTo(ptMid) < pcdToLineDist || ptClose5.distanceTo(ptMid) < pcdToLineDist) {
           eligibilityLines.push(line3);
           eligibilityLinesIndexs.push(j);
         } else {
           tmpLine3 = new THREE10.Line3(ptStart2, ptEnd2);
-          ptMid = getMid(ptMid1, ptMid2);
-          ptClose = tmpLine3.closestPointToPoint(ptMid, true, new THREE10.Vector3());
-          if (ptClose.distanceTo(ptMid) < pcdToLineDist) {
+          let ptMid3 = getMid(ptMid1, ptMid2);
+          let ptMid4 = getMid(ptLongSt1, ptLongEd1);
+          let ptMid5 = getMid(ptLongSt2, ptLongEd2);
+          ptClose3 = tmpLine3.closestPointToPoint(ptMid3, true, new THREE10.Vector3());
+          ptClose4 = tmpLine3.closestPointToPoint(ptMid4, true, new THREE10.Vector3());
+          ptClose5 = tmpLine3.closestPointToPoint(ptMid5, true, new THREE10.Vector3());
+          if (ptClose3.distanceTo(ptMid3) < pcdToLineDist || ptClose4.distanceTo(ptMid4) < pcdToLineDist || ptClose5.distanceTo(ptMid5) < pcdToLineDist) {
             eligibilityLines.push(line3);
             eligibilityLinesIndexs.push(j);
           }

package/package.json

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