rm-graphical-computing-node 1.0.54 → 1.0.56

package/dist/index.mjs

@@ -11101,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) => {
@@ -11242,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();
@@ -11302,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)
@@ -11330,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;
                           }
                         }
@@ -11364,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;
@@ -11464,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;
                 }
               }
@@ -12281,8 +12281,8 @@ function computeDrawWindow(bestSeg, corners, win, mergedSegments) {
   const dw_midT = (dw_tMin + dw_tMax) / 2;
   const dw_pMidX = bestSeg.start.x + dw_midT * dw_dx;
   const dw_pMidY = bestSeg.start.y + dw_midT * dw_dy;
-  const dw_boxMinZ = win.box.min.z;
-  const dw_boxMaxZ = win.box.max.z;
+  const dw_boxMinZ = win.coordinatesByArea.heightData?.minZ ? win.coordinatesByArea.heightData.minZ : win.box.min.z;
+  const dw_boxMaxZ = win.coordinatesByArea.heightData?.maxZ ? win.coordinatesByArea.heightData.maxZ : win.box.max.z;
   const dw_height = Math.abs(dw_boxMaxZ - dw_boxMinZ);
   const dw_floorZ = computeLocalFloorZ(mergedSegments, bestSeg.start.x, bestSeg.start.y);
   const dw_gClr = Math.max(0, dw_boxMinZ - dw_floorZ);
@@ -12549,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) {
@@ -12774,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
@@ -14545,6 +14546,7 @@ function processDoorData(wallSegments, objects, options) {
             groundClearance: drawDoor[doorIndex].groundClearance
           };
           doorSeg.drawDoorData = ddData;
+          doorObj.isFindDoor = true;
         }
         finalSegments.push(doorSeg);
       }
@@ -14634,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.54",
+  "version": "1.0.56",
   "description": "墙体/梁线/点云语义计算库（依赖 Python 与 three.js）",
   "type": "module",
   "main": "dist/index.mjs",