build-dxf 0.1.146 → 0.1.148

package/package.json

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

package/src/build.js

@@ -2739,9 +2739,9 @@ class Quadtree {
     }));
     return array;
   }
-  static from(lines) {
+  static from(lines, userDataFun) {
     const quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
-    lines.forEach((line) => quadtree.insert({ line, userData: void 0 }));
+    lines.forEach((line, index2) => quadtree.insert({ line, userData: userDataFun ? userDataFun(line, index2) : void 0 }));
     return quadtree;
   }
 }
@@ -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,7 +8583,7 @@ class CheckPointCloudContinuity {
    * @param points 
    */
   static checkByProjectionContinuity(points, opt) {
-    let { ratio = 0.6, axisLine } = opt ?? {};
+    let { ratio = 0.6, gridSize = 0.02, axisLine } = opt ?? {};
     if (!axisLine) {
       const rectangle = new Polygon(
         points.map((p2) => new Point(p2.x, p2.y))
@@ -8584,17 +8597,17 @@ class CheckPointCloudContinuity {
     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;
   }
   /** 通过区域投影面积占比检测
@@ -8619,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);
@@ -8646,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({
@@ -8841,7 +8855,7 @@ class WallHole {
         otherLines.push(line);
         return [];
       }
-      WallHole.forEachType(line, (data, k) => {
+      WallHole.forEachStorageType(line, (data, k) => {
         if (k !== "passageEntrance") return;
         data.forEach((v2) => {
           const id = WallHole.getId(v2);
@@ -8897,7 +8911,7 @@ class WallHole {
    * @param line 
    * @returns 
    */
-  static forEachType(line, callBack) {
+  static forEachStorageType(line, callBack) {
     if (line.userData.isWindow) {
       line.userData.drawWindow?.forEach((item) => item.type = "window");
       callBack(line.userData.drawWindow ?? [], "drawWindow");
@@ -8914,6 +8928,7 @@ class WallHole {
     if (key === "drawWindow") return 0.3;
     if (key === "passageEntrance") {
       if (type === "door") return 0.4;
+      else if (type === "passageEntrance") return 0.2;
     }
     return 0.05;
   }
@@ -8940,7 +8955,7 @@ class WallHole {
       line.forEach((line2) => this.miniWidthFilter(line2));
       return this;
     }
-    this.forEachType(line, (data, key) => {
+    this.forEachStorageType(line, (data, key) => {
       line.userData[key] = data.filter((w) => w.width > WallHole.getMinWidth(key, w.type));
       if (line.userData[key].length === 0) WallHole.clear(line, key);
     });
@@ -8954,7 +8969,7 @@ class WallHole {
       line.forEach((line2) => this.filterIllegal(line2));
       return this;
     }
-    this.forEachType(line, (data, key) => {
+    this.forEachStorageType(line, (data, key) => {
       data.forEach((w) => {
         if (!w.type && key === "drawWindow") w.type = "window";
         try {
@@ -8978,7 +8993,7 @@ class WallHole {
    */
   static recomputedCenter(lines) {
     lines.forEach((line) => {
-      this.forEachType(line, (data, key) => {
+      this.forEachStorageType(line, (data, key) => {
         data.forEach((w) => {
           try {
             const center = line.projectPoint(Point.from(w.p));
@@ -9070,7 +9085,7 @@ class WallHole {
    * @param insertObject 
    */
   static removeHole(target, insertObject) {
-    this.forEachType(target, (data, key) => {
+    this.forEachStorageType(target, (data, key) => {
       let index2 = data.indexOf(insertObject);
       if (index2 > -1) {
         data.splice(index2, 1);
@@ -9083,7 +9098,7 @@ class WallHole {
    * @param source 
    */
   static copyHole(target, source) {
-    WallHole.forEachType(source, (data, key) => {
+    WallHole.forEachStorageType(source, (data, key) => {
       data.forEach((item) => {
         WallHole.addHole(target, cloneUserData(item), key);
       });
@@ -9096,6 +9111,7 @@ class WallHole {
    */
   static splitHole(target, source) {
     if (!Array.isArray(source)) source = [];
+    this.filterIllegal(target);
     source = source.filter((line) => line.length > 1e-9);
     const iterator = this.getIterator(target);
     for (const hole of iterator) {
@@ -9115,7 +9131,8 @@ class WallHole {
         }
       }
       if (!find && maxLine) {
-        const v2 = Math.min(1, Math.max(0, maxLine.projectPointValue(hole.p)));
+        let v2 = maxLine.projectPointValue(hole.p);
+        v2 = Math.min(1, Math.max(0, v2));
         const point2 = maxLine.pointAt(v2, PointUtils.globalPoint);
         hole.p.x = point2.x;
         hole.p.y = point2.y;
@@ -10200,7 +10217,7 @@ function clippingInsertObjectDoubleWall(lines) {
     if (WallHole.isHole(line)) {
       const normal = line.normal(), center = line.center;
       if (!poly.pointWithin(center.add(normal.clone().multiplyScalar(1e-6)))) normal.multiplyScalar(-1);
-      WallHole.forEachType(line, (data) => data.forEach((d2) => {
+      WallHole.forEachStorageType(line, (data) => data.forEach((d2) => {
         const wioLine = WallHole.holeDataToLine(line, d2);
         wioLine.setLength(wioLine.length - 4e-3);
         const len = wioLine.length;
@@ -10267,7 +10284,7 @@ class WallHoleDrawData {
       if ("expandDirect" in line.userData) {
         openDirect = line.userData.expandDirect === "left" ? line.getRightDirection() : line.getLeftDirection();
       }
-      WallHole.forEachType(line, (data, k) => {
+      WallHole.forEachStorageType(line, (data, k) => {
         const list = grid && doubleWallPoint$1(grid, line), dwh = defaultWallWidth$1 * 0.5;
         data.map(({ full, width, p: p2, height, groundClearance, uuid: uuid2, type }) => {
           if (full) width = line.length;
@@ -10318,7 +10335,7 @@ class WallHoleDrawData {
     mergeLineUserData(newLine, lines);
     WallHole.merge([newLine]);
     const newLines = [];
-    WallHole.forEachType(newLine, (data, key) => {
+    WallHole.forEachStorageType(newLine, (data, key) => {
       data.forEach(({ full, width, p: p2, height, groundClearance, type }) => {
         const point2 = Point.from(p2), direct = newLine.direction();
         if (full) width = newLine.length;
@@ -10839,7 +10856,7 @@ class ThreeVJiaPipeline extends Pipeline {
     let centerVec2 = null;
     lineSegments = LineSegmentUndirectedGraph.rotate(lineSegments.map((line) => line.clone()), angle, (line, center, angle2) => {
       if (!centerVec2) centerVec2 = { x: center.x, y: center.y };
-      WallHole.forEachType(line, (data) => {
+      WallHole.forEachStorageType(line, (data) => {
         data.forEach((item) => {
           const point2 = Point.from(item.p);
           point2.rotate(center, angle2);
@@ -10850,7 +10867,7 @@ class ThreeVJiaPipeline extends Pipeline {
     const heights = [];
     lineSegments.forEach((line) => {
       if (line.userData.isDoor) heights.push(line.userData.height ?? 0);
-      WallHole.forEachType(line, (data) => {
+      WallHole.forEachStorageType(line, (data) => {
         heights.push(line.userData.height ?? 0);
         data.forEach((item) => {
           const h = (item.height ?? 0) + (item.groundClearance ?? 0);
@@ -10875,10 +10892,12 @@ function mmTom(value) {
   return Number((value / 1e3).toFixed(4));
 }
 function getLineIndexByCenter(targetLines, lines) {
-  const grid = Quadtree.from(lines);
+  const grid = Quadtree.from(lines, (_, i) => ({ index: i }));
   const indices = targetLines.map((line) => {
     const res = grid.queryPoint(line.center);
-    if (res.length) return res[0].userData.index;
+    if (res.length) {
+      return res[0].userData.index;
+    }
     return -1;
   });
   return indices;
@@ -10956,25 +10975,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) {
@@ -10991,7 +11014,7 @@ function mergeChainsLine(lines, callBack, removeLines, newLines) {
 }
 function clippingLineUserData(newLine, line2) {
   const { drawWindow, passageEntrance, ...opt } = line2.userData;
-  WallHole.forEachType(line2, (data, key) => {
+  WallHole.forEachStorageType(line2, (data, key) => {
     if (key === "drawWindow") {
       return;
     }
@@ -12128,6 +12151,7 @@ function correction(lines, targettLine, option) {
   lines = recoveryBayWindow(lines, bayWindow);
   lines = removeDangline(lines, 0.1, false);
   lines = removeShortDoor(lines);
+  WallHole.miniWidthFilter(lines);
   lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => line.userData.isDoor || line.userData.isBalconyRailing ? "otherLines" : "newLines")).handle("newLines", (newLines) => {
     newLines = BuildGroup.bayWindow(newLines, false);
     const { wallGroup = true } = option ?? {};
@@ -23838,7 +23862,7 @@ function hasCircle(lineData, startIndex, direction) {
   let lines = originalDataToLineData(lineData).lineSegments;
   const center = lines[startIndex].center;
   let findlines = splitIntersectedLine(lines.map((line2) => line2.clone()), 1e-9);
-  let removeSet = findDiscretePointLine2(findlines, /* @__PURE__ */ new Set(), false);
+  let removeSet = findDiscretePointLine(findlines);
   findlines = findlines.filter((line2) => !removeSet.has(line2));
   const list = findlines.filter((line2) => line2.userData.isBayWindow && line2.isPointOnSegment(center));
   if (list.length === 0) return null;

package/src/dxf-system/plugins/editor/Command/DrawHole.d.ts

@@ -1,7 +1,7 @@
 import { Command } from './Command';
 import { LineSegment } from '../../../../utils/algorithms/LineSegment';
 import { ComponentContainer } from '../../../../utils/ecs';
-import { HoleData, HoleKeyType, HoleType, LineUserData } from '../../../type';
+import { HoleData, HoleStorageType, HoleType, LineUserData } from '../../../type';
 import { Point } from '../../../../utils';
 import * as THREE from "three";
 export interface DrawHoleData {
@@ -25,7 +25,7 @@ export declare class DrawHole extends Command<{
     defaultHeight: number;
     defaultGroundClearance: number;
     holeType?: HoleType;
-    holeKey: HoleKeyType;
+    holeKey: HoleStorageType;
     showEditWidth: boolean;
     showEditHeight: boolean;
     showEditGroundClearance: boolean;

package/src/dxf-system/plugins/editor/Command/DrawWindow.d.ts

@@ -1,4 +1,4 @@
-import { HoleKeyType, HoleType } from '../../../type';
+import { HoleStorageType, HoleType } from '../../../type';
 import { DrawHole } from './DrawHole';
 import * as THREE from "three";
 export declare class DrawWindow extends DrawHole {
@@ -7,5 +7,5 @@ export declare class DrawWindow extends DrawHole {
     static shortcutKeys: string[];
     static commandName: string;
     holeType: HoleType;
-    holeKey: HoleKeyType;
+    holeKey: HoleStorageType;
 }

package/src/dxf-system/type.d.ts

@@ -7,8 +7,8 @@ export interface GroupItem {
     id: string;
     type?: string;
 }
-export type HoleKeyType = 'drawWindow' | 'passageEntrance';
-export type HoleType = "door" | "window" | "beam";
+export type HoleStorageType = 'drawWindow' | 'passageEntrance';
+export type HoleType = "door" | "window" | "beam" | "passageEntrance";
 export interface HoleData {
     p: {
         x: number;

package/src/dxf-system/utils/WallHole.d.ts

@@ -1,5 +1,5 @@
 import { LineSegment } from '../../utils/algorithms/LineSegment';
-import { HoleData, HoleKeyType, HoleType, LineUserData } from '../type';
+import { HoleData, HoleStorageType, HoleType, LineUserData } from '../type';
 /**
  * 墙体嵌入物（窗户、空洞）处理对象
  */
@@ -80,17 +80,17 @@ export declare class WallHole {
      * @param line
      * @returns
      */
-    static forEachType(line: LineSegment<LineUserData>, callBack: (data: HoleData[], key: HoleKeyType) => void): void;
+    static forEachStorageType(line: LineSegment<LineUserData>, callBack: (data: HoleData[], key: HoleStorageType) => void): void;
     /** 获取最小
      * @param line
      * @returns
      */
-    static getMinWidth(key: HoleKeyType, type?: HoleType): 0.4 | 0.05 | 0.3;
+    static getMinWidth(key: HoleStorageType, type?: HoleType): 0.4 | 0.2 | 0.05 | 0.3;
     /** 清理孔洞
      * @param target
      * @param key
      */
-    static clear(target: LineSegment, key?: HoleKeyType): void;
+    static clear(target: LineSegment, key?: HoleStorageType): void;
     /** 过滤宽度最小值孔洞
      * @param line
      */
@@ -113,7 +113,7 @@ export declare class WallHole {
      * @param insertObject
      * @param type
      */
-    static addHole(target: LineSegment<LineUserData>, insertObject: HoleData, type?: HoleKeyType): void;
+    static addHole(target: LineSegment<LineUserData>, insertObject: HoleData, type?: HoleStorageType): void;
     /** 移除孔洞
      * @param target
      * @param insertObject

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",
@@ -17729,7 +17733,7 @@ class Drawer extends Pipeline {
     const color = new THREE.Color(5745151);
     const holeLines = ctx.data.flatMap((line2) => {
       const holeLines2 = [];
-      WallHole.forEachType(line2, (data, key) => {
+      WallHole.forEachStorageType(line2, (data, key) => {
         data.forEach((item) => {
           let type = key == "drawWindow" ? "window" : item.type;
           const holeLine = WallHole.holeDataToLine(line2, item);
@@ -17808,6 +17812,7 @@ class Drawer extends Pipeline {
     const colors = {
       default: new THREE.Color(16776960),
       // 0xff5722
+      passageEntrance: new THREE.Color(16776960),
       window: new THREE.Color(16711935),
       door: new THREE.Color(16776960),
       beam: new THREE.Color(16711680)
@@ -17816,7 +17821,7 @@ class Drawer extends Pipeline {
       const type = line2.userData.type ?? "default";
       const color = colors[type] ?? colors.default;
       line2.points.forEach((p) => {
-        if (type === "default") {
+        if (type === "default" || type === "passageEntrance") {
           ctx.cache.lineDasheds.push(p.x, p.y, 0);
           ctx.cache.lineDashedColor.push(color.r, color.g, color.b);
         } else {
@@ -18181,6 +18186,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

@@ -26,6 +26,7 @@ export declare class CheckPointCloudContinuity {
      */
     static checkByProjectionContinuity(points: Point3D[], opt?: {
         ratio?: number;
+        gridSize?: number;
         axisLine?: LineSegmentType;
     }): boolean;
     /** 通过区域投影面积占比检测

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
      */

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

@@ -85,5 +85,5 @@ export declare class Quadtree<T = any> {
      * @returns
      */
     boundsToArray(array?: number[], colors?: number[], recursion?: boolean): number[];
-    static from(lines: LineSegment[]): Quadtree<any>;
+    static from(lines: LineSegment[], userDataFun?: (line: LineSegment, index: number) => any): Quadtree<any>;
 }