build-dxf 0.1.82 → 0.1.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.82",
+  "version": "0.1.83",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -1454,6 +1454,14 @@ class LineSegment {
   normal() {
     return this.points[1].normal(this.points[0]);
   }
+  /** 
+   * @param line 
+   * @param t 
+   * @returns 
+   */
+  pointAt(t2) {
+    return new Point(this.start.x + (this.end.x - this.start.x) * t2, this.start.y + (this.end.y - this.start.y) * t2);
+  }
   /** 膨胀为矩形
    * 
    * @param width 
@@ -2172,14 +2180,14 @@ class LineSegment {
    * @param clippingLine 
    */
   static clippingByLine(target, clippingLine, callBack) {
-    const start = target.projectPoint(clippingLine.start), end = target.projectPoint(clippingLine.end);
-    const lines = this.clipping(target, [start, end].filter((i) => !!i), callBack);
-    return lines.filter((line) => {
-      const line0 = clippingLine.projectLineSegment(line);
-      if (line0.length() / clippingLine.length() > 0.8) return false;
-      return true;
-    });
+    return this.clippingByLines(target, [clippingLine], callBack);
   }
+  /** 通过线段组裁剪线段
+   * @param target 
+   * @param clippingLines 
+   * @param callBack 
+   * @returns 
+   */
   static clippingByLines(target, clippingLines, callBack) {
     const eps = 1e-6;
     const intervals = clippingLines.map((line) => {
@@ -2192,15 +2200,38 @@ class LineSegment {
       callBack?.(target.clone(), target);
       return;
     }
+    const merged = [];
     let cur = intervals[0];
     for (let i = 1; i < intervals.length; i++) {
       const next = intervals[i];
       if (next[0] <= cur[1] + eps) {
         cur[1] = Math.max(cur[1], next[1]);
       } else {
+        merged.push(cur);
         cur = next;
       }
     }
+    merged.push(cur);
+    const newLines = [];
+    let prev = 0;
+    for (const [s, e] of merged) {
+      if (s > prev + eps) {
+        const newLine = new LineSegment(target.pointAt(prev), target.pointAt(s));
+        if (newLine.length() > 1e-4) {
+          newLines.push(newLine);
+          callBack?.(newLine, target);
+        }
+      }
+      prev = Math.max(prev, e);
+    }
+    if (prev < 1 - eps) {
+      const newLine = new LineSegment(target.pointAt(prev), target.pointAt(1));
+      if (newLine.length() > 1e-4) {
+        newLines.push(newLine);
+        callBack?.(newLine, target);
+      }
+    }
+    return newLines;
   }
   static constrainLine(line, base) {
     const center = line.center, width = line.length();
@@ -3048,7 +3079,7 @@ class WallInsertObject {
     if (key === "passageEntrance") {
       if (type === "door") return 0.3;
     }
-    return 0;
+    return 0.05;
   }
   getMinWidth(key, type) {
     return WallInsertObject.getMinWidth(key, type);
@@ -6724,8 +6755,6 @@ class DoubleWallHelper {
       quadtree
     };
   }
-  static appendLine() {
-  }
   /** 补双线墙壁
    * @param lines 
    * @param wallWidth 
@@ -6740,7 +6769,7 @@ class DoubleWallHelper {
       }
       return true;
     });
-    let { resultList, quadtree } = this.findDoubleLine(lines, wallWidth), otherQuadtree = createQuadtree(otherLines), removeLines = /* @__PURE__ */ new Set(), clipingMap = /* @__PURE__ */ new Map(), appendLines = [];
+    let { resultList, quadtree } = this.findDoubleLine(lines, wallWidth), removeLines = /* @__PURE__ */ new Set(), clipingMap = /* @__PURE__ */ new Map(), appendLines = [];
     function addClipingMap(line, line1) {
       if (!clipingMap.has(line)) clipingMap.set(line, []);
       const startProj = line.projectPoint(line1.start);
@@ -6758,6 +6787,8 @@ class DoubleWallHelper {
       }
       const newLine1 = new LineSegment(project0.start.clone(), project1.start.clone());
       const newLine2 = new LineSegment(project0.end.clone(), project1.end.clone());
+      newLine1.userData.height = line0.userData.height;
+      newLine2.userData.height = line1.userData.height;
       appendLines.push(newLine1, newLine2);
       addClipingMap(line0, project0);
       addClipingMap(line1, project1);
@@ -6770,33 +6801,22 @@ class DoubleWallHelper {
     quadtree.clear();
     quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
     lines.forEach((line) => line.userData.isDoor || quadtree.insert(line));
-    appendLines = LineSegment.mergeCollinearSegments(appendLines, mergeLineUserData);
-    appendLines = appendLines.filter((line) => line.length() !== 0).filter((line) => otherQuadtree.queryPoint(line.center).length === 0).map((line) => {
-      const list = quadtree.queryLineSegment(line).filter((item) => {
-        if (!item.line.isParallelTo(line)) return false;
-        if (item.line.projectLineSegment(line).length() === 0) return false;
-        return true;
-      }).map((item) => item.line);
-      if (list.length === 0) {
-        quadtree.insert(line);
-        return line;
-      }
-      const newLine = LineSegment.mergeLines(...list, line);
-      list.forEach((line2) => {
-        mergeLineUserData(newLine, line2);
-        quadtree.remove(line2);
-        removeLines.add(line2);
-      });
-      quadtree.insert(newLine);
-      return newLine;
+    appendLines = lineSegmentClipping(appendLines, 1e-9);
+    appendLines.flatMap((line) => {
+      const queryLines = quadtree.queryLineSegment(line).filter((item) => item.line.isParallelTo(line)).map((item) => item.line);
+      if (queryLines.length) {
+        const newLines = LineSegment.clippingByLines(line, queryLines);
+        if (newLines) return newLines.forEach((line2) => {
+          quadtree.insert(line2);
+          lines.push(line2);
+        });
+      }
+      quadtree.insert(line);
+      lines.push(line);
     });
-    appendLines = appendLines.filter((line) => !removeLines.has(line));
-    lines = lines.filter((line) => !removeLines.has(line));
-    lines.push(...appendLines);
     lines = lineSegmentClipping(lines, 1e-9);
     quadtree.clear();
     lines.push(...otherLines);
-    Point.adsorb(lines.flatMap((line) => line.points), 1e-4);
     return lines.filter((line) => line.length() > 1e-9);
   }
   /**
@@ -8277,67 +8297,6 @@ class DxfDataPlugin extends Pipeline {
     DxfDataPlugin.initData(cad, this.lines);
   }
 }
-class LineQueryer {
-  pointVirtualGrid;
-  quadtree;
-  constructor(lines) {
-    this.pointVirtualGrid = createPointVirtualGrid(lines);
-    this.quadtree = createQuadtree(lines);
-  }
-  update(lines) {
-    this.clear();
-    this.pointVirtualGrid = createPointVirtualGrid(lines);
-    this.quadtree = createQuadtree(lines);
-  }
-  clear() {
-    this.pointVirtualGrid.clear();
-    this.quadtree.clear();
-  }
-  /** 
-   * @param point 
-   * @param radius 
-   * @param opt 
-   * @returns 
-   */
-  queryNearestPoint(point2, opt) {
-    if (!point2) throw new Error("请传入查询点");
-    const { resultIndex = 0, radius = 0.4, condition } = opt ?? {};
-    const results = this.pointVirtualGrid.queryCircle(point2, radius).filter((item) => item.point !== point2).filter((item) => condition ? condition(item) : true);
-    results.sort((a2, b4) => a2.point.distance(point2, true) - b4.point.distance(point2, true));
-    if (results.length > resultIndex) return {
-      point: results[resultIndex].point,
-      line: results[resultIndex].userData
-    };
-    return null;
-  }
-  /** 
-   * @param point 
-   * @param radius 
-   * @param opt 
-   * @returns 
-   */
-  queryNearestLine(point2, opt) {
-    if (!point2) throw new Error("请传入查询点");
-    const { resultIndex = 0, radius = 0.4, condition } = opt ?? {};
-    const results = this.quadtree.queryCircle(point2, radius).map((item) => {
-      const projPoint = item.line.projectPoint(point2, false);
-      if (projPoint && (!condition || condition(item, projPoint))) {
-        if (projPoint) return {
-          ...item,
-          distance: projPoint.distance(point2) ?? Infinity,
-          projPoint
-        };
-      }
-      return null;
-    }).filter((i) => !!i);
-    results.sort((a2, b4) => a2.distance - b4.distance);
-    if (results.length > resultIndex) return {
-      point: results[resultIndex].projPoint,
-      line: results[resultIndex].line
-    };
-    return null;
-  }
-}
 function parallel(line, baseline) {
   const currentAngle = Math.atan2(line.end.y - line.start.y, line.end.x - line.start.x);
   const targetAngle = Math.atan2(baseline.end.y - baseline.start.y, baseline.end.x - baseline.start.x);
@@ -8508,66 +8467,6 @@ function preprocessing(lines) {
   quadtree.clear();
   return lines;
 }
-function adsorption(lines, option) {
-  const { snapThreshold: threshold = 0.2 } = option ?? {}, lineQueryer = new LineQueryer(lines), modifyManager = LineSegment.createModifyManager();
-  function adsorptLine(point2, line) {
-    const otherPoint = line.getAnotherPoint(point2);
-    const direct = otherPoint.directionFrom(point2);
-    const len = line.length();
-    const result = lineQueryer.queryNearestLine(point2, {
-      radius: threshold,
-      condition: (node, projPoint) => {
-        if (line !== node.line && node.line.isPerpendicularTo(line, 35)) {
-          if (projPoint.distance(point2) < len) return true;
-          const direct2 = projPoint.directionFrom(point2);
-          return direct2.angleBetween(direct) > Math.PI * 0.5;
-        }
-        return false;
-      }
-    });
-    if (result) return modifyManager.setPoint(line, point2, result.point.clone());
-  }
-  function adsorptPoint(point2, line) {
-    const result = lineQueryer.queryNearestPoint(point2, {
-      radius: threshold,
-      condition(node) {
-        const line2 = node.userData;
-        return line2.isPerpendicularTo(line, 15);
-      }
-    });
-    if (result) {
-      const propPoint = result.line.projectPoint(point2, false);
-      if (propPoint) {
-        modifyManager.setPoint(line, point2, propPoint);
-        modifyManager.setPoint(result.line, result.point, propPoint);
-      }
-    }
-  }
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    line.points.map((point2) => {
-      let results = lineQueryer.pointVirtualGrid.queryPoint(point2, true);
-      if (results.length === 0 && lineQueryer.quadtree.queryCircle(point2, 1e-4).length < 2) adsorptLine(point2, line);
-    });
-  }
-  modifyManager.modify();
-  lines = lines.filter((line) => line.length() > 1e-9);
-  const dpls = [...findDiscretePointLine2(lines)];
-  lineQueryer.update(lines);
-  for (let i = 0; i < dpls.length; i++) {
-    const line = dpls[i];
-    line.points.map((point2) => {
-      let results = lineQueryer.pointVirtualGrid.queryPoint(point2, true);
-      if (results.length === 0 && lineQueryer.quadtree.queryCircle(point2, 1e-4).length < 2) {
-        adsorptPoint(point2, line);
-      }
-    });
-  }
-  modifyManager.modify();
-  lineQueryer.clear();
-  Point.adsorb(lines.flatMap((line) => line.points), 1e-4, "first");
-  return lines;
-}
 function removeShortLine(lines, len = 0.01) {
   let defaultLines = [], doorLines = [];
   for (let i = 0; i < lines.length; i++) {
@@ -8606,9 +8505,9 @@ function breakpointMerging(lines) {
 function axisAlignCorr$1(lines, targettLine, option) {
   lines = lines.map((line) => line.clone());
   lines = breakpointMerging(lines);
+  lines = lineSegmentClipping(lines, 1e-9);
   lines = preprocessing(lines);
   lines = AxisAlignCorr.start(lines, targettLine);
-  lines = adsorption(lines, option);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = removeShortLine(lines, 0.15);
   let newLines = lines.filter((line) => !line.userData.isDoor);
@@ -8625,6 +8524,7 @@ function axisAlignCorr$1(lines, targettLine, option) {
   newLines.push(...doorLines);
   Point.adsorb(newLines.flatMap((line) => line.points), 1e-4);
   lines = removeShortLine(lines, 0.05);
+  lines = breakpointMerging(lines);
   return newLines;
 }
 class BoundExt {
@@ -18678,10 +18578,11 @@ class SceneAutoGenerat {
     return geometry;
   }
   getDoorAll(lines) {
-    return lines.filter((line) => line.userData.isDoor || WallInsertObject.isDoor(line));
+    return lines.filter((line) => line.userData.isDoor || line.userData.isPassageEntrance);
   }
   buildPlane(lines) {
-    lines = lineSegmentClipping(lines, 0);
+    lines = lineSegmentClipping(lines.map((line) => line.clone()), 0);
+    Point.adsorb(lines.flatMap((line) => line.points), 1e-4);
     LineSegment.groupByPath(lines).forEach((group, i) => {
       const removeSet = findDiscretePointLine2(group, null, true);
       let lines2 = group.filter((line) => !removeSet.has(line) && !line.userData.isBayWindow);
@@ -19144,9 +19045,7 @@ function doubleWallAlignment(lines) {
   lines = [singleWall, newDoubleWalls].flat(10);
   lines = LineSegmentUndirectedGraph.breakpointMerging(lines, mergeLineUserData);
   lines = lineSegmentClipping(lines, 1e-9);
-  TEST = true;
   lines = buildDoubleWallGroup(lines);
-  TEST = false;
   lines.push(...doorLines);
   WallInsertObject.recomputed(lines);
   return lines;

package/src/utils/DxfSystem/utils/drawHandle/SceneAutoGenerat.d.ts

@@ -12,7 +12,7 @@ export declare class SceneAutoGenerat {
     constructor(lines: LineSegment[], itemList: any[], z: number, trajectory?: any);
     init(): Promise<void>;
     private createGeometryByLines;
-    getDoorAll(lines: LineSegment[]): LineSegment<Record<string, any>>[];
+    getDoorAll(lines: LineSegment<LineUserData>[]): LineSegment<LineUserData>[];
     buildPlane(lines: LineSegment<LineUserData>[]): void;
     wallGroup: Group | null;
     /** 构建墙壁

package/src/utils/DxfSystem/utils/lineHandle/DoubleWallHelper.d.ts

@@ -29,7 +29,6 @@ export declare class DoubleWallHelper {
         walls: LineSegment<LineUserData>[];
         quadtree: Quadtree<number>;
     };
-    private static appendLine;
     /** 补双线墙壁
      * @param lines
      * @param wallWidth

package/src/utils/DxfSystem/utils/tools/WallInsertObject.d.ts

@@ -41,8 +41,8 @@ export declare class WallInsertObject {
      * @param line
      * @returns
      */
-    static getMinWidth(key: InsertObjectKey, type?: 'door'): 0 | 0.3;
-    getMinWidth(key: InsertObjectKey, type?: 'door'): 0 | 0.3;
+    static getMinWidth(key: InsertObjectKey, type?: 'door'): 0.3 | 0.05;
+    getMinWidth(key: InsertObjectKey, type?: 'door'): 0.3 | 0.05;
     static clear(target: LineSegment, key: InsertObjectKey): void;
     /**
      * 重新计算

package/src/utils/algorithmsStructures/LineSegment.d.ts

@@ -103,6 +103,12 @@ export declare class LineSegment<T = Record<string, any>> {
      * 获取发向量
      */
     normal(): Point<Record<string, any>>;
+    /**
+     * @param line
+     * @param t
+     * @returns
+     */
+    pointAt(t: number): Point<Record<string, any>>;
     /** 膨胀为矩形
      *
      * @param width
@@ -295,8 +301,14 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param target
      * @param clippingLine
      */
-    static clippingByLine(target: LineSegment, clippingLine: LineSegment, callBack?: (newLine: LineSegment, line: LineSegment) => void): LineSegment<Record<string, any>>[];
-    static clippingByLines(target: LineSegment, clippingLines: LineSegment[], callBack?: (newLine: LineSegment, line: LineSegment) => void): void;
+    static clippingByLine(target: LineSegment, clippingLine: LineSegment, callBack?: (newLine: LineSegment, line: LineSegment) => void): LineSegment<Record<string, any>>[] | undefined;
+    /** 通过线段组裁剪线段
+     * @param target
+     * @param clippingLines
+     * @param callBack
+     * @returns
+     */
+    static clippingByLines(target: LineSegment, clippingLines: LineSegment[], callBack?: (newLine: LineSegment, line: LineSegment) => void): LineSegment<Record<string, any>>[] | undefined;
     static constrainLine(line: LineSegment, base: LineSegment): LineSegment<Record<string, any>>;
     /** 创建线段修改管理器
      * @returns

package/src/build copy.d.ts

@@ -1,93 +0,0 @@
-import { DxfSystem } from './utils/DxfSystem';
-import { LineUserData, OriginalDataItem, SetDataOption } from './utils/DxfSystem/type';
-import { WhiteModel } from './utils/DxfSystem/plugin/ModelDataPlugin/components/WhiteModel';
-import { LineSegment } from './utils';
-import * as THREE from "three";
-export { Dxf } from './utils/DxfSystem/components/Dxf';
-export * from './utils/DxfSystem/DxfSystem';
-export * as ModelDataPlugin from './utils/DxfSystem/plugin/ModelDataPlugin';
-export * as utils from './utils';
-/** 快捷创建编辑器
- * @param dom
- * @param camera
- * @returns
- */
-export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera, orbitControls?: boolean, viewPermission?: 'admin'): Promise<{
-    dxfSystem: DxfSystem;
-    getFileAll: () => Promise<{
-        dxf: File;
-        obj: File;
-        glb: File;
-        gltf: File;
-        json: File;
-        jpg: File;
-        correctionDxf: File;
-    }>;
-}>;
-/**
- * @param originData
- * @param trajectory
- * @deprecated 已废弃，请勿使用
- */
-export declare function getModels(originData: OriginalDataItem[], trajectory: any, itemList: any): Promise<{
-    glb: File;
-    gltf: File;
-}>;
-type HandleJsonOption = {
-    /** json数据或路径 */
-    json: string | OriginalDataItem[];
-    trajectory?: string | Record<string, any>;
-    itemInfo?: string | Record<string, any>;
-    axisAlignCorr?: boolean;
-    axisAlignCorrOption?: SetDataOption;
-    doorFind?: boolean;
-    download?: {
-        json?: string;
-        dxf?: string;
-        image?: string;
-        correctionJson?: string;
-        correctionDxf?: string;
-        correctionImage?: string;
-        gltf?: string;
-        glb?: string;
-        obj?: string;
-    };
-};
-/** 快捷构建需要的json文件
- * @param opt
- * @returns
- */
-export declare function buildJson(opt: HandleJsonOption): Promise<{
-    dxfSystem: DxfSystem;
-    threeVJia: import('./utils').Component<{}> | null;
-    whiteModel: WhiteModel | null;
-}>;
-/** 获取所有文件数据
- * @param dxfSystem
- */
-export declare function getFileAll(dxfSystem?: DxfSystem): Promise<{
-    dxf: File;
-    obj: File;
-    glb: File;
-    gltf: File;
-    json: File;
-    jpg: File;
-    correctionDxf: File;
-}>;
-/** 获取全局DxfSystem
- * @returns
- */
-export declare function getGlobalDxfSystem(): DxfSystem | null;
-/** 检测原始数据线段一侧是否属于环
- * @param lineData
- * @param startIndex
- * @param direction
- * @returns
- */
-export declare function hasCircle(lineData: OriginalDataItem[], startIndex: number, direction: any): {
-    readonly originalIndices: number[];
-    readonly indices: number[];
-    circle: LineSegment<Record<string, any>>[];
-    originalLines: LineSegment<LineUserData>[];
-    lines: LineSegment<Record<string, any>>[];
-} | null;