rm-graphical-computing-node 1.0.79 → 1.0.81

package/dist/index.mjs

@@ -12556,8 +12556,8 @@ var getDoorPcdData = (lines, pcdData) => {
     const line2 = tmpLines[maxIndex];
     let ptStart = getPt3(line2.start);
     let ptEnd = getPt3(line2.end);
-    let intersect1 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt1, ptShortEd1, 0.05);
-    let intersect2 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt2, ptShortEd2, 0.05);
+    let intersect1 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt1, ptShortEd1, 0.3);
+    let intersect2 = segmentsIntersect2D(ptStart, ptEnd, ptShortSt2, ptShortEd2, 0.3);
     if (intersect1 != null && intersect2 != null) {
       if (line2.mergeIndexs) {
         let tmpIndex = [];
@@ -12589,7 +12589,7 @@ var getDoorPcdData = (lines, pcdData) => {
             newDoorAndBeamData3.push(line2.doorAndBeamData[a]);
         }
       }
-      let groundClearance = minZ - ptDoorSt.z;
+      let groundClearance = minZ - line2.start.z;
       groundClearance = groundClearance > 0.01 ? groundClearance : 0;
       let newLine1 = {
         start: ptStart,
@@ -12613,8 +12613,8 @@ var getDoorPcdData = (lines, pcdData) => {
         isRebuild: false,
         direction: line2.direction,
         drawDoorData: {
-          start: new THREE11.Vector3(ptDoorSt.x, ptDoorSt.y, minZ),
-          end: new THREE11.Vector3(ptDoorEd.x, ptDoorEd.y, minZ),
+          start: new THREE11.Vector3(ptDoorSt.x, ptDoorSt.y, line2.start.z),
+          end: new THREE11.Vector3(ptDoorEd.x, ptDoorEd.y, line2.start.z),
           n: new THREE11.Vector3(0, 0, 0),
           height,
           groundClearance
@@ -12632,14 +12632,113 @@ var getDoorPcdData = (lines, pcdData) => {
         isRebuild: false,
         direction: line2.direction
       };
-      if (newLine1.originalPoints.length > 0)
+      if (newLine1.originalPoints.length > 0 && newLine1.length > 0.01)
         lines.push(newLine1);
-      if (newLine2.originalPoints.length > 0)
+      if (newLine2.originalPoints.length > 0 && newLine2.length > 0.01)
         lines.push(newLine2);
-      if (newLine3.originalPoints.length > 0)
+      if (newLine3.originalPoints.length > 0 && newLine3.length > 0.01)
         lines.push(newLine3);
       pcd.isFindDoor = true;
       line2.isRebuild = true;
+    } else if (intersect1 == null && intersect2 == null) {
+      ptShortSt1.z = ptShortEd1.z = ptShortSt2.z = ptShortEd2.z = line2.start.z;
+      let shortLine1 = new THREE11.Line3(ptShortSt1, ptShortEd1);
+      let shortLine2 = new THREE11.Line3(ptShortSt2, ptShortEd2);
+      let ptClose1 = shortLine1.closestPointToPoint(ptStart, true, new THREE11.Vector3());
+      let ptClose2 = shortLine1.closestPointToPoint(ptEnd, true, new THREE11.Vector3());
+      let ptClose3 = shortLine2.closestPointToPoint(ptStart, true, new THREE11.Vector3());
+      let ptClose4 = shortLine2.closestPointToPoint(ptEnd, true, new THREE11.Vector3());
+      let dist1 = ptClose1.distanceTo(ptStart);
+      let dist2 = ptClose2.distanceTo(ptEnd);
+      let dist3 = ptClose3.distanceTo(ptStart);
+      let dist4 = ptClose4.distanceTo(ptEnd);
+      let nearDist = 0.1;
+      console.log(dist1, dist2, dist3, dist4);
+      if ((dist1 < nearDist || dist2 < nearDist) && (dist3 < nearDist || dist4 < nearDist)) {
+        if (line2.mergeIndexs) {
+          let tmpIndex = [];
+          for (let h = 0; h < line2.mergeIndexs.length; h++) {
+            tmpIndex.push(eligibilityLinesIndexs[line2.mergeIndexs[h]]);
+          }
+          for (let h = 0; h < lines.length; h++) {
+            if (tmpIndex.includes(h))
+              lines[h].isRebuild = true;
+          }
+        }
+        let ptDoorSt = ptClose1.clone();
+        let ptDoorEd = ptClose3.clone();
+        if (dist2 < nearDist)
+          ptDoorSt = ptClose2.clone();
+        if (dist4 < nearDist)
+          ptDoorEd = ptClose4.clone();
+        const newOriginPts1 = getProjectedPointOnLine(ptStart, ptDoorSt, line2.originalPoints);
+        const newOriginPts2 = getProjectedPointOnLine(ptDoorSt, ptDoorEd, line2.originalPoints);
+        const newOriginPts3 = getProjectedPointOnLine(ptDoorEd, ptEnd, line2.originalPoints);
+        const newDoorAndBeamData1 = [];
+        const newDoorAndBeamData2 = [];
+        const newDoorAndBeamData3 = [];
+        if (line2.doorAndBeamData) {
+          for (let a = 0; a < line2.doorAndBeamData.length; a++) {
+            let doorStart = line2.doorAndBeamData[a].doorStart;
+            let doorEnd = line2.doorAndBeamData[a].doorEnd;
+            if (isPointOnLine2(ptStart, ptDoorSt, doorStart, 1e-3, true) && isPointOnLine2(ptStart, ptDoorSt, doorEnd, 1e-3, true))
+              newDoorAndBeamData1.push(line2.doorAndBeamData[a]);
+            else if (isPointOnLine2(ptDoorEd, ptEnd, doorStart, 1e-3, true) && isPointOnLine2(ptDoorEd, ptEnd, doorEnd, 1e-3, true))
+              newDoorAndBeamData3.push(line2.doorAndBeamData[a]);
+          }
+        }
+        let groundClearance = minZ - line2.start.z;
+        groundClearance = groundClearance > 0.01 ? groundClearance : 0;
+        let newLine1 = {
+          start: ptStart,
+          end: ptDoorSt,
+          length: ptStart.distanceTo(ptDoorSt),
+          originalPoints: newOriginPts1.newOriginalPoints,
+          doorAndBeamData: newDoorAndBeamData1,
+          id: randomUUID2(),
+          rooftopPz: line2.rooftopPz,
+          isRebuild: false,
+          direction: line2.direction
+        };
+        let newLine2 = {
+          start: ptDoorSt,
+          end: ptDoorEd,
+          length: ptDoorSt.distanceTo(ptDoorEd),
+          originalPoints: newOriginPts2.newOriginalPoints,
+          doorAndBeamData: newDoorAndBeamData2,
+          id: randomUUID2(),
+          rooftopPz: line2.rooftopPz,
+          isRebuild: false,
+          direction: line2.direction,
+          drawDoorData: {
+            start: new THREE11.Vector3(ptDoorSt.x, ptDoorSt.y, line2.start.z),
+            end: new THREE11.Vector3(ptDoorEd.x, ptDoorEd.y, line2.start.z),
+            n: new THREE11.Vector3(0, 0, 0),
+            height,
+            groundClearance
+          },
+          isDoor: true
+        };
+        let newLine3 = {
+          start: ptDoorEd,
+          end: ptEnd,
+          length: ptDoorEd.distanceTo(ptEnd),
+          originalPoints: newOriginPts3.newOriginalPoints,
+          doorAndBeamData: newDoorAndBeamData3,
+          id: randomUUID2(),
+          rooftopPz: line2.rooftopPz,
+          isRebuild: false,
+          direction: line2.direction
+        };
+        if (newLine1.originalPoints.length > 0 && newLine1.length > 0.01)
+          lines.push(newLine1);
+        if (newLine2.originalPoints.length > 0 && newLine2.length > 0.01)
+          lines.push(newLine2);
+        if (newLine3.originalPoints.length > 0 && newLine3.length > 0.01)
+          lines.push(newLine3);
+        pcd.isFindDoor = true;
+        line2.isRebuild = true;
+      }
     }
   }
   return lines;

package/package.json

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