build-dxf 0.1.103 → 0.1.104

package/package.json

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

package/src/build.js

@@ -413,6 +413,7 @@ class LineSegment {
   get center() {
     return this.#center.clone();
   }
+  #direction = Point.zero();
   constructor(p1, p2) {
     this.set(p1 ?? this.start, p2 ?? this.end);
     this.start.currentData[LineSegment.LINE_SYMBOL] = this;
@@ -426,6 +427,7 @@ class LineSegment {
         this.points[0].x + (this.points[1].x - this.points[0].x) * 0.5,
         this.points[0].y + (this.points[1].y - this.points[0].y) * 0.5
       );
+      this.#direction = this.points[1].directionFrom(this.points[0]);
     };
     this.points.forEach((p2) => fields.forEach((k) => {
       let value = p2[k];
@@ -447,6 +449,13 @@ class LineSegment {
     this.end.copy(p2);
     return this;
   }
+  setLength(len) {
+    const direct = this.direction();
+    const start = this.#center.clone().add(direct.clone().multiplyScalar(len * 0.5));
+    const end = this.#center.clone().add(direct.clone().multiplyScalar(-len * 0.5));
+    this.set(start, end);
+    return this;
+  }
   /** 获取另一个点
    * @param point 
    * @returns 
@@ -591,7 +600,7 @@ class LineSegment {
    * @returns 
    */
   direction() {
-    return this.points[1].directionFrom(this.points[0]);
+    return this.#direction.clone();
   }
   /**
    * 获取发向量
@@ -1877,6 +1886,9 @@ class PointSpatialHash {
     });
     return list;
   }
+  queryPoints(points, excludeOneself = false) {
+    return points.flatMap((p2) => this.queryPoint(p2, excludeOneself));
+  }
   /** 获取多边形内的点
    * @param polygon 
    */
@@ -2356,6 +2368,24 @@ class WallInsertObject {
     }
     return false;
   }
+  /** 是否配对
+   * @param lines 
+   */
+  static isPairing(lines) {
+    const set2 = /* @__PURE__ */ new Set();
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const passageEntrance = line.userData.passageEntrance ?? [];
+      for (let i2 = 0; i2 < passageEntrance.length; i2++) {
+        const item = passageEntrance[i2];
+        const id = this.getId(item);
+        const nearId = this.getNearId(item);
+        if (typeof item.nearId !== "number" || typeof id !== "number") continue;
+        if (set2.has(nearId)) return true;
+        set2.add(id);
+      }
+    }
+  }
   /** 获取孔洞 id
    * @param item
    * @returns 
@@ -2477,13 +2507,19 @@ class WallInsertObject {
       this.forEachInsertObjectData(line, (data, key) => {
         data.forEach((w) => {
           try {
+            const center = Point.from(w.p);
+            const windowLine = line.projectLineSegment(wallInsertObjectToLine(line, w));
+            if (windowLine.len / w.width < 0.4 && !windowLine.containsPoint(center)) {
+              w.width = 0;
+              return;
+            }
             if (w.full) {
-              const center = line.center;
-              w.p = { x: center?.x ?? 0, y: center?.y ?? 0, z: w.p.z };
+              const center2 = line.center;
+              w.p = { x: center2?.x ?? 0, y: center2?.y ?? 0, z: w.p.z };
               w.width = line.length();
               return;
             }
-            const windowLine = line.projectLineSegment(wallInsertObjectToLine(line, w)), windowCenter = windowLine.center;
+            let windowCenter = windowLine.center;
             w.p = { x: windowCenter.x ?? 0, y: windowCenter.y ?? 0, z: w.p.z };
             w.width = windowLine.length();
           } catch (error) {
@@ -3330,15 +3366,14 @@ class LineSegmentUtils {
    * @param lines 
    * @returns 
    */
-  static deduplication(lines, eps = 1e-3) {
+  static deduplication(lines, eps = 4) {
     const seen = /* @__PURE__ */ new Set();
     const result = [];
-    const snap = (v2) => Math.round(v2 / eps);
     for (const line of lines) {
       const p1 = line.start;
       const p2 = line.end;
-      const key1 = `${snap(p1.x)}_${snap(p1.y)}`;
-      const key2 = `${snap(p2.x)}_${snap(p2.y)}`;
+      const key1 = `${p1.x.toFixed(eps)}_${p1.y.toFixed(eps)}`;
+      const key2 = `${p2.x.toFixed(eps)}_${p2.y.toFixed(eps)}`;
       const key = key1 < key2 ? `${key1}_${key2}` : `${key2}_${key1}`;
       if (!seen.has(key)) {
         seen.add(key);
@@ -3484,9 +3519,10 @@ class LineSegmentUtils {
     );
     const lines = [...lineSegments].sort((a2, b4) => b4.length() - a2.length()).slice(0, 20);
     const angles = lines.map((line2) => {
-      let angle = parseInt(yAxisLine.includedAngle(line2) + "");
+      let angle = yAxisLine.angle(line2, { unit: "degree", range: "180" });
       if (angle > 90) angle = 180 - angle;
-      return angle;
+      let key = Math.round(angle / bin) * bin;
+      return key;
     });
     const lineMap = /* @__PURE__ */ new Map();
     angles.forEach((angle, index2) => {
@@ -6288,6 +6324,7 @@ function mergeLineUserData(newLine, line2) {
     line2 = [...line2].sort((a2, b4) => a2.length(true) - b4.length(true));
     return line2.forEach((l) => mergeLineUserData(newLine, l));
   }
+  if (line2.userData.isBayWindow === false) delete line2.userData.isBayWindow;
   if (line2.userData.isPassageEntrance === false) delete line2.userData.isPassageEntrance;
   if (newLine.userData.isPassageEntrance === false) delete newLine.userData.isPassageEntrance;
   const { drawWindow, passageEntrance, ...opt } = line2.userData;
@@ -7521,37 +7558,6 @@ class BayWindowHelper {
     return winGroup;
   }
 }
-function getDoorAll(lines) {
-  return lines.filter((line) => line.userData.isDoor || WallInsertObject.isDoor(line));
-}
-function findRooms(lines) {
-  lines = lines.map((line) => line.clone());
-  lines = lineSegmentClipping(lines, 0);
-  const rooms = [];
-  LineSegmentUtils.groupByPath(lines).forEach((group) => {
-    const removeSet = findDiscretePointLine2(group, null, true);
-    lines = group.filter((line) => !removeSet.has(line) && !line.userData.isBayWindow);
-    const doors = getDoorAll(lines), maxiCircles2 = new MaxiCircles();
-    let { circles } = maxiCircles2.miniCircle(lines, { circleEdges: doors, side: Side.IN });
-    circles = circles.filter((circle) => !LineGroupType.isGroup(circle));
-    const ploys = circles.map(((p2) => Polygon.fromByLinePath(p2)));
-    ploys.forEach((ploy, i) => {
-      const xList = [];
-      const yList = [];
-      ploy.forEach((p2) => {
-        xList.push(p2.x);
-        yList.push(p2.y);
-      });
-      const minX = Math.min(...xList), maxX = Math.max(...xList), minY = Math.min(...yList), maxY = Math.max(...yList), center = new Point((maxX - minX) * 0.5 + minX, (maxY - minY) * 0.5 + minY);
-      rooms.push({
-        lines: circles[i],
-        ploy,
-        center
-      });
-    });
-  });
-  return rooms;
-}
 const holeTypeMap = {
   door: "DOOR",
   RAILING: "RAILING",
@@ -7646,6 +7652,7 @@ class ThreeVJiaJson extends Pipeline {
     const info = BayWindowHelper.computedInfo(lines);
     if (info) {
       const { dottedLine, windowLine, depth, side } = info, line = new LineSegment(dottedLine.start.clone(), dottedLine.end.clone()), win = windowLine?.userData.drawWindow && windowLine.userData.drawWindow[0];
+      if (side === "LEFT") line.swapValue();
       line.userData = {
         groundClearance: win?.groundClearance ?? 0,
         height: win?.height,
@@ -7691,6 +7698,7 @@ class ThreeVJiaJson extends Pipeline {
         type,
         start: line.start.toJson2D(),
         end: line.end.toJson2D(),
+        depth: line.userData.depth,
         height: line.userData?.height ?? DEFAULT_DOOR_HEIGHT,
         sillHeight: line.userData?.groundClearance ?? DOOR_GROUND_CLEARANCE_HEIGHT,
         groundClearance: line.userData?.groundClearance ?? DOOR_GROUND_CLEARANCE_HEIGHT
@@ -7716,7 +7724,12 @@ class ThreeVJiaJson extends Pipeline {
       pillars: [],
       beams: [],
       holes: [],
-      rooms: []
+      rooms: [],
+      center: {
+        x: 0,
+        y: 0
+      },
+      angle: 0
     };
     const cache = {
       wallLines: []
@@ -7735,17 +7748,26 @@ class ThreeVJiaJson extends Pipeline {
         height: line.currentData[WALL_HEIGHT_KEY] ?? this.maxHeight
       });
     });
-    const rooms = findRooms(this.lines);
+    return option;
+  }
+  /** 添加房间
+   * @param option 
+   * @param rooms 
+   */
+  static appendRooms(option, rooms) {
     option.rooms = rooms.map((room, i) => ({
       name: `房间（${i + 1}）`,
-      position: room.center.toJson(),
+      position: room.center.clone().rotate(option.center, option.angle).toJson(),
       roomTypeId: 17
     }));
-    return option;
+  }
+  static fillPlaceHolders() {
   }
 }
 function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
+  let centerVec2 = null;
   lineSegments = LineSegmentUndirectedGraph.rotate(lineSegments.map((line) => line.clone()), angle, (line, center, angle2) => {
+    if (!centerVec2) centerVec2 = { x: center.x, y: center.y };
     WallInsertObject.forEachInsertObjectData(line, (data) => {
       data.forEach((item) => {
         const point2 = Point.from(item.p);
@@ -7758,7 +7780,11 @@ function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
   lineSegments.forEach((line) => {
     if (line.userData.isDoor) heights.push(line.userData.height ?? 0);
     WallInsertObject.forEachInsertObjectData(line, (data) => {
-      data.forEach((item) => heights.push(item.height ?? 0));
+      heights.push(line.userData.height ?? 0);
+      data.forEach((item) => {
+        const h = (item.height ?? 0) + (item.groundClearance ?? 0);
+        heights.push(h);
+      });
     });
   });
   if (heights.length === 0) heights.push(DEFAULT_WALL_HEIGHT);
@@ -7771,12 +7797,12 @@ function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
       const json = threeVJiaJson.transform();
       json.name = name;
       json.communityName = communityName;
+      json.angle = angle;
+      json.center = centerVec2;
       return json;
     }
   };
 }
-function fillPlaceHolders(option, items) {
-}
 function createPointSpatialHash(lines) {
   const grid = new PointSpatialHash();
   for (const seg of lines) {
@@ -7877,7 +7903,6 @@ const tools = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   WallGroupManager,
   createPointSpatialHash,
   createQuadtree,
-  fillPlaceHolders,
   getLineIndexByCenter,
   lineDataToOriginalData,
   lineDataToThreeVJiaJson,
@@ -8799,7 +8824,7 @@ function sortByAxis(lines, axis) {
   });
   return lines;
 }
-function layoutDesign(lines, axis, intersectPoints) {
+function layoutDesign(lines, axis, intersectPoints, opt) {
   let blocks = lines.map((line, index2) => {
     const sv = axis.projectPointValue(line.start), ev = axis.projectPointValue(line.end), range = sv < ev ? [sv, ev] : [ev, sv];
     return { range, index: index2, rangeSize: range[1] - range[0] };
@@ -8845,7 +8870,7 @@ function layoutDesign(lines, axis, intersectPoints) {
     const nextLine = newLines[i + 1];
     nextLine.start.copy(line.start);
     line.currentData[DELETE_SYMBOL] = true;
-    mergeLineUserData(nextLine, line);
+    opt.onMergeLine && opt.onMergeLine(nextLine, line);
   }
   lines.length = 0;
   lines.push(...newLines);
@@ -8860,6 +8885,8 @@ class AlignToParallelSegments {
    * @param gap 平行轴投影区间间隙
    */
   static group(lines, parallelAxis, verticalAxis, esp = 0.05, gap = 0.01) {
+    esp = esp / verticalAxis.len;
+    gap = gap / parallelAxis.len;
     const vls = lines.map((line) => [
       verticalAxis.projectPointValue(line.start),
       line,
@@ -8881,24 +8908,24 @@ class AlignToParallelSegments {
    * @param groups 
    * @param verticalLines 
    */
-  static fittingAlignment(groups, verticalLines) {
+  static fittingAlignment(groups, verticalLines, opt = {}) {
     const grid = PointSpatialHash.fromByLines(verticalLines);
     for (let i = 0; i < groups.length; i++) {
       const group = groups[i];
       if (group.length <= 1) continue;
-      const axisLine = fitting(group);
-      const points = [];
+      const axisLine = fitting(group), intersectList = [];
       for (let j = 0; j < group.length; j++) {
         const line = group[j];
         line.points.forEach((p2) => {
-          const intersectPoints = grid.queryCircle(p2, 1e-4).map((result) => result.point);
+          const intersects = grid.queryCircle(p2, 1e-4);
           const pv = axisLine.projectPointValue(p2);
           axisLine.pointAt(pv, p2);
-          intersectPoints.forEach((point2) => point2.copy(p2));
-          points.push(...intersectPoints);
+          intersects.forEach(({ point: point2 }) => point2.copy(p2));
+          intersectList.push(...intersects);
         });
       }
-      layoutDesign(group, axisLine, points);
+      const intersectPoints = intersectList.filter((item) => item.userData.len > 1e-5).map((item) => item.point);
+      layoutDesign(group, axisLine, intersectPoints, opt);
     }
     return groups.flat().filter((line) => {
       if (line.length() < 1e-9) return false;
@@ -8913,14 +8940,15 @@ class AlignToParallelSegments {
    * @param lines 
    * @returns 
    */
-  static align(lines, esp = 0.05, gap = 0.05) {
-    const axisLine = lines.find((line) => line.length() > 0.4), axisLineV = axisLine.clone().rotate(Math.PI * 0.5, axisLine.center);
+  static align(lines, opt = {}) {
+    const { esp = 0.06, gap = 0.05 } = opt;
+    const axisLine = lines[LineSegmentUtils.maxLengthLineIndex(lines)].clone().setLength(100), axisLineV = axisLine.clone().rotate(Math.PI * 0.5, axisLine.center);
     let [pllLines, verticalLines] = LineSegmentUtils.groupByParallelToAxis(lines, axisLine);
     const groups = this.group(pllLines, axisLine, axisLineV, esp, gap);
-    pllLines = this.fittingAlignment(groups, verticalLines);
+    pllLines = this.fittingAlignment(groups, verticalLines, opt);
     verticalLines = verticalLines.filter((line) => line.length() > 1e-6);
     const groups2 = this.group(verticalLines, axisLineV, axisLine, esp, gap);
-    verticalLines = this.fittingAlignment(groups2, pllLines);
+    verticalLines = this.fittingAlignment(groups2, pllLines, opt);
     pllLines = pllLines.filter((line) => line.length() > 1e-6);
     return [
       ...pllLines,
@@ -9054,8 +9082,9 @@ function correction(lines, targettLine, option) {
   lines = preprocessing(lines);
   lines = AxisAlignCorr.start(lines, targettLine);
   lines = lineSegmentClipping(lines, 1e-9);
-  lines = AlignToParallelSegments.align(lines);
-  new WallInsertObject(lines).recomputed().merge();
+  lines = AlignToParallelSegments.align(lines, {
+    onMergeLine: mergeLineUserData
+  });
   lines = adsorption(lines, option);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = removeDangline(lines, 0.1, false);
@@ -9512,10 +9541,9 @@ function doubleWallAlignment(lines) {
         let newLine = new LineSegment().set(point2, newPoint);
         allGrid.insert(newLine.start, newLine).insert(newLine.end, newLine);
         point2.copy(newPoint);
-        return [newLine];
+        return newLine;
       }
       point2.copy(newPoint);
-      return [];
     };
     const newLines = expLines.flatMap((line) => {
       const normal = line.normal(), id = LineGroupType.getIdByType(line, "doubleWall");
@@ -9524,7 +9552,8 @@ function doubleWallAlignment(lines) {
       const old_line = line.clone();
       line.points.forEach((p2) => {
         const newPoint = p2.clone().add(step);
-        newLines2.push(...movePoint(p2, newPoint, old_line));
+        let newLine = movePoint(p2, newPoint, old_line);
+        newLine && newLines2.push(newLine);
       });
       allGrid.update(line.start);
       allGrid.update(line.end);
@@ -11891,6 +11920,7 @@ class CorrectionDxf extends Dxf {
       this.originalData = data;
       this.lineSegments = LinePipeline.builtin.WallHeightHandle(this.lineSegments, options);
     }
+    this.options = options;
     const zList = [];
     data.forEach(({ start, end }) => zList.push(start.z ?? 0, end.z ?? 0));
     this.originalZAverage = zList.reduce((count, num) => count + num, 0) / zList.length;
@@ -11945,17 +11975,63 @@ class CorrectionDxf extends Dxf {
     return this.rotateCorrCad?.downloadDxf(filename, unit);
   }
 }
+function roomTest(trajectory2) {
+  return (lines) => {
+    const doubleLines = lines.filter((line) => WIO.isDouble(line));
+    if (WIO.isPairing(doubleLines)) {
+      return false;
+    }
+    const ply = Polygon.fromByLinePath(lines);
+    if (trajectory2) {
+      let has = Object.keys(trajectory2).some((k) => {
+        const p2 = trajectory2[k];
+        if (ply.pointWithin(p2)) return true;
+        return false;
+      });
+      if (!has) return false;
+    }
+    return true;
+  };
+}
+function findRooms(lines, trajectory2) {
+  lines = lines.map((line) => line.clone());
+  lines = lineSegmentClipping(lines, 0);
+  const rooms = [];
+  const maxiCircles2 = new MaxiCircles();
+  LineSegmentUtils.groupByPath(lines).forEach((group) => {
+    const removeSet = findDiscretePointLine2(group, null, true);
+    lines = group.filter((line) => !removeSet.has(line) && !line.userData.isBayWindow);
+    const circles = maxiCircles2.miniCircle(lines).circles.filter(roomTest(trajectory2));
+    const ploys = circles.map(((p2) => Polygon.fromByLinePath(p2)));
+    ploys.forEach((ploy, i) => {
+      const xList = [];
+      const yList = [];
+      ploy.forEach((p2) => {
+        xList.push(p2.x);
+        yList.push(p2.y);
+      });
+      const minX = Math.min(...xList), maxX = Math.max(...xList), minY = Math.min(...yList), maxY = Math.max(...yList), center = new Point((maxX - minX) * 0.5 + minX, (maxY - minY) * 0.5 + minY);
+      rooms.push({
+        lines: circles[i],
+        ploy,
+        center
+      });
+    });
+  });
+  return rooms;
+}
 class ThreeVJia extends Component {
   static name = "ThreeVJia";
   lineSegments = [];
   neededUpdate = true;
+  trajectory;
   /**
    */
   onAddFromParent() {
     const angleCorrectionDxf = this.parent?.findComponentByName("CorrectionDxf");
     angleCorrectionDxf.addEventListener("cadChange", async () => {
       this.neededUpdate = true;
-      console.log(this.toJson());
+      this.trajectory = angleCorrectionDxf.options.trajectory;
     });
   }
   cacheJson;
@@ -11963,8 +12039,9 @@ class ThreeVJia extends Component {
    */
   updateData() {
     if (!this.neededUpdate) return;
-    const angleCorrectionDxf = this.parent?.findComponentByName("CorrectionDxf");
+    const angleCorrectionDxf = this.parent?.findComponentByName("CorrectionDxf"), dxf = this.parent?.findComponentByName("Dxf"), rooms = findRooms(dxf.getLineSegments(), this.trajectory);
     this.cacheJson = lineDataToThreeVJiaJson(angleCorrectionDxf.getLineSegments(), angleCorrectionDxf.angle).toJson();
+    ThreeVJiaJson.appendRooms(this.cacheJson, rooms);
     this.neededUpdate = false;
   }
   /** 转为json
@@ -22101,7 +22178,6 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   clippingInsertObjectDoubleWall,
   clippingLineUserData,
   components,
-  fillPlaceHolders,
   findDiscretePoint,
   findDiscretePoint2,
   findDiscretePointLine,

package/src/dxfSystem/components/ThreeVJia.d.ts

@@ -11,6 +11,7 @@ export declare class ThreeVJia extends Component<{
     static name: string;
     lineSegments: LineSegment<LineUserData>[];
     neededUpdate: boolean;
+    trajectory?: Record<string, any> | undefined;
     /**
      */
     onAddFromParent(): void;

package/src/dxfSystem/utils/WallInsertObject.d.ts

@@ -2,7 +2,7 @@ import { LineSegment } from '../../utils/algorithms/LineSegment';
 import { InsertObject, LineUserData } from '../type';
 type InsertObjectKey = 'drawWindow' | 'passageEntrance';
 /**
- * 墙体嵌入物（窗户、空洞）处理
+ * 墙体嵌入物（窗户、空洞）处理对象
  */
 export declare class WallInsertObject {
     static mountedObjectType: never[];
@@ -29,6 +29,10 @@ export declare class WallInsertObject {
      * @returns
      */
     static isDouble(line: LineSegment<LineUserData>): boolean;
+    /** 是否配对
+     * @param lines
+     */
+    static isPairing(lines: LineSegment<LineUserData>[]): true | undefined;
     /** 获取孔洞 id
      * @param item
      * @returns

package/src/dxfSystem/utils/findRooms.d.ts

@@ -10,4 +10,4 @@ export interface IRoom {
 /** 查找房间
  * @param lines
  */
-export declare function findRooms(lines: LineSegment<LineUserData>[]): IRoom[];
+export declare function findRooms(lines: LineSegment<LineUserData>[], trajectory?: Record<string, any> | undefined): IRoom[];

package/src/dxfSystem/utils/toThreeVJiaJson.d.ts

@@ -2,6 +2,7 @@ import { LineSegment } from '../../utils/algorithms/LineSegment';
 import { LineUserData } from '../type';
 import { WallGroupManager } from './WallGroupManager';
 import { Pipeline, HandlerContext } from '../../utils/algorithms/Pipeline';
+import { IRoom } from './findRooms';
 type Vec2 = {
     x: number;
     y: number;
@@ -45,6 +46,11 @@ type Room = {
 export type ThreeVJiaJsonObject = {
     version: string;
     name: string;
+    center: {
+        x: number;
+        y: number;
+    };
+    angle: number;
     communityName: string;
     city: string;
     province: string;
@@ -104,6 +110,12 @@ export declare class ThreeVJiaJson extends Pipeline<DataOption, ICache> {
      * @returns
      */
     transform(): ThreeVJiaJsonObject;
+    /** 添加房间
+     * @param option
+     * @param rooms
+     */
+    static appendRooms(option: ThreeVJiaJsonObject, rooms: IRoom[]): void;
+    static fillPlaceHolders(): void;
 }
 /**
  * 转为 三维家 墙体结构
@@ -116,9 +128,4 @@ export declare function lineDataToThreeVJiaJson(lineSegments: LineSegment<LineUs
     lines: never[];
     toJson(name?: string, communityName?: string): ThreeVJiaJsonObject;
 };
-/**
- * @param option
- * @param items
- */
-export declare function fillPlaceHolders(option: ThreeVJiaJsonObject, items: any): void;
 export {};

package/src/index.css

@@ -41,6 +41,15 @@
       --tw-drop-shadow-color: initial;
       --tw-drop-shadow-alpha: 100%;
       --tw-drop-shadow-size: initial;
+      --tw-backdrop-blur: initial;
+      --tw-backdrop-brightness: initial;
+      --tw-backdrop-contrast: initial;
+      --tw-backdrop-grayscale: initial;
+      --tw-backdrop-hue-rotate: initial;
+      --tw-backdrop-invert: initial;
+      --tw-backdrop-opacity: initial;
+      --tw-backdrop-saturate: initial;
+      --tw-backdrop-sepia: initial;
     }
   }
 }
@@ -334,6 +343,10 @@
   display: grid;
 }
 
+.hidden {
+  display: none;
+}
+
 .table {
   display: table;
 }
@@ -843,6 +856,11 @@
   filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
 }
 
+.backdrop-filter {
+  -webkit-backdrop-filter: var(--tw-backdrop-blur, ) var(--tw-backdrop-brightness, ) var(--tw-backdrop-contrast, ) var(--tw-backdrop-grayscale, ) var(--tw-backdrop-hue-rotate, ) var(--tw-backdrop-invert, ) var(--tw-backdrop-opacity, ) var(--tw-backdrop-saturate, ) var(--tw-backdrop-sepia, );
+  backdrop-filter: var(--tw-backdrop-blur, ) var(--tw-backdrop-brightness, ) var(--tw-backdrop-contrast, ) var(--tw-backdrop-grayscale, ) var(--tw-backdrop-hue-rotate, ) var(--tw-backdrop-invert, ) var(--tw-backdrop-opacity, ) var(--tw-backdrop-saturate, ) var(--tw-backdrop-sepia, );
+}
+
 .transition {
   transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, content-visibility, overlay, pointer-events;
   transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -1116,6 +1134,51 @@
   inherits: false
 }
 
+@property --tw-backdrop-blur {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-brightness {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-contrast {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-grayscale {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-hue-rotate {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-invert {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-opacity {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-saturate {
+  syntax: "*";
+  inherits: false
+}
+
+@property --tw-backdrop-sepia {
+  syntax: "*";
+  inherits: false
+}
+
 * {
     -webkit-tap-highlight-color: transparent;
 }
@@ -1173,10 +1236,10 @@ button[data-v-624dc8f8]:active {
     color: #a7a7a7
 }
 
-[data-v-89a7b533] {
+[data-v-50ec85be] {
     font-family: 宋体;
 }
-.button[data-v-89a7b533] {
+.button[data-v-50ec85be] {
     padding: 5px 10px;
     border: none;
     background: var(--primary-color);

package/src/index3.js

@@ -16652,6 +16652,17 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         drawLines(lines2, { color: randomColor() });
       });
     }
+    function angleTest() {
+      if (defaultComponent.selectLines.length !== 2) {
+        ElMessage.warning({ message: "请选择两条线段" });
+        return;
+      }
+      const line1 = defaultComponent.selectLines[0];
+      const line2 = defaultComponent.selectLines[1];
+      console.log(
+        line1.angle(line2, { unit: "degree", range: "180" })
+      );
+    }
     function commandConfirm() {
       variable.set("currentKeyDown", "enter");
       queueMicrotask(() => variable.set("currentKeyUp", "enter"));
@@ -16908,7 +16919,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       title: "取消命令(Esc)",
                       class: "active:scale-[0.7] transition-all flex items-center justify-center",
                       onClick: _cache[0] || (_cache[0] = (e) => (unref(editor).cancelCommand(), e.stopPropagation()))
-                    }, [..._cache[20] || (_cache[20] = [
+                    }, [..._cache[21] || (_cache[21] = [
                       createElementVNode("svg", {
                         fill: "#fff",
                         width: "16",
@@ -16926,7 +16937,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       onClick: commandConfirm,
                       title: "确认命令(Enter)",
                       class: "active:scale-[0.7] transition-all flex items-center justify-center"
-                    }, [..._cache[21] || (_cache[21] = [
+                    }, [..._cache[22] || (_cache[22] = [
                       createElementVNode("svg", {
                         fill: "#fff",
                         width: "16",
@@ -16949,7 +16960,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: dxfVisible.value,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dxfVisible.value = $event)
             }, {
-              default: withCtx(() => [..._cache[22] || (_cache[22] = [
+              default: withCtx(() => [..._cache[23] || (_cache[23] = [
                 createTextVNode("Dxf", -1)
               ])]),
               _: 1
@@ -16959,7 +16970,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: unref(editor).renderManager.lineAdsorption.value,
               "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[23] || (_cache[23] = [
+              default: withCtx(() => [..._cache[24] || (_cache[24] = [
                 createTextVNode("线吸附", -1)
               ])]),
               _: 1
@@ -16970,7 +16981,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: unref(editor).renderManager.pointAdsorption.value,
               "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[24] || (_cache[24] = [
+              default: withCtx(() => [..._cache[25] || (_cache[25] = [
                 createTextVNode("点吸附", -1)
               ])]),
               _: 1
@@ -17016,7 +17027,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               createVNode(unref(ElDropdownMenu), null, {
                 default: withCtx(() => [
                   createVNode(unref(ElDropdownItem), { onClick: selectLocalFile }, {
-                    default: withCtx(() => [..._cache[26] || (_cache[26] = [
+                    default: withCtx(() => [..._cache[27] || (_cache[27] = [
                       createTextVNode(" 选择文件 ", -1)
                     ])]),
                     _: 1
@@ -17024,7 +17035,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[4] || (_cache[4] = ($event) => unref(dxfSystem).CorrectionDxf.downloadOriginalData("json.json"))
                   }, {
-                    default: withCtx(() => [..._cache[27] || (_cache[27] = [
+                    default: withCtx(() => [..._cache[28] || (_cache[28] = [
                       createTextVNode(" 下载Json ", -1)
                     ])]),
                     _: 1
@@ -17032,7 +17043,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[5] || (_cache[5] = ($event) => unref(dxfSystem).CorrectionDxf.downloadDxf("test.dxf"))
                   }, {
-                    default: withCtx(() => [..._cache[28] || (_cache[28] = [
+                    default: withCtx(() => [..._cache[29] || (_cache[29] = [
                       createTextVNode(" 下载DXF ", -1)
                     ])]),
                     _: 1
@@ -17040,7 +17051,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[6] || (_cache[6] = ($event) => unref(dxfSystem).CorrectionDxf.downloadDxfImage("dxf.jpg"))
                   }, {
-                    default: withCtx(() => [..._cache[29] || (_cache[29] = [
+                    default: withCtx(() => [..._cache[30] || (_cache[30] = [
                       createTextVNode(" 下载JPG ", -1)
                     ])]),
                     _: 1
@@ -17048,7 +17059,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[7] || (_cache[7] = ($event) => unref(whiteModel).downloadGltf("test.glb", true))
                   }, {
-                    default: withCtx(() => [..._cache[30] || (_cache[30] = [
+                    default: withCtx(() => [..._cache[31] || (_cache[31] = [
                       createTextVNode(" 下载白膜 ", -1)
                     ])]),
                     _: 1
@@ -17056,7 +17067,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[8] || (_cache[8] = ($event) => unref(threeVJia).download())
                   }, {
-                    default: withCtx(() => [..._cache[31] || (_cache[31] = [
+                    default: withCtx(() => [..._cache[32] || (_cache[32] = [
                       createTextVNode(" 下载三维家JSON ", -1)
                     ])]),
                     _: 1
@@ -17078,7 +17089,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                           }, null, 8, ["modelValue"])
                         ]),
                         default: withCtx(() => [
-                          _cache[32] || (_cache[32] = createElementVNode("div", { class: "w-full" }, "z值调整", -1))
+                          _cache[33] || (_cache[33] = createElementVNode("div", { class: "w-full" }, "z值调整", -1))
                         ]),
                         _: 1
                       })) : createCommentVNode("", true)
@@ -17106,6 +17117,17 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       }, "回环测试", 32)
                     ]),
                     _: 1
+                  }),
+                  createVNode(unref(ElDropdownItem), null, {
+                    default: withCtx(() => [
+                      createElementVNode("div", {
+                        class: "w-full",
+                        onMousedown: _cache[13] || (_cache[13] = withModifiers(() => {
+                        }, ["stop"])),
+                        onClick: withModifiers(angleTest, ["stop", "prevent"])
+                      }, "角度测试", 32)
+                    ]),
+                    _: 1
                   })
                 ]),
                 _: 1
@@ -17116,7 +17138,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 size: "small",
                 class: "mt-[10px] w-full"
               }, {
-                default: withCtx(() => [..._cache[25] || (_cache[25] = [
+                default: withCtx(() => [..._cache[26] || (_cache[26] = [
                   createTextVNode("其他功能", -1)
                 ])]),
                 _: 1
@@ -17127,16 +17149,16 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         ])) : (openBlock(), createElementBlock("div", {
           key: 1,
           class: normalizeClass([{ "translate-y-full": isMainCommand.value }, "z-8 absolute left-0 bottom-0 transition-transform w-full bg-white p-[5px] box-border text-[14px]"]),
-          onMousedown: _cache[16] || (_cache[16] = (e) => e.stopPropagation()),
-          onPointerdown: _cache[17] || (_cache[17] = (e) => e.stopPropagation())
+          onMousedown: _cache[17] || (_cache[17] = (e) => e.stopPropagation()),
+          onPointerdown: _cache[18] || (_cache[18] = (e) => e.stopPropagation())
         }, [
           createElementVNode("div", _hoisted_14, [
             createVNode(unref(ElCheckbox), {
               size: "small",
               modelValue: dxfVisible.value,
-              "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => dxfVisible.value = $event)
+              "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => dxfVisible.value = $event)
             }, {
-              default: withCtx(() => [..._cache[33] || (_cache[33] = [
+              default: withCtx(() => [..._cache[34] || (_cache[34] = [
                 createTextVNode("Dxf", -1)
               ])]),
               _: 1
@@ -17144,9 +17166,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             createVNode(unref(ElCheckbox), {
               size: "small",
               modelValue: unref(editor).renderManager.lineAdsorption.value,
-              "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
+              "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[34] || (_cache[34] = [
+              default: withCtx(() => [..._cache[35] || (_cache[35] = [
                 createTextVNode("线吸附", -1)
               ])]),
               _: 1
@@ -17155,9 +17177,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               disabled: !unref(editor).renderManager.lineAdsorption.value,
               size: "small",
               modelValue: unref(editor).renderManager.pointAdsorption.value,
-              "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
+              "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[35] || (_cache[35] = [
+              default: withCtx(() => [..._cache[36] || (_cache[36] = [
                 createTextVNode("点吸附", -1)
               ])]),
               _: 1
@@ -17216,13 +17238,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         }, [
           isMainCommand.value ? (openBlock(), createElementBlock("div", {
             key: 0,
-            onMousemove: _cache[19] || (_cache[19] = (e) => e.stopPropagation()),
+            onMousemove: _cache[20] || (_cache[20] = (e) => e.stopPropagation()),
             class: "cursor-pointer z-8 box-border bg-[rgba(0,0,0,0.5)] rounded-[6px] p-[5px] absolute left-[50%] translate-x-[-50%] top-[20px] flex gap-[5px] items-center"
           }, [
             createElementVNode("button", {
-              onClick: _cache[18] || (_cache[18] = (e) => (unref(editor).cancelCommand(), e.stopPropagation())),
+              onClick: _cache[19] || (_cache[19] = (e) => (unref(editor).cancelCommand(), e.stopPropagation())),
               class: "bg-transparent! button cursor-pointer"
-            }, [..._cache[36] || (_cache[36] = [
+            }, [..._cache[37] || (_cache[37] = [
               createElementVNode("svg", {
                 fill: "#fff",
                 viewBox: "0 0 1024 1024",
@@ -17238,7 +17260,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               key: 0,
               onClick: commandConfirm,
               class: "button bg-transparent! cursor-pointer"
-            }, [..._cache[37] || (_cache[37] = [
+            }, [..._cache[38] || (_cache[38] = [
               createElementVNode("svg", {
                 fill: "#28c932",
                 viewBox: "0 0 1026 1024",
@@ -17259,7 +17281,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-89a7b533"]]);
+const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-50ec85be"]]);
 class StorageHelper {
   static get(key, defaultValue = void 0) {
     const value = localStorage.getItem(key);

package/src/pages/Todo.vue.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, HTMLDivElement>;
+export default _default;

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

@@ -1,4 +1,9 @@
 import { LineSegment } from './LineSegment';
+export interface AlignDescriptor {
+    esp?: number;
+    gap?: number;
+    onMergeLine?: (target: LineSegment, source: LineSegment) => void;
+}
 /** 通过平行轴和垂直轴分组对齐线段，搭配垂直纠正使用
  */
 export declare class AlignToParallelSegments {
@@ -14,10 +19,10 @@ export declare class AlignToParallelSegments {
      * @param groups
      * @param verticalLines
      */
-    static fittingAlignment(groups: LineSegment[][], verticalLines: LineSegment[]): LineSegment<Record<string, any>>[];
+    static fittingAlignment(groups: LineSegment[][], verticalLines: LineSegment[], opt?: AlignDescriptor): LineSegment<Record<string, any>>[];
     /** 对齐到平行线段, 请在垂直纠正（AxisAlignCorr）后使用
      * @param lines
      * @returns
      */
-    static align(lines: LineSegment[], esp?: number, gap?: number): LineSegment<Record<string, any>>[];
+    static align(lines: LineSegment[], opt?: AlignDescriptor): LineSegment<Record<string, any>>[];
 }

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

@@ -17,6 +17,7 @@ export declare class LineSegment<T = Record<string, any>> {
     constructor(p1?: Point, p2?: Point);
     private _initLenListener;
     set(p1: Point, p2: Point): this;
+    setLength(len: number): this;
     /** 获取另一个点
      * @param point
      * @returns

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

@@ -74,7 +74,10 @@ export declare class Point<T = Record<string, any>> {
      * @param point
      * @param angle 旋转角度，单位为弧度
      */
-    rotate(point: Point, angle: number): this;
+    rotate(point: {
+        x: number;
+        y: number;
+    }, angle: number): this;
     /**
      * 保留小数位数
      * @param count

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

@@ -83,6 +83,7 @@ export declare class PointSpatialHash<T = Record<string, any>> {
      * @param point
      */
     queryPoint(point: Point, excludeOneself?: boolean): PvgList<T>;
+    queryPoints(points: Point[], excludeOneself?: boolean): Target<T>[];
     /** 获取多边形内的点
      * @param polygon
      */