rm-graphical-computing-node 1.0.39 → 1.0.41

package/dist/index.mjs

@@ -3447,6 +3447,65 @@ function pointToSegmentDistance(p, a, b) {
     p.y - y
   );
 }
+var voxelDownsample2DForContour = (points, cellSize) => {
+  if (!points || points.length === 0) return [];
+  const map = /* @__PURE__ */ new Map();
+  for (let i = 0; i < points.length; i++) {
+    const p = points[i];
+    const x = p[0];
+    const y = p[1];
+    const gx = Math.floor(x / cellSize);
+    const gy = Math.floor(y / cellSize);
+    const key = `${gx}_${gy}`;
+    let cell = map.get(key);
+    if (!cell) {
+      const cx = (gx + 0.5) * cellSize;
+      const cy = (gy + 0.5) * cellSize;
+      const dx2 = x - cx;
+      const dy2 = y - cy;
+      cell = {
+        minX: p,
+        maxX: p,
+        minY: p,
+        maxY: p,
+        center: p,
+        centerDist2: dx2 * dx2 + dy2 * dy2,
+        cx,
+        cy
+      };
+      map.set(key, cell);
+      continue;
+    }
+    if (x < cell.minX[0]) cell.minX = p;
+    if (x > cell.maxX[0]) cell.maxX = p;
+    if (y < cell.minY[1]) cell.minY = p;
+    if (y > cell.maxY[1]) cell.maxY = p;
+    const dx = x - cell.cx;
+    const dy = y - cell.cy;
+    const dist22 = dx * dx + dy * dy;
+    if (dist22 < cell.centerDist2) {
+      cell.center = p;
+      cell.centerDist2 = dist22;
+    }
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const result = [];
+  function addPoint(p) {
+    const key = `${p[0]}_${p[1]}`;
+    if (!seen.has(key)) {
+      seen.add(key);
+      result.push(p);
+    }
+  }
+  for (const cell of map.values()) {
+    addPoint(cell.minX);
+    addPoint(cell.maxX);
+    addPoint(cell.minY);
+    addPoint(cell.maxY);
+    addPoint(cell.center);
+  }
+  return result;
+};
 
 // src/utils/updateLine.mjs
 import * as THREE4 from "three";
@@ -8501,7 +8560,7 @@ var drawStaircase = (pcdPointsArr, scene) => {
   }
   return pointCloudGroup;
 };
-var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = null) => {
+var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = null, tolerancePointCloudCluster = 0.1) => {
   if (allProjectionResults.length == 0) return [];
   if (!averagePz2) averagePz2 = allProjectionResults[0].averagePz;
   const pcdPointsArr = [];
@@ -9027,7 +9086,7 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
         if (points.length < 50)
           continue;
         let clusterResult = pointCloudCluster([points], {
-          tolerance: 0.2,
+          tolerance: tolerancePointCloudCluster,
           minClusterSize: 50,
           maxClusterSize: 1e7,
           threadCount: 1
@@ -9072,7 +9131,6 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
       }
     }
   }
-  return pcdPointsArr;
   const retPcdPointArr = [];
   for (let i = 0; i < pcdPointsArr.length; i++) {
     const array = pcdPointsArr[i].array;
@@ -10548,65 +10606,6 @@ function obbContainsPoint(obb, point2, epsilon3 = 1e-6) {
   const z = v2.dot(zAxis);
   return Math.abs(x) <= h.x + epsilon3 && Math.abs(y) <= h.y + epsilon3 && Math.abs(z) <= h.z + epsilon3;
 }
-function voxelDownsample2DForContour(points, cellSize) {
-  if (!points || points.length === 0) return [];
-  const map = /* @__PURE__ */ new Map();
-  for (let i = 0; i < points.length; i++) {
-    const p = points[i];
-    const x = p[0];
-    const y = p[1];
-    const gx = Math.floor(x / cellSize);
-    const gy = Math.floor(y / cellSize);
-    const key = `${gx}_${gy}`;
-    let cell = map.get(key);
-    if (!cell) {
-      const cx = (gx + 0.5) * cellSize;
-      const cy = (gy + 0.5) * cellSize;
-      const dx2 = x - cx;
-      const dy2 = y - cy;
-      cell = {
-        minX: p,
-        maxX: p,
-        minY: p,
-        maxY: p,
-        center: p,
-        centerDist2: dx2 * dx2 + dy2 * dy2,
-        cx,
-        cy
-      };
-      map.set(key, cell);
-      continue;
-    }
-    if (x < cell.minX[0]) cell.minX = p;
-    if (x > cell.maxX[0]) cell.maxX = p;
-    if (y < cell.minY[1]) cell.minY = p;
-    if (y > cell.maxY[1]) cell.maxY = p;
-    const dx = x - cell.cx;
-    const dy = y - cell.cy;
-    const dist22 = dx * dx + dy * dy;
-    if (dist22 < cell.centerDist2) {
-      cell.center = p;
-      cell.centerDist2 = dist22;
-    }
-  }
-  const seen = /* @__PURE__ */ new Set();
-  const result = [];
-  function addPoint(p) {
-    const key = `${p[0]}_${p[1]}`;
-    if (!seen.has(key)) {
-      seen.add(key);
-      result.push(p);
-    }
-  }
-  for (const cell of map.values()) {
-    addPoint(cell.minX);
-    addPoint(cell.maxX);
-    addPoint(cell.minY);
-    addPoint(cell.maxY);
-    addPoint(cell.center);
-  }
-  return result;
-}
 
 // src/utils/clusert.mjs
 function alphaForTriangle(points, ia, ib, ic) {
@@ -10776,10 +10775,9 @@ var getFlatSlabData = (lines, runDataList, pointCloudCluster = null) => {
       if (isIntersect) {
         for (let b = 0; b < slabData2.points.length; b++)
           slabData1.points.push(slabData2.points[b]);
-        let pathPoints = slabData1.contour;
-        for (let b = 0; b < slabData2.contour.length; b++)
-          pathPoints.push(slabData2.contour[b]);
-        let path3 = computeContour(pathPoints);
+        let tmpPoints = slabData1.points.map((p) => [p.x, p.y]);
+        tmpPoints = voxelDownsample2DForContour(tmpPoints, 0.1);
+        let path3 = computeContour(tmpPoints);
         slabData1.contour = path3;
         delIndex.add(k);
         k = -1;

package/package.json

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