build-dxf 0.1.58 → 0.1.59

package/package.json

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

package/src/build.js

@@ -6198,7 +6198,7 @@ class CAD {
   /** 添加组并执行偏移
    * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
    */
-  addGroupByOffset(lines, joinType = "jtMiter", endType = "etOpenButt", scale2 = 1e5) {
+  addGroupAndOffset(lines, joinType = "jtMiter", endType = "etOpenButt", scale2 = 1e5) {
     const groups = LineSegment.groupByPoint(lines);
     const polygons = groups.flatMap((group2) => Polygon.multipleFromByLines(group2));
     const offset2 = new ClipperLib.ClipperOffset(2, 0.25);
@@ -6735,7 +6735,7 @@ class DxfDataPlugin {
         line.end.add(direct.clone().multiplyScalar(-DEFAULT_WALL_WIDTH * 0.5));
       }
     });
-    cad.addGroupByOffset(wall);
+    cad.addGroupAndOffset(wall);
     cad.addGroups(doubleWallGroup, "doubleWall");
     cad.unionGroupAll();
     cad.addGroup(doors, "door");
@@ -7006,7 +7006,7 @@ function buildBayWindowGroup(lines, clear = true) {
     if (circles.length === 0 && bayWindowLine.userData?.outSize) {
       const direct = Point.from(bayWindowLine.userData.outSize.direction), point2 = bayWindowLine.center.add(direct.multiplyScalar(1e-8));
       circles.push([bayWindowLine]);
-      bayWindowLine.points.map((p2) => {
+      const paths = bayWindowLine.points.map((p2) => {
         const path = /* @__PURE__ */ new Set();
         maxiCircles.findSameSidePath({
           path,
@@ -7016,8 +7016,33 @@ function buildBayWindowGroup(lines, clear = true) {
           exitPoint: p2,
           grid: lines
         });
-        circles[0].push(...path);
-      });
+        return [...path];
+      }).filter((path) => path.length);
+      circles[0].push(...paths.flat(2));
+      if (paths.length === 2) {
+        const line1 = paths[0][paths[0].length - 1], line2 = paths[1][paths[1].length - 1];
+        let point1, point22, min = Infinity;
+        line1.points.forEach((p2) => {
+          line2.points.forEach((p22) => {
+            const distance2 = p2.distance(p22);
+            if (distance2 < min && distance2 < 0.3) {
+              point1 = p2;
+              point22 = p22;
+              min = distance2;
+            }
+          });
+        });
+        if (point1 && point22) {
+          const point3 = line1.projectPoint(point22, false);
+          if (point3) {
+            const newLine = new LineSegment(point3.clone(), point22.clone());
+            lines.push(newLine);
+            circles[0].push(newLine);
+            point1.copy(point3);
+            newLine.userData.isWindowWall = true;
+          }
+        }
+      }
     }
     const id = uuid();
     if (circles.length) {
@@ -16658,6 +16683,7 @@ class SceneAutoGenerat {
           mesh.position.z = this.z;
           mesh.name = `平面_out_${i}_${j}`;
           mesh.userData.category = "plane";
+          mesh.userData.area = poly.area();
           this.scene.add(mesh);
         });
       });
@@ -16667,6 +16693,7 @@ class SceneAutoGenerat {
         mesh.position.z = this.z;
         mesh.name = `平面_${i}_${j}`;
         mesh.userData.category = "plane";
+        mesh.userData.area = Polygon.fromByLines2(circle).area();
         mesh.userData.room = true;
         this.scene.add(mesh);
       });

package/src/utils/DxfSystem/type.d.ts

@@ -23,6 +23,8 @@ export type WallLineGlobalOption = {
     isBayWindow?: boolean;
     /** 是不是飘窗墙壁 */
     isWindowWall?: boolean;
+    /** 是不是阳台护栏 */
+    isBalconyRailing?: boolean;
     /** 是不是门线 */
     isDoor?: boolean;
     doorAutomaticFind?: boolean;

package/src/utils/DxfSystem/utils/CAD.d.ts

@@ -65,7 +65,7 @@ export declare class CAD {
     /** 添加组并执行偏移
      * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
      */
-    addGroupByOffset(lines: LineSegmentType[], joinType?: JoinType, endType?: EndType, scale?: number): this;
+    addGroupAndOffset(lines: LineSegmentType[], joinType?: JoinType, endType?: EndType, scale?: number): this;
     /**
      * 合并所有组
      */
@@ -132,7 +132,7 @@ export declare class CAD {
         referenceLine: LineSegment<Record<string, any>>;
     };
 }
-/** dxf 数据处理插件
+/** dxf 绘制插件
  */
 export declare class DxfDrawPlugin implements ICADPlugin {
     /** 获取角度范围
@@ -144,7 +144,7 @@ export declare class DxfDrawPlugin implements ICADPlugin {
     private getArcAngleRange;
     install(cad: CAD): void;
 }
-/** dxf 绘制插件
+/** dxf 数据处理插件
  */
 export declare class DxfDataPlugin implements ICADPlugin {
     lines: LineSegment<LineUserData>[];

package/src/utils/DxfSystem/utils/DoorFind.d.ts

@@ -12,7 +12,9 @@ interface IDockInfo {
 export declare class DoorFind {
     lines: LineSegment[];
     grid: PointVirtualGrid<LineSegment<LineUserData>>;
-    quadtree: Quadtree<LineSegment<LineUserData>>;
+    quadtree: Quadtree<{
+        index: number;
+    }>;
     constructor(lines: LineSegment<LineUserData>[]);
     /**
      * 查找兄弟门(双开门)