build-dxf 0.1.159 → 0.1.161

package/package.json

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

package/src/build.js

@@ -6470,6 +6470,30 @@ class Polygon extends Array {
     }).filter((poly) => Math.abs(poly.area()) > 0.01);
     return results;
   }
+  /** 路径偏移
+   * @param poly 
+   * @param option 
+   * @returns 
+   */
+  static offset(poly, option) {
+    const {
+      offsetHalfWidth,
+      joinType = "jtMiter",
+      endType = "etOpenButt",
+      scale: scale2 = 1e5
+    } = option ?? {};
+    const offset = new ClipperLib.ClipperOffset(2, 0.25);
+    let solutions = new ClipperLib.Paths();
+    offset.AddPath(
+      poly.map((p2) => p2.multiplyScalar(scale2)),
+      ClipperLib.JoinType[joinType],
+      ClipperLib.EndType[endType]
+    );
+    offset.Execute(solutions, offsetHalfWidth * scale2);
+    const inv = 1 / scale2;
+    poly.map((p2) => p2.multiplyScalar(inv));
+    return solutions.map((solution) => solution.map((p2) => Point.from(p2).multiplyScalar(1 / scale2))).map((ps2) => new Polygon(ps2))[0];
+  }
 }
 function selectLocalFileFun() {
   return new Promise((resolve) => {
@@ -11315,21 +11339,12 @@ class CAD {
     } = option ?? {};
     const groups = LineSegmentUtils.groupBySharedPoints(lines);
     const polygons = groups.flatMap((group2) => Polygon.multipleFromByLines(group2));
-    const offset = new ClipperLib.ClipperOffset(2, 0.25);
-    let solutions = new ClipperLib.Paths();
-    for (let i = 0; i < polygons.length; i++) {
-      const polygon2 = polygons[i];
-      polygon2.forEach((p2) => p2.multiplyScalar(scale2));
-      offset.AddPath(
-        polygon2,
-        ClipperLib.JoinType[joinType],
-        ClipperLib.EndType[endType]
-      );
+    let offsetPolygons = polygons.map((polygon2) => Polygon.offset(polygon2, { offsetHalfWidth, scale: scale2, joinType, endType })).filter(Boolean);
+    if (offsetPolygons.length > 1) {
+      const [first, ...other] = offsetPolygons;
+      offsetPolygons = Polygon.booleanOp(first, other, { type: "Union", scale: scale2 });
     }
-    offset.Execute(solutions, offsetHalfWidth * scale2);
-    solutions = solutions.map((solution) => solution.map((p2) => Point.from(p2).multiplyScalar(1 / scale2)));
-    solutions.forEach((solution) => {
-      const polygon2 = new Polygon(solution);
+    offsetPolygons.forEach((polygon2) => {
       let lines2 = mergeChainsLine(polygon2.toLines(true));
       lines2.forEach((line) => line.extendAlongDirection(1e-3));
       lines2 = splitIntersectedLine(lines2, 1e-9);
@@ -22995,7 +23010,7 @@ function getBeamNearWallVec(line) {
   }
 }
 function beamSupportLine(lines, {}) {
-  const lsh = Quadtree.from(lines);
+  const lsh = Quadtree.from(lines.filter((line) => !line.userData.isBalconyRailing));
   lines.forEach((line) => {
     if (WallHole.isBeam(line)) {
       const findLine = line.clone();
@@ -23425,7 +23440,9 @@ class Dxf extends Component {
     lines = lines.filter((line) => !line.userData.isDoor);
     lines = BuildGroup.doubleWall(lines);
     lines.push(...doors);
+    TEST = true;
     this.cad = new CAD().usePlugin(new DxfDataPlugin(lines)).usePlugin(new DxfDrawPlugin());
+    TEST = false;
     this.dispatchEvent({
       type: "cadChange",
       cad: this.cad,

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

@@ -146,5 +146,19 @@ export declare class Polygon<T = any> extends Array<Point<T>> {
      * @returns
      */
     static booleanOp(subject: Polygon | Polygon[], clips: Polygon | Polygon[], opt: BooleanOpOption): Polygon<Record<string, any>>[];
+    /** 路径偏移
+     * @param poly
+     * @param option
+     * @returns
+     */
+    static offset(poly: Polygon, option: {
+        offsetHalfWidth: number;
+        joinType?: JoinType;
+        endType?: EndType;
+        type?: string;
+        scale?: number;
+    }): Polygon<Record<string, any>>;
 }
+type JoinType = "jtMiter" | "jtSquare" | "jtRound";
+type EndType = "etOpenSquare" | "etOpenButt" | "etOpenRound";
 export {};