build-dxf 0.1.145 → 0.1.147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.145",
+  "version": "0.1.147",
   "description": "",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -3675,6 +3675,18 @@ class LineSegmentUtils {
     }
     return lines;
   }
+  /** 线段合法性检测 */
+  static legitimacy(line) {
+    const values = [
+      line.start.x,
+      line.start.y,
+      line.end.x,
+      line.end.y
+    ];
+    return values.every(
+      (v2) => typeof v2 === "number" && !Number.isNaN(v2)
+    );
+  }
   /**保留四位小数位数
    * @param points 
    */
@@ -8519,13 +8531,14 @@ class PCSparseOctree {
   }
 }
 const box3$1 = new THREE.Box3();
-function projectPointToSegment(point2, start, end) {
-  const dir = end.clone().sub(start);
+const temp = new Vector3();
+function projectPointToSegment(point2, start, _end, dir) {
   const len2 = dir.lengthSq();
   if (len2 < 1e-12) {
     return 0;
   }
-  let t2 = point2.clone().sub(start).dot(dir) / len2;
+  temp.copy(point2);
+  let t2 = temp.sub(start).dot(dir) / len2;
   t2 = Math.max(0, Math.min(1, t2));
   return t2;
 }
@@ -8570,29 +8583,31 @@ class CheckPointCloudContinuity {
    * @param points 
    */
   static checkByProjectionContinuity(points, opt) {
-    const { ratio = 0.6, axisLine } = opt ?? {};
-    let xline = axisLine;
-    if (!xline) {
+    let { ratio = 0.6, gridSize = 0.02, axisLine } = opt ?? {};
+    if (!axisLine) {
       const rectangle = new Polygon(
         points.map((p2) => new Point(p2.x, p2.y))
       ).toRectangle();
-      xline = rectangleToLine(rectangle);
+      axisLine = rectangleToLine(rectangle);
+    } else if (!(axisLine instanceof LineSegment)) {
+      axisLine = new LineSegment(Point.from(axisLine.start), Point.from(axisLine.end));
     }
+    const xline = axisLine;
     const start = new Vector3(), end = new Vector3();
     start.set(xline.start.x, xline.start.y, 0);
     end.set(xline.end.x, xline.end.y, 0);
     const xts = this.projectPoint(points, start, end);
-    if (!this.continuity(xts, xline.length, ratio)) return false;
+    if (!this.continuity(xts, xline.length, gridSize, ratio)) return false;
     const yline2 = xline.clone().rotate(Math.PI * 0.5);
     start.set(yline2.start.x, yline2.start.y, 0);
     end.set(yline2.end.x, yline2.end.y, 0);
     const yts = this.projectPoint(points, start, end);
-    if (!this.continuity(yts, yline2.length, ratio)) return false;
+    if (!this.continuity(yts, yline2.length, gridSize, ratio)) return false;
     const center = xline.center.clone();
     start.set(center.x, center.y, 10);
     end.set(center.x, center.y, -10);
     const zts = this.projectPoint(points, start, end);
-    if (!this.continuity(zts, 20, ratio)) return false;
+    if (!this.continuity(zts, 20, gridSize, ratio)) return false;
     return true;
   }
   /** 通过区域投影面积占比检测
@@ -8600,7 +8615,15 @@ class CheckPointCloudContinuity {
    * @returns 
    */
   static checkByVoxelDensity(points, opt) {
-    const { gridSize = 0.08, xRatio = 0.5, yRatio = 0.4, overallRatio = 0.5, axisLine } = opt ?? {};
+    let { gridSize = 0.08, xRatio = 0.5, yRatio = 0.4, overallRatio = 0.5, axisLine } = opt ?? {};
+    if (!axisLine) {
+      const rectangle = new Polygon(
+        points.map((p2) => new Point(p2.x, p2.y))
+      ).toRectangle();
+      axisLine = rectangleToLine(rectangle);
+    } else if (!(axisLine instanceof LineSegment)) {
+      axisLine = new LineSegment(Point.from(axisLine.start), Point.from(axisLine.end));
+    }
     let xline = axisLine;
     if (!xline) {
       const rectangle = new Polygon(points.map((p2) => new Point(p2.x, p2.y))).toRectangle();
@@ -8609,7 +8632,7 @@ class CheckPointCloudContinuity {
     const dir = xline.direction(), angle = Math.atan2(dir.y, dir.x), center = xline.center, cos = Math.cos(-angle), sin = Math.sin(-angle), voxelizationPoints = [], xMap = new CounterMap(), yMap = new CounterMap(), occupied = /* @__PURE__ */ new Set();
     let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
     points.forEach((p2) => {
-      const dx = p2.x - center.x, dy = p2.y - center.y, x = Math.floor((dx * cos - dy * sin) / gridSize), y = Math.floor(p2.z / gridSize), key = BigInt(x) << 32n ^ BigInt(y) & 0xffffffffn;
+      const dx = p2.x - center.x, dy = p2.y - center.y, x = Math.floor((dx * cos - dy * sin) / gridSize), y = Math.floor(p2.z / gridSize), key = BigInt(x) << 32n | BigInt(y) & 0xffffffffn;
       if (occupied.has(key)) return;
       occupied.add(key);
       xMap.increment(x, 1);
@@ -8636,10 +8659,11 @@ class CheckPointCloudContinuity {
    */
   static projectPoint(points, start, end) {
     const point2 = new Vector3();
+    const dir = end.clone().sub(start);
     return points.map((p2) => {
       point2.copy(p2);
-      return projectPointToSegment(point2, start, end);
-    }).sort((a2, b4) => a2 - b4);
+      return projectPointToSegment(point2, start, end, dir);
+    });
   }
 }
 const index$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -10946,25 +10970,29 @@ function splitIntersectedLine(lines, minLen = 1e-9, opt) {
   lines = LineSegmentUtils.splitIntersections(lines, {
     obstacle,
     onSplit: (line, newLines) => {
-      WallHole.splitHole(line, newLines);
-      if (line.userData.isBayWindow) {
-        newLines.sort((a2, b4) => b4.length - a2.length);
-        for (let i = 1; i < newLines.length; i++) {
-          newLines[i].userData.isBayWindow = false;
-        }
-      }
-      if (balconyRailing && line.userData.isBalconyRailing) {
-        const len = line.length;
-        newLines.forEach((line2) => {
-          if (line2.length / len < balconyRailing.filteringRatio) {
-            if (opt?.balconyRailing?.behavior === "discard") removeSet.add(line2);
-            else delete line2.userData.isBalconyRailing;
+      try {
+        WallHole.splitHole(line, newLines);
+        if (line.userData.isBayWindow) {
+          newLines.sort((a2, b4) => b4.length - a2.length);
+          for (let i = 1; i < newLines.length; i++) {
+            newLines[i].userData.isBayWindow = false;
           }
-        });
+        }
+        if (balconyRailing && line.userData.isBalconyRailing) {
+          const len = line.length;
+          newLines.forEach((line2) => {
+            if (line2.length / len < balconyRailing.filteringRatio) {
+              if (opt?.balconyRailing?.behavior === "discard") removeSet.add(line2);
+              else delete line2.userData.isBalconyRailing;
+            }
+          });
+        }
+      } catch (error) {
+        console.error(error.message);
       }
     }
   });
-  lines = lines.filter((line) => line.length >= minLen && !removeSet.has(line));
+  lines = lines.filter((line) => line.length >= minLen && !removeSet.has(line) && LineSegmentUtils.legitimacy(line));
   return dedup ? LineSegmentUtils.deduplicate(lines, 3) : lines;
 }
 function mergeChainsLine(lines, callBack, removeLines, newLines) {

package/src/index3.js

@@ -11917,7 +11917,9 @@ class Command extends Component {
           " justify-center items-center bg-[rgba(0,0,0,0.5)]": !isMobileRef.value
         },
         "onClick": (e) => e.stopPropagation(),
-        "onPointerdown": (e) => e.stopPropagation()
+        "onPointerdown": (e) => e.stopPropagation(),
+        "onPointerup": (e) => e.stopPropagation(),
+        "onMousedown": (e) => e.stopPropagation()
       }, [isMobileRef.value && createVNode("div", {
         "class": "flex-1 pointer-events-none"
       }, null), createVNode("div", {
@@ -14878,6 +14880,8 @@ function createPage$2(el, editWidth, editHeight, editGroundClearance) {
     return createVNode("div", {
       "class": " z-20 absolute left-0 top-[50%] translate-y-[-50%] flex flex-col p-[10px] gap-[16px]",
       "onClick": (e) => e.stopPropagation(),
+      "onMousedown": (e) => e.stopPropagation(),
+      "onPointerup": (e) => e.stopPropagation(),
       "onPointerdown": (e) => e.stopPropagation()
     }, [editWidth && createVNode(_sfc_main$5, {
       "iconSize": "28px",
@@ -18181,6 +18185,7 @@ function createPage(el) {
     return createVNode("div", {
       "class": " z-20 absolute left-0 top-[50%] translate-y-[-50%] flex flex-col p-[10px] gap-[16px]",
       "onClick": (e) => e.stopPropagation(),
+      "onMousedown": (e) => e.stopPropagation(),
       "onPointerdown": (e) => e.stopPropagation()
     }, [createVNode(_sfc_main$4, {
       "icon": "tdesign:rotate-locked-filled",

package/src/utils/algorithms/CheckPointCloudContinuity.d.ts

@@ -1,10 +1,21 @@
-import { LineSegment } from './LineSegment';
 import { Vector3 } from 'three';
 type Point3D = {
     x: number;
     y: number;
     z: number;
 };
+type LineSegmentType = {
+    start: {
+        x: number;
+        y: number;
+        z?: number;
+    };
+    end: {
+        x: number;
+        y: number;
+        z?: number;
+    };
+};
 /**
  * 检测点云在分部轴上的连续性，z朝上
  */
@@ -15,7 +26,8 @@ export declare class CheckPointCloudContinuity {
      */
     static checkByProjectionContinuity(points: Point3D[], opt?: {
         ratio?: number;
-        axisLine?: LineSegment;
+        gridSize?: number;
+        axisLine?: LineSegmentType;
     }): boolean;
     /** 通过区域投影面积占比检测
      * @param points
@@ -38,7 +50,7 @@ export declare class CheckPointCloudContinuity {
          * 总占比比例
          */
         overallRatio?: number;
-        axisLine?: LineSegment;
+        axisLine?: LineSegmentType;
     }): boolean;
     /** 获取投影值
      * @param points

package/src/utils/algorithms/LineSegmentUtils.d.ts

@@ -7,6 +7,8 @@ export declare class LineSegmentUtils {
      * @param points
      */
     static precision(lines: LineSegment[], count: number): LineSegment<Record<string, any>>[];
+    /** 线段合法性检测 */
+    static legitimacy(line: LineSegment): boolean;
     /**保留四位小数位数
      * @param points
      */