rm-graphical-computing-node 1.0.43 → 1.0.45

package/dist/index.mjs

@@ -3782,7 +3782,6 @@ function getTrendLineEndpoints(points, options = {}) {
 }
 
 // src/geometry/beamLine.mjs
-import { Line as Line2 } from "three";
 var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, onProgress = null) => {
   removeNoisePoints(lines, lineReader, lineEditor);
   if (lines.length <= 0 || runDataList.length <= 0)
@@ -3939,11 +3938,11 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
         let dist1 = door.doorStartPt.distanceTo(door.doorEndPt);
         let dist22 = newDoorSt.distanceTo(newDoorEd);
         let res = getParallelism(door.doorStartPt, door.doorEndPt, newDoorSt, newDoorEd);
-        if (Math.abs(dist22 - dist1) < 0.5 && res && res.angleDeg < 15) {
+        if (Math.abs(dist22 - dist1) < 0.5 && res && res.angleDeg < 10) {
           door.doorStartPt = new THREE5.Vector3(lines[u4].start.x, lines[u4].start.y, 0);
           door.doorEndPt = new THREE5.Vector3(lines[u4].end.x, lines[u4].end.y, 0);
           break;
-        } else if (Math.abs(dist22 - dist1) > 1.3 && res && res.angleDeg < 15) {
+        } else if (Math.abs(dist22 - dist1) > 1.3 && res && res.angleDeg < 10) {
           let restmp = classifySegments(door.doorStartPt, door.doorEndPt, newDoorSt, newDoorEd, { parallelAngleMax: THREE5.MathUtils.degToRad(15) });
           let dist11 = door.doorStartPt.distanceTo(newDoorSt);
           let dist12 = door.doorStartPt.distanceTo(newDoorEd);
@@ -4852,7 +4851,7 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
                 let vecNegate = vec2.clone().negate();
                 let ptCenterOther = ptCenter.clone().addScaledVector(vecNegate, dist3 + 0.1);
                 let isInsert = segmentsIntersect2D(line3.start, line3.end, ptCenter, ptCenterOther);
-                let isTrue = !isDoor && !tmpDoorBeamData.isDoor && (length1 > length22 * 2 || length22 > length1 * 2);
+                let isTrue = !isDoor && !tmpDoorBeamData.isDoor && (length1 > length22 * 2.5 || length22 > length1 * 2.5);
                 if (dist3 < 0.4 && isInsert != null && !isTrue) {
                   let isSameLine = false;
                   for (let v2 = 0; v2 < line2.doorAndBeamData.length; v2++) {
@@ -11938,6 +11937,9 @@ function processData(wallSegments, objects, options) {
   return { segments: finalSegments, matches };
 }
 
+// src/wall-door-matcher/matcher.ts
+import * as THREE10 from "three";
+
 // src/wall-door-matcher/utils.ts
 function dist2D2(a, b) {
   const dx = a.x - b.x;
@@ -12777,7 +12779,26 @@ function collectCandidates2(candidateSegments, doorLong, doorDirX, doorDirY, che
   for (const attempt of matchAttempts) {
     if (passingCandidates.length > 0) break;
     for (const seg of candidateSegments) {
-      const { start, end } = seg;
+      const { start, end, isLine2, passageEntrance } = seg;
+      if (isLine2)
+        continue;
+      if (passageEntrance) {
+        const pt1 = new THREE10.Vector3(nline.start.x, nline.start.y, nline.start.z);
+        const pt2 = new THREE10.Vector3(nline.end.x, nline.end.y, nline.end.z);
+        let isOverLap = false;
+        for (let v2 = 0; v2 < passageEntrance.length; v2++) {
+          const data = passageEntrance[v2];
+          const pt3 = new THREE10.Vector3(data.start.x, data.start.y, data.start.z);
+          const pt4 = new THREE10.Vector3(data.end.x, data.end.y, data.end.z);
+          let resultTmp = classifySegments(pt1, pt2, pt3, pt4);
+          if (resultTmp.type == "collinear_overlap" && resultTmp.maxPerpendicularDistance < 0.1) {
+            isOverLap = true;
+            break;
+          }
+        }
+        if (isOverLap)
+          continue;
+      }
       let validPoint = false;
       let minDist = Infinity;
       for (const pt of checkPoints) {
@@ -12924,8 +12945,6 @@ function mergeSourceData2(ws, srcIdxs, wallSegments) {
   if (boxData) ws.boxData = boxData;
   if (maxRooftopPz !== void 0) ws.rooftopPz = maxRooftopPz;
 }
-function logDrawDoorSummary(mergedSegments) {
-}
 function detectPerpendicularWalls2(match, mergedSegments, angleTol = 10, distTol = 0.2, perpDistTol = 0.2) {
   const results = [];
   if (!match.DrawDoor) return results;
@@ -13123,16 +13142,6 @@ function findDoorWalls(doorObjs, wallSegments, options, preMerged) {
     const checkPoints = getCheckPoints2(corners, centerX, centerY);
     debugScanDoor(door.name, candidateSegments, centerX, centerY, checkPoints, doorLong, doorDirX, doorDirY, opts);
     let passingCandidates = collectCandidates2(candidateSegments, actualDoorWidth, doorDirX, doorDirY, checkPoints, opts, door.name, verticalEdges, door.nline);
-    if (passingCandidates.length > 0) {
-      for (let ci = 0; ci < passingCandidates.length; ci++) {
-        const pc = passingCandidates[ci];
-        const seg = pc.seg;
-        const hasHinge = !!pc.hingeInfo?.hingePoint;
-        const isClosed = pc.hingeInfo?.isClosed;
-        const hDist = pc.hingeInfo?.hingeDist ?? -1;
-        const centerProj = pointToSegmentDist2(checkPoints[0].x, checkPoints[0].y, seg.start.x, seg.start.y, seg.end.x, seg.end.y);
-      }
-    }
     passingCandidates = rankCandidates2(passingCandidates, checkPoints, wallSegments, door.name);
     if (passingCandidates.length === 0) {
       for (const seg of candidateSegments) {
@@ -13221,9 +13230,6 @@ function findDoorWalls(doorObjs, wallSegments, options, preMerged) {
               };
             }
           }
-          if (door.name.includes("door_002")) {
-            window.__doorLog = true;
-          }
           ;
           pc.densityScore = densityScore.score;
           pc.densityOverlap = densityScore.bestOverlap;
@@ -13242,19 +13248,6 @@ function findDoorWalls(doorObjs, wallSegments, options, preMerged) {
         pc.densityScore = -1;
       }
     }
-    if (door.name.includes("door_002")) {
-      for (let pi = 0; pi < passingCandidates.length; pi++) {
-        const pc = passingCandidates[pi];
-        const s = pc.seg;
-        const segIdx = candidateSegments.findIndex(
-          (cs) => Math.abs(cs.start.x - s.start.x) < 1e-3 && Math.abs(cs.start.y - s.start.y) < 1e-3 && Math.abs(cs.end.x - s.end.x) < 1e-3 && Math.abs(cs.end.y - s.end.y) < 1e-3
-        );
-        const origIndices = segIdx >= 0 ? mergeSourceMap[segIdx] || [] : [];
-        for (const oi of origIndices) {
-          const orig = wallSegments[oi];
-        }
-      }
-    }
     passingCandidates.sort((a, b) => {
       const da2 = a.densityScore >= 0 ? a.densityScore : -Infinity;
       const db = b.densityScore >= 0 ? b.densityScore : -Infinity;
@@ -13271,14 +13264,6 @@ function findDoorWalls(doorObjs, wallSegments, options, preMerged) {
       if (ha !== hb) return hb - ha;
       return a.minDist - b.minDist;
     });
-    if (passingCandidates.length > 0) {
-      for (let ci = 0; ci < passingCandidates.length; ci++) {
-        const pc = passingCandidates[ci];
-        const s = pc.seg;
-        const ratio = pc.ratio || s.length / doorWidth;
-        const ratioDiff = Math.abs(ratio - 1);
-      }
-    }
     let bestSeg = null;
     let bestDist = Infinity;
     let bestRatio = 0;
@@ -13400,7 +13385,6 @@ function findDoorWalls(doorObjs, wallSegments, options, preMerged) {
     if (!srcIdxs || srcIdxs.length <= 1) continue;
     mergeSourceData2(ws, srcIdxs, wallSegments);
   }
-  logDrawDoorSummary(mergedSegments);
   return results;
 }
 
@@ -13922,10 +13906,10 @@ function normalizeAngles(lines) {
     hist[binIdx] += len;
   }
   const smooth = new Array(bins).fill(0);
-  const window2 = 5;
+  const window = 5;
   for (let i = 0; i < bins; i++) {
     let sum2 = 0;
-    for (let j = -window2; j <= window2; j++) {
+    for (let j = -window; j <= window; j++) {
       let idx = i + j;
       if (idx < 0) idx += bins;
       if (idx >= bins) idx -= bins;
@@ -16346,10 +16330,10 @@ function normalizeAngles2(lines) {
     hist[binIdx] += len;
   }
   const smooth = new Array(bins).fill(0);
-  const window2 = 5;
+  const window = 5;
   for (let i = 0; i < bins; i++) {
     let sum2 = 0;
-    for (let j = -window2; j <= window2; j++) {
+    for (let j = -window; j <= window; j++) {
       let idx = i + j;
       if (idx < 0) idx += bins;
       if (idx >= bins) idx -= bins;

package/package.json

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