rm-graphical-computing-node 1.0.36 → 1.0.38

package/dist/index.mjs

@@ -5590,6 +5590,7 @@ var getColLine = (lines, runDataList) => {
     if (result[i].uuids.length < 4 || result[i].area < minArea || result[i].area > maxArea)
       continue;
     let isRect = false;
+    let overlapWallLines = [];
     for (let j = 0; j < result[i].lineIndexes.length; j++) {
       let length1 = lines[result[i].lineIndexes[j]].length;
       if (length1 < minColLineLength || length1 > maxColLineLength)
@@ -8271,21 +8272,26 @@ var OBB = class _OBB extends OBB_ {
    * @returns 
    */
   static fromByPath2D(path3, origin, height, obb_ = new _OBB()) {
-    const result = smallestSurroundingRectangleByArea({
-      type: "Polygon",
-      coordinates: [path3.map((p) => [p.x, p.y])]
-    });
-    if (!result) throw new Error("2d obb \u83B7\u53D6\u5931\u8D25");
-    const rectangle = result.geometry.coordinates[0];
-    const width1 = distance(rectangle[0], rectangle[1]);
-    const width2 = distance(rectangle[1], rectangle[2]);
-    const angle = Math.atan2(rectangle[1][1] - rectangle[0][1], rectangle[1][0] - rectangle[0][0]);
-    vec3.set(width1, width2, height);
-    euler.set(0, 0, angle);
-    const [x, y] = getCenter(rectangle);
-    origin.x = x;
-    origin.y = y;
-    const obb = this.from(vec3, origin, euler, obb_);
+    let obb = null;
+    try {
+      const result = smallestSurroundingRectangleByArea({
+        type: "Polygon",
+        coordinates: [path3.map((p) => [p.x, p.y])]
+      });
+      if (!result) throw new Error("2d obb \u83B7\u53D6\u5931\u8D25");
+      const rectangle = result.geometry.coordinates[0];
+      const width1 = distance(rectangle[0], rectangle[1]);
+      const width2 = distance(rectangle[1], rectangle[2]);
+      const angle = Math.atan2(rectangle[1][1] - rectangle[0][1], rectangle[1][0] - rectangle[0][0]);
+      vec3.set(width1, width2, height);
+      euler.set(0, 0, angle);
+      const [x, y] = getCenter(rectangle);
+      origin.x = x;
+      origin.y = y;
+      obb = this.from(vec3, origin, euler, obb_);
+    } catch (error) {
+      return null;
+    }
     return obb;
   }
 };
@@ -8441,6 +8447,8 @@ function getObb(path3, center, h, z) {
   if (pathPoints.length == 0)
     return null;
   const obb = OBB.fromByPath2D(pathPoints, center, h);
+  if (obb == null)
+    return null;
   obb.center.z = z;
   return obb;
 }
@@ -8759,10 +8767,6 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
             const f1 = calculateClosePointWithOBB(array2[k].points, obb1);
             const f2 = calculateClosePointWithOBB(array1[e].points, obb2);
             const isMaxBox = compareBoxVolume(obb1, obb2);
-            if (f2 >= 0.5 && isMaxBox == -1 && type1 !== "Staircase" && type2 !== "Staircase") {
-              array1[e].isDel = true;
-              break;
-            }
             if (type1 !== "wall" && type1 !== "floor" && type1 !== "roof") {
               if (type1 === "window") {
                 if (type2 === "balcony railing" && containsObbPoints(obb1, array2[k].points)) {
@@ -8813,19 +8817,47 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
                   break;
                 }
               } else if (type1 === "door") {
-                if (type2 === "window" && containsObbPoints(obb1, array2[k].points)) {
-                  array1[e].isDel = true;
-                  break;
+                if (type2 === "window") {
+                  if (type2 === "window" && containsObbPoints(obb1, array2[k].points)) {
+                    array1[e].isDel = true;
+                    break;
+                  }
+                  if (type2 === "window" && containsObbPoints(obb2, array1[e].points)) {
+                    array1[e].isDel = true;
+                    break;
+                  }
+                  if (type2 === "window sill" && containsObbPoints(obb1, array2[k].points)) {
+                    array1[e].isDel = true;
+                    break;
+                  }
+                  if (type2 === "window sill" && containsObbPoints(obb2, array1[e].points)) {
+                    array1[e].isDel = true;
+                    break;
+                  }
+                } else {
+                  if (containsObbPoints(obb1, array2[k].points)) {
+                    array2[k].isDel = true;
+                    continue;
+                  }
+                  if (containsObbPoints(obb2, array1[e].points)) {
+                    array2[k].isDel = true;
+                    continue;
+                  }
+                  if (obb1.intersectsOBB(obb2)) {
+                    array2[k].isDel = true;
+                    continue;
+                  }
                 }
-                if (type2 === "window" && containsObbPoints(obb2, array1[e].points)) {
+              } else if (type2 === "door") {
+                if (containsObbPoints(obb1, array2[k].points)) {
                   array1[e].isDel = true;
                   break;
                 }
-                if (type2 === "window sill" && containsObbPoints(obb1, array2[k].points)) {
+                if (containsObbPoints(obb2, array1[e].points)) {
                   array1[e].isDel = true;
                   break;
                 }
-                if (type2 === "window sill" && containsObbPoints(obb2, array1[e].points)) {
+                if (obb1.intersectsOBB(obb2)) {
                   array1[e].isDel = true;
                   break;
                 }

package/package.json

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