build-dxf 0.1.58 → 0.1.60

package/package.json

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

package/src/build.js

@@ -340,7 +340,7 @@ class PointVirtualGrid {
    */
   queryCircle(pos, radius, excludeOneself = false) {
     const box2 = new Box2(pos.x - radius, pos.x + radius, pos.y - radius, pos.y + radius);
-    const minI = Math.ceil(box2.minX / this.gridSize), maxI = Math.ceil(box2.maxX / this.gridSize), minJ = Math.ceil(box2.minY / this.gridSize), maxJ = Math.ceil(box2.maxY / this.gridSize), list = [];
+    const minI = Math.ceil(box2.minX / this.gridSize), maxI = Math.ceil(box2.maxX / this.gridSize), minJ = Math.ceil(box2.minY / this.gridSize), maxJ = Math.ceil(box2.maxY / this.gridSize), list = new PvgList();
     for (let i = minI; i <= maxI; i++) {
       for (let j = minJ; j <= maxJ; j++) {
         const id = `${i}.${j}`;
@@ -2619,6 +2619,12 @@ class Point {
       z
     };
   }
+  toJson2D() {
+    return {
+      x: this.x,
+      y: this.y
+    };
+  }
   toVector3(z = 0) {
     return new Vector3(this.x, this.y, z);
   }
@@ -4778,6 +4784,12 @@ class Polygon extends Array {
     }
     return Math.abs(area2) / 2;
   }
+  closedLoop() {
+    if (this.length < 2) return false;
+    const first = this[0];
+    const last = this[this.length - 1];
+    return first.equal(last);
+  }
   /**
    * 获取点相对于多边形的位置
    * @param point 
@@ -6198,7 +6210,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 +6747,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");
@@ -7000,13 +7012,15 @@ function buildDoubleWallGroup(lines, doorLines = [], grouped = true, clearIntern
 }
 function buildBayWindowGroup(lines, clear = true) {
   const bayWindowLines = lines.filter((line) => line.userData.isBayWindow), groupedLineSet = /* @__PURE__ */ new Set();
+  const removeSet = findDiscretePointLine2(lines, null, true);
+  const lines_ = lines.filter((line) => !removeSet.has(line));
   bayWindowLines.forEach((bayWindowLine) => {
-    let { circles } = maxiCircles.miniCircle(lines, { circleEdges: [bayWindowLine] });
+    let { circles } = maxiCircles.miniCircle(lines_, { circleEdges: [bayWindowLine] });
     circles = circles.filter((group2) => group2.some((line) => line.userData.isWindow && LineGroupType.hasType(line, "bayWindow")));
     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 +7030,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) {
@@ -7185,6 +7224,14 @@ class DoubleWallHelper {
    * @returns 
    */
   static complementSide(lines, wallWidth = 0.4) {
+    const otherLines = [];
+    lines = lines.filter((line) => {
+      if (line.userData.isBayWindow || line.userData.isBalconyRailing) {
+        otherLines.push(line);
+        return false;
+      }
+      return true;
+    });
     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, []);
@@ -7240,6 +7287,7 @@ class DoubleWallHelper {
     lines.push(...appendLines);
     lines = lineSegmentClipping(lines, 1e-9);
     quadtree.clear();
+    lines.push(...otherLines);
     return lines;
   }
   /**
@@ -7877,124 +7925,308 @@ class BoundExt {
     };
   }
 }
-function getGroups(lines, updateGroup = true) {
-  if (updateGroup) lines = DoubleWallHelper.buildGroup(lines);
-  const map = lines.reduce((map2, line) => {
-    const groups = LineGroupType.get(line);
-    groups.forEach((group2) => {
-      let id = group2.id ?? "wall";
-      if (group2.type === "wall") id = "wall";
-      map2.append(id, line);
+function createGeometry(points, options) {
+  points = points.map((p2) => p2 instanceof Point ? new THREE.Vector2(p2.x, p2.y) : p2);
+  const shape = new THREE.Shape(points);
+  const extrudeGeometry = new THREE.ExtrudeGeometry(shape, {
+    bevelEnabled: false,
+    ...options
+  });
+  return extrudeGeometry;
+}
+class ExtrudeMesh extends THREE.Mesh {
+  geometry;
+  options;
+  constructor(points, options, material) {
+    const geometry = createGeometry(points, options);
+    super(geometry, material);
+    this.geometry = geometry;
+    this.options = options;
+  }
+  setPoints(points, options = this.options) {
+    const geometry = createGeometry(points, options);
+    this.geometry = geometry;
+  }
+}
+class BayWindowHelper {
+  /** 获取绘制数据
+   * @param lines 
+   * @returns 
+   */
+  static getDrawData(lines) {
+    lines = LineSegmentUndirectedGraph.breakpointMerging(lines.map((line) => line.clone()), mergeLineUserData);
+    if (lines.length === 4) {
+      let bayWindowLine = null;
+      let windowLine = null;
+      let deptLine = null;
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.userData.isBayWindow) bayWindowLine = line;
+        else if (line.userData.isWindow && line.userData.drawWindow) windowLine = line;
+        else deptLine = line;
+      }
+      if (bayWindowLine && windowLine && deptLine) {
+        const { width, height, groundClearance } = windowLine.userData.drawWindow[0];
+        const direction = Point.zero();
+        if (deptLine.sameEndpointAsEnd(bayWindowLine)) {
+          deptLine.start.direction(deptLine.end, direction);
+        } else {
+          deptLine.end.direction(deptLine.start, direction);
+        }
+        return {
+          height1: bayWindowLine.userData.topClearance ?? 0,
+          height2: height,
+          height3: groundClearance,
+          depth: deptLine.length(),
+          windowWidth: width,
+          windowHeight: height,
+          bayWindowLine,
+          windowLine,
+          deptLine,
+          direction
+        };
+      }
+    }
+    return null;
+  }
+  /** 获取所有绘制数据
+   * @param lineSegments 
+   * @returns 
+   */
+  static getDrawDataAll(lineSegments) {
+    const groups = LineGroupType.getGroupsByType(lineSegments, "bayWindow");
+    const drawDataList = groups.map(this.getDrawData);
+    return groups.map((group2, indxe) => ({
+      group: group2,
+      drawData: drawDataList[indxe]
+    })).filter((item) => item.drawData);
+  }
+  /** 绘制数据转模型
+   * @param drawData 
+   * @returns 
+   */
+  static drawDataToModel(drawData) {
+    const pos = drawData.bayWindowLine.center, dirct = drawData.bayWindowLine.direction(), length = drawData.bayWindowLine.length(), bayWindowLine = Point.zero().expandAsLine(dirct, length).directionMove(dirct.multiplyScalar(-1), length * 0.5), winGroup = new THREE.Group(), material = new THREE.MeshBasicMaterial({ color: 16777215 });
+    winGroup.position.set(pos.x, pos.y, 0);
+    const rectangle = bayWindowLine.expandToRectangle(DEFAULT_WALL_WIDTH), extrudeMesh = new ExtrudeMesh(rectangle.points, { depth: drawData.height3 }, material);
+    winGroup.add(extrudeMesh);
+    const rectangle2 = bayWindowLine.clone().directionMove(drawData.direction, drawData.depth).expandToRectangle(DEFAULT_WALL_WIDTH), extrudeMesh2 = new ExtrudeMesh(rectangle2.points, { depth: drawData.height2 }, new THREE.MeshPhongMaterial({ color: 16777215, transparent: true, opacity: 0.2 }));
+    extrudeMesh2.position.z = drawData.height3;
+    winGroup.add(extrudeMesh2);
+    const rectangle3 = bayWindowLine.start.expandAsLine(drawData.direction, drawData.depth).directionMove(drawData.direction, -0.06).expandToRectangle(DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh3 = new ExtrudeMesh(rectangle3.points, { depth: drawData.height2 }, material);
+    extrudeMesh3.position.z = drawData.height3;
+    winGroup.add(extrudeMesh3);
+    const rectangle4 = bayWindowLine.end.expandAsLine(drawData.direction, drawData.depth).directionMove(drawData.direction, -0.06).expandToRectangle(DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh4 = new ExtrudeMesh(rectangle4.points, { depth: drawData.height2 }, material);
+    extrudeMesh4.position.z = drawData.height3;
+    winGroup.add(extrudeMesh4);
+    const extrudeMesh5 = new ExtrudeMesh(rectangle.points, { depth: drawData.height1 }, material);
+    extrudeMesh5.position.z = drawData.height3 + drawData.height2;
+    winGroup.add(extrudeMesh5);
+    const rectangle6 = bayWindowLine.clone().directionMove(drawData.direction, drawData.depth * 0.5).expandToRectangle(drawData.depth - DEFAULT_WALL_WIDTH, "bothSides"), extrudeMesh6 = new ExtrudeMesh(rectangle6.points, { depth: 1e-3 }, material);
+    extrudeMesh6.position.z = drawData.height3;
+    winGroup.add(extrudeMesh6);
+    const extrudeMesh7 = new ExtrudeMesh(rectangle6.points, { depth: 1e-3 }, material);
+    extrudeMesh7.position.z = drawData.height3 + drawData.height2;
+    winGroup.add(extrudeMesh7);
+    return winGroup;
+  }
+}
+class WallGroupManager {
+  [Symbol.iterator]() {
+    return this.groups[Symbol.iterator]();
+  }
+  groups = [];
+  add(group2) {
+    this.groups.push(group2);
+  }
+  static fromByLines(lineSegments) {
+    const wallGroupManager = new WallGroupManager();
+    const removeLines = [];
+    BayWindowHelper.getDrawDataAll(lineSegments).forEach(({ group: group2, drawData }) => {
+      wallGroupManager.add({
+        type: "bayWindow",
+        lines: group2,
+        data: drawData
+      });
+      removeLines.push(...group2);
     });
-    return map2;
-  }, new ArrayMap());
-  return map;
+    const doors = lineSegments.filter((line) => line.userData.isDoor);
+    wallGroupManager.add({ type: "door", lines: doors });
+    removeLines.push(...doors);
+    const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall");
+    doubleWalls.forEach((doubleWall) => {
+      wallGroupManager.add({ type: "doubleWall", lines: doubleWall });
+      removeLines.push(...doubleWall);
+    });
+    const set2 = new Set(removeLines);
+    const walls = lineSegments.filter((line) => !set2.has(line));
+    wallGroupManager.add({ type: "wall", lines: walls.filter((line) => !line.userData.isWindow) });
+    wallGroupManager.add({ type: "window", lines: walls.filter((line) => line.userData.isWindow) });
+    return wallGroupManager;
+  }
+  forEach(fun) {
+    for (let i = 0; i < this.groups.length; i++) {
+      fun(this.groups[i], i);
+    }
+  }
+  map(fun) {
+    const list = [];
+    for (let i = 0; i < this.groups.length; i++) {
+      list.push(fun(this.groups[i], i));
+    }
+    return list;
+  }
 }
-function handleGroup(map) {
-  const group2 = map.group((lines) => {
-    if (LineGroupType.everyType(lines, "bayWindow")) return "wall";
-    if (LineGroupType.everyType(lines, "doubleWall")) return "doubleWall";
-    return "wall";
-  }), walls = group2.get("wall") ?? [], doubleWalls = group2.get("doubleWall") ?? [];
-  let newlines = [], doubleWallsSet = new Set(doubleWalls.flat());
-  walls.forEach((lines) => {
-    lines.forEach((line) => doubleWallsSet.has(line) || newlines.push(line));
-  });
-  doubleWalls.forEach((lines) => {
-    lines = [...new Set(lines)];
+class HandlerFlow {
+  handlerMap = new ArrayMap();
+  addHandler(handler) {
+    this.handlerMap.append(handler.type, handler);
+  }
+  handle(type, data, option) {
+    const list = this.handlerMap.get(type);
+    if (list) list.forEach((handler) => data = handler.handle(data, option));
+    return data;
+  }
+}
+class ThreeVJiaJson extends HandlerFlow {
+  manager;
+  index = 0;
+  constructor(lines) {
+    super();
+    this.manager = WallGroupManager.fromByLines(lines);
+    this.addHandler({ type: "bayWindow", handle: this.bayWindowHandle.bind(this) });
+    this.addHandler({ type: "doubleWall", handle: this.doubleWallHandle.bind(this) });
+    this.addHandler({ type: "wall", handle: this.wallHandle.bind(this) });
+    this.addHandler({ type: "door", handle: this.doorHandle.bind(this) });
+    this.addHandler({ type: "window", handle: this.windowHandle.bind(this) });
+  }
+  /** 双线墙处理
+   * @param param0 
+   * @returns 
+   */
+  doubleWallHandle({ lines }) {
     const groups = clippingDoubleWall(lines);
-    groups.forEach((lines2) => {
-      if (lines2.length < 4) return newlines.push(...lines2);
+    const newLines = groups.flatMap((lines2) => {
+      if (lines2.length < 4) return lines2;
       lines2 = lines2.sort((a2, b4) => a2.length() - b4.length());
       const line1 = lines2[0], line2 = lines2[1];
       const newLine = new LineSegment(line1.center.clone(), line2.center.clone());
       mergeLineUserData(newLine, lines2);
       newLine.userData.wallWidth = line1.length();
-      newlines.push(newLine);
       mergeWindow(newLine);
+      return [newLine];
     });
-  });
-  newlines = newlines.map((line) => line.clone());
-  return newlines.filter((line) => !line.userData.isBayWindow);
-}
-function toJson(lineSegments, name = "测试", communityName = "") {
-  const scale2 = 1, idMap = /* @__PURE__ */ new Map();
-  let index2 = 0;
-  return {
-    version: "2",
-    name,
-    communityName,
-    city: "",
-    province: "",
-    height: DEFAULT_WALL_HEIGHT * scale2,
-    walls: lineSegments.map((line) => {
-      if (line.userData.isDoor && !line.userData.doorDirectConnection) return;
-      idMap.set(line, index2);
-      return {
-        ID: index2++,
-        start: { x: line.start.x * scale2, y: line.start.y * scale2 },
-        end: { x: line.end.x * scale2, y: line.end.y * scale2 },
-        thickness: (line.userData.wallWidth ? line.userData.wallWidth : 0.12) * scale2,
+    const windowLines = newLines.filter((line) => line.userData.isWindow);
+    this.manager.add({ type: "window", lines: windowLines });
+    return newLines.filter((line) => !line.userData.isWindow);
+  }
+  /**
+   * 单线墙处理
+   * @param param0 
+   */
+  wallHandle({ lines }) {
+    return lines;
+  }
+  /**
+   * 门线处理
+   * @param param0 
+   */
+  doorHandle({ lines }, option) {
+    lines.forEach((line) => {
+      option.holes.push({
+        id: this.index++,
+        type: "DOOR",
+        openSide: "RIGHT",
+        start: line.start.toJson2D(),
+        end: line.end.toJson2D(),
+        height: line.userData.drawDoorData?.height ?? DEFAULT_DOOR_HEIGHT,
+        sillHeight: line.userData.drawDoorData?.sillHeight ?? DOOR_GROUND_CLEARANCE_HEIGHT,
+        groundClearance: line.userData.drawDoorData?.sillHeight ?? DOOR_GROUND_CLEARANCE_HEIGHT
+      });
+    });
+    return [];
+  }
+  /**
+   * 窗线处理
+   * @param param0 
+   */
+  windowHandle({ lines }, option) {
+    lines.forEach((line) => {
+      line.userData.drawWindow?.forEach((item) => {
+        const center = Point.from(item.p);
+        const start = center.clone().add(line.direction().multiplyScalar(item.width * 0.5));
+        const end = center.clone().add(line.direction().multiplyScalar(-item.width * 0.5));
+        option?.holes.push({
+          id: this.index++,
+          type: "WINDOW",
+          start: start.toJson2D(),
+          end: end.toJson2D(),
+          height: item.height ?? DEFAULT_WINDOW_HEIGHT,
+          groundClearance: item?.groundClearance ?? WINDOW_GROUND_CLEARANCE_HEIGHT,
+          sillHeight: item?.groundClearance ?? WINDOW_GROUND_CLEARANCE_HEIGHT
+        });
+      });
+    });
+    return lines;
+  }
+  /** 飘窗处理
+   * @param data 
+   * @returns 
+   */
+  bayWindowHandle({ lines, data }, option) {
+    const bayWindows = lines.filter((line) => line.userData.isBayWindow);
+    if (bayWindows.length) {
+      option?.holes.push({
+        type: "BAY_WINDOW",
+        id: this.index++,
+        start: bayWindows[0].start,
+        end: bayWindows[0].end,
+        height1: data?.height1,
+        height2: data?.height2,
+        height3: data?.height3,
+        depth: data?.depth,
+        windowWidth: data?.windowWidth,
+        windowHeight: data?.windowHeight
+        // direction: data?.direction.toJson2D(),
+      });
+    }
+    return [];
+  }
+  /** 装换
+   * @returns 
+   */
+  transform() {
+    const option = {
+      version: "2",
+      name: "",
+      communityName: "",
+      city: "",
+      province: "",
+      height: 0,
+      walls: [],
+      pillars: [],
+      beams: [],
+      holes: [],
+      rooms: []
+    };
+    const lines = this.manager.map((group2) => this.handle(group2.type, group2, option)).flat(4);
+    lines.forEach((line) => {
+      option.walls.push({
+        ID: this.index++,
+        start: line.start.toJson2D(),
+        end: line.end.toJson2D(),
+        thickness: line.userData.wallWidth ? line.userData.wallWidth : 0.12,
         type: "LINE",
-        isDoor: line.userData.isDoor,
+        isDoor: false,
         loadBearingWall: false,
-        height: (line.userData.height ?? DEFAULT_WALL_HEIGHT) * scale2
-      };
-    }).filter((i) => !!i),
-    pillars: [],
-    beams: [],
-    holes: lineSegments.flatMap((line) => {
-      if (line.userData.isDoor && line.userData.doorDirectConnection) {
-        return {
-          id: index2++,
-          type: "DOOR",
-          openSide: "RIGHT",
-          start: {
-            x: line.start.x * scale2,
-            y: line.start.y * scale2
-          },
-          end: {
-            x: line.end.x * scale2,
-            y: line.end.y * scale2
-          },
-          height: (line.userData.drawDoorData?.height ?? DEFAULT_DOOR_HEIGHT) * scale2,
-          qroundClearance: (line.userData.drawDoorData?.sillHeight ?? DOOR_GROUND_CLEARANCE_HEIGHT) * scale2,
-          sillHeight: (line.userData.drawDoorData?.sillHeight ?? DOOR_GROUND_CLEARANCE_HEIGHT) * scale2
-        };
-      } else if (line.userData.isWindow && line.userData.drawWindow) {
-        return line.userData.drawWindow.map((item) => {
-          const center = Point.from(item.p);
-          const start = center.clone().add(
-            line.direction().multiplyScalar(item.width * 0.5)
-          );
-          const end = center.clone().add(
-            line.direction().multiplyScalar(-item.width * 0.5)
-          );
-          return {
-            id: index2++,
-            type: "WINDOW",
-            start: {
-              x: start.x * scale2,
-              y: start.y * scale2
-            },
-            end: {
-              x: end.x * scale2,
-              y: end.y * scale2
-            },
-            height: (item.height ?? DEFAULT_WINDOW_HEIGHT) * scale2,
-            groundClearance: (item?.groundClearance ?? WINDOW_GROUND_CLEARANCE_HEIGHT) * scale2,
-            sillHeight: (item?.groundClearance ?? WINDOW_GROUND_CLEARANCE_HEIGHT) * scale2
-          };
-        });
-      }
-    }).filter((i) => !!i),
-    rooms: []
-  };
+        height: line.userData.height ?? DEFAULT_WALL_HEIGHT
+      });
+    });
+    return option;
+  }
 }
-function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
-  const group2 = getGroups(lineSegments, updateGroup);
-  let newLines = handleGroup(group2);
-  newLines = LineSegmentUndirectedGraph.rotate(newLines, angle, (line, center, angle2) => {
+function lineDataToThreeVJiaJson$1(lineSegments, angle = 0, updateGroup = true) {
+  lineSegments = LineSegmentUndirectedGraph.rotate(lineSegments.map((line) => line.clone()), angle, (line, center, angle2) => {
     if (line.userData.drawWindow) {
       line.userData.drawWindow.forEach((windowItem) => {
         const point2 = Point.from(windowItem.p);
@@ -8003,10 +8235,15 @@ function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
       });
     }
   });
+  if (updateGroup) lineSegments = DoubleWallHelper.buildGroup(lineSegments);
+  const threeVJiaJson = new ThreeVJiaJson(lineSegments);
   return {
-    lines: newLines,
+    lines: [],
     toJson(name = "测试", communityName = "") {
-      return toJson(newLines, name, communityName);
+      const json = threeVJiaJson.transform();
+      json.name = name;
+      json.communityName = communityName;
+      return json;
     }
   };
 }
@@ -16658,6 +16895,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 +16905,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);
       });
@@ -16834,6 +17073,7 @@ class DoorFind {
     const openDoors = doors.filter((line) => !line.userData.doorDirectConnection), closeDoors = doors.filter((line) => line.userData.doorDirectConnection);
     this.grid = createPointVirtualGrid(noDoorLines);
     this.quadtree = createQuadtree([...noDoorLines, ...closeDoors]);
+    openDoors.forEach((l) => l.userData.doorDirectConnection = true);
     closeDoors.forEach((line) => this.findCloseDoors(line));
     openDoors.forEach((line) => this.findOpenDoors(line));
   }
@@ -16889,7 +17129,7 @@ class DoorFind {
         const { point: point2 } = searchedList[result.userData];
         const dir2 = item.point.direction(point2);
         const dir3 = item.linePoint.direction(item.line.getAnotherPoint(item.linePoint));
-        return dir2.angleBetween(dir3) > Math.PI / 180 * 75;
+        return dir2.angleBetween(dir3) > Math.PI / 180 * 135;
       });
       if (list.length) {
         const item2 = searchedList[list[0].userData];
@@ -16934,7 +17174,10 @@ class DoorFind {
   findOpenDoors(line) {
     let dock;
     const queryList = (point22) => {
-      let list = this.grid.queryCircle(point22, 0.6, true).filter((item) => {
+      let list = this.grid.queryPoint(point22, true);
+      if (list.length === 1) return list;
+      list = this.grid.queryCircle(point22, 0.6, true);
+      list = list.filter((item) => !item.userData?.userData.isDoor && !item.userData?.userData.isBayWindow).filter((item) => {
         return !this.grid.queryPoint(item.point, true).some((i) => i.userData?.parallel(item.userData));
       }).filter((item) => {
         const line2 = item.userData, direct1 = line.getAnotherPoint(point22).direction(item.point), direct2 = line2.getAnotherPoint(item.point).direction(item.point), angle = direct1.angleBetween(direct2, "angle");
@@ -16981,22 +17224,22 @@ class DoorFind {
       const d1 = item.point.direction(dock.point);
       return d1.angleBetween(targetDirect, "angle") > 70;
     }).filter((item) => {
-      const line2 = item.userData, d1 = dock.point.direction(item.point), d2 = line2.getAnotherPoint(item.point).direction(item.point);
-      return d1.angleBetween(d2, "angle") > maxAngle;
+      const line2 = item.userData, d1 = item.point.direction(dock.point), d2 = line2.getAnotherPoint(item.point).direction(item.point), d3 = dock.dockPoint.direction(dock.dockLine.getAnotherPoint(dock.dockPoint));
+      return d1.angleBetween(d2, "angle") < maxAngle && d3.angleBetween(d2, "angle") < maxAngle;
     }).filter((item) => {
-      const queryLine2 = new LineSegment(item.point.clone(), dock.point.clone());
-      queryLine2.startShrink(0.01).endShrink(1e-3);
-      return this.quadtree.queryLineSegment(queryLine2).length === 0;
+      const queryLine = new LineSegment(item.point.clone(), dock.point.clone());
+      queryLine.startShrink(0.01).endShrink(1e-3);
+      return this.quadtree.queryLineSegment(queryLine).length === 0;
     }).filter((item) => {
       return item.point.distance(dock.point) / length > 0.5;
     }).filter((item) => {
-      const normal2 = item.point.normal(dock.point), center = new Point((item.point.x + dock.point.x) / 2, (item.point.y + dock.point.y) / 2), length2 = item.point.distance(dock.point);
+      const normal = item.point.normal(dock.point), center = new Point((item.point.x + dock.point.x) / 2, (item.point.y + dock.point.y) / 2), length2 = item.point.distance(dock.point);
       const normalLine = new LineSegment(
         center,
-        center.clone().add(normal2.clone().multiplyScalar(length2))
+        center.clone().add(normal.clone().multiplyScalar(length2))
       );
-      normalLine.directionMove(normal2, -length2 * 0.5);
-      const results = this.quadtree.queryLineSegment(normalLine).filter((result2) => result2.line !== line && result2.line !== dock.dockLine);
+      normalLine.directionMove(normal, -length2 * 0.5);
+      const results = this.quadtree.queryLineSegment(normalLine).filter((result) => result.line !== line && result.line !== dock.dockLine);
       return results.length === 0;
     }).sort((a2, b4) => {
       return getWeight(b4, dock, length) - getWeight(a2, dock, length);
@@ -17010,6 +17253,10 @@ class DoorFind {
       }
       return point2;
     }
+    return this.extendLink(dock, line);
+  }
+  extendLink(dock, line) {
+    const length = line.length();
     const direct = dock.dockPoint.direction(dock.dockLine.getAnotherPoint(dock.dockPoint)), queryLine = new LineSegment(
       dock.dockPoint,
       dock.dockPoint.clone().add(direct.multiplyScalar(length * 2))
@@ -17526,6 +17773,139 @@ class CorrectionDxf extends Dxf {
     return this.rotateCorrCad?.downloadDxf(filename, unit);
   }
 }
+function getGroups(lines, updateGroup = true) {
+  if (updateGroup) lines = DoubleWallHelper.buildGroup(lines);
+  const map = lines.reduce((map2, line) => {
+    const groups = LineGroupType.get(line);
+    groups.forEach((group2) => {
+      let id = group2.id ?? "wall";
+      if (group2.type === "wall") id = "wall";
+      map2.append(id, line);
+    });
+    return map2;
+  }, new ArrayMap());
+  return map;
+}
+function handleGroup(map) {
+  const group2 = map.group((lines) => {
+    if (LineGroupType.everyType(lines, "bayWindow")) return "wall";
+    if (LineGroupType.everyType(lines, "doubleWall")) return "doubleWall";
+    return "wall";
+  }), walls = group2.get("wall") ?? [], doubleWalls = group2.get("doubleWall") ?? [];
+  let newlines = [], doubleWallsSet = new Set(doubleWalls.flat());
+  walls.forEach((lines) => {
+    lines.forEach((line) => doubleWallsSet.has(line) || newlines.push(line));
+  });
+  doubleWalls.forEach((lines) => {
+    lines = [...new Set(lines)];
+    const groups = clippingDoubleWall(lines);
+    groups.forEach((lines2) => {
+      if (lines2.length < 4) return newlines.push(...lines2);
+      lines2 = lines2.sort((a2, b4) => a2.length() - b4.length());
+      const line1 = lines2[0], line2 = lines2[1];
+      const newLine = new LineSegment(line1.center.clone(), line2.center.clone());
+      mergeLineUserData(newLine, lines2);
+      newLine.userData.wallWidth = line1.length();
+      newlines.push(newLine);
+      mergeWindow(newLine);
+    });
+  });
+  newlines = newlines.map((line) => line.clone());
+  return newlines.filter((line) => !line.userData.isBayWindow);
+}
+function toJson(lineSegments, name = "测试", communityName = "") {
+  const scale2 = 1, idMap = /* @__PURE__ */ new Map();
+  let index2 = 0;
+  return {
+    version: "2",
+    name,
+    communityName,
+    city: "",
+    province: "",
+    height: DEFAULT_WALL_HEIGHT * scale2,
+    walls: lineSegments.map((line) => {
+      if (line.userData.isDoor && !line.userData.doorDirectConnection) return;
+      idMap.set(line, index2);
+      return {
+        ID: index2++,
+        start: { x: line.start.x * scale2, y: line.start.y * scale2 },
+        end: { x: line.end.x * scale2, y: line.end.y * scale2 },
+        thickness: (line.userData.wallWidth ? line.userData.wallWidth : 0.12) * scale2,
+        type: "LINE",
+        isDoor: line.userData.isDoor,
+        loadBearingWall: false,
+        height: (line.userData.height ?? DEFAULT_WALL_HEIGHT) * scale2
+      };
+    }).filter((i) => !!i),
+    pillars: [],
+    beams: [],
+    holes: lineSegments.flatMap((line) => {
+      if (line.userData.isDoor && line.userData.doorDirectConnection) {
+        return {
+          id: index2++,
+          type: "DOOR",
+          openSide: "RIGHT",
+          start: {
+            x: line.start.x * scale2,
+            y: line.start.y * scale2
+          },
+          end: {
+            x: line.end.x * scale2,
+            y: line.end.y * scale2
+          },
+          height: (line.userData.drawDoorData?.height ?? DEFAULT_DOOR_HEIGHT) * scale2,
+          qroundClearance: (line.userData.drawDoorData?.sillHeight ?? DOOR_GROUND_CLEARANCE_HEIGHT) * scale2,
+          sillHeight: (line.userData.drawDoorData?.sillHeight ?? DOOR_GROUND_CLEARANCE_HEIGHT) * scale2
+        };
+      } else if (line.userData.isWindow && line.userData.drawWindow) {
+        return line.userData.drawWindow.map((item) => {
+          const center = Point.from(item.p);
+          const start = center.clone().add(
+            line.direction().multiplyScalar(item.width * 0.5)
+          );
+          const end = center.clone().add(
+            line.direction().multiplyScalar(-item.width * 0.5)
+          );
+          return {
+            id: index2++,
+            type: "WINDOW",
+            start: {
+              x: start.x * scale2,
+              y: start.y * scale2
+            },
+            end: {
+              x: end.x * scale2,
+              y: end.y * scale2
+            },
+            height: (item.height ?? DEFAULT_WINDOW_HEIGHT) * scale2,
+            groundClearance: (item?.groundClearance ?? WINDOW_GROUND_CLEARANCE_HEIGHT) * scale2,
+            sillHeight: (item?.groundClearance ?? WINDOW_GROUND_CLEARANCE_HEIGHT) * scale2
+          };
+        });
+      }
+    }).filter((i) => !!i),
+    rooms: []
+  };
+}
+function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
+  const group2 = getGroups(lineSegments, updateGroup);
+  let newLines = handleGroup(group2);
+  newLines = LineSegmentUndirectedGraph.rotate(newLines, angle, (line, center, angle2) => {
+    if (line.userData.drawWindow) {
+      line.userData.drawWindow.forEach((windowItem) => {
+        const point2 = Point.from(windowItem.p);
+        point2.rotate(center, angle2);
+        windowItem.p = point2.toJson(windowItem.p.z);
+      });
+    }
+  });
+  return {
+    lines: newLines,
+    toJson(name = "测试", communityName = "") {
+      return toJson(newLines, name, communityName);
+    }
+  };
+}
 class ThreeVJia extends Component {
   static name = "ThreeVJia";
   lineSegments = [];
@@ -19743,6 +20123,7 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   SelectLocalFile,
   SetMap,
   Side,
+  ThreeVJiaJson,
   UndirectedGraph,
   UnionFindSet,
   buildBayWindowGroup,
@@ -19758,7 +20139,7 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   findVerticalReference,
   gltf,
   lineDataToOriginalData,
-  lineDataToThreeVJiaJson,
+  lineDataToThreeVJiaJson: lineDataToThreeVJiaJson$1,
   lineSegmentClipping,
   mergeLineUserData,
   mergeWindow,
@@ -19931,7 +20312,7 @@ async function buildJson(opt) {
       } else throw new Error("非node环境不允许使用路径");
     }
   }
-  doorFind && (dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorFind), dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorSpaceHandle));
+  doorFind && (dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorSpaceHandle), dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorFind), dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorSpaceHandle));
   if (opt.axisAlignCorr !== false) dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.AxisAlignCorr);
   if (trajectory) {
     if (typeof trajectory === "string") {

package/src/utils/DxfSystem/components/ThreeVJia.d.ts

@@ -1,7 +1,7 @@
 import { Component } from '../../ComponentManager';
 import { LineSegment } from '../../LineSegment';
 import { LineUserData } from '../type';
-import { ThreeVJiaJsonObject } from '../utils/lineDataToThreeVJiaJson';
+import { ThreeVJiaJsonObject } from '../utils/lineDataToThreeVJiaJsonOld';
 /**
  * 转为 三维家 墙体结构
  */

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

@@ -23,6 +23,8 @@ export type WallLineGlobalOption = {
     isBayWindow?: boolean;
     /** 是不是飘窗墙壁 */
     isWindowWall?: boolean;
+    /** 是不是阳台护栏 */
+    isBalconyRailing?: boolean;
     /** 是不是门线 */
     isDoor?: boolean;
     doorAutomaticFind?: boolean;
@@ -70,6 +72,7 @@ export type WallLineGlobalOption = {
         };
         height: number;
         groundClearance: number;
+        sillHeight?: number;
     };
 };
 export type LineUserData = {

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

@@ -2,7 +2,7 @@ import { LineSegment } from '../../LineSegment';
 import { LineUserData } from '../type';
 import { Point } from '../../Point';
 import * as THREE from "three";
-interface IDrawBayWindowData {
+export interface IDrawBayWindowData {
     height1: number;
     height2: number;
     height3: number;
@@ -34,4 +34,3 @@ export declare class BayWindowHelper {
      */
     static drawDataToModel(drawData: IDrawBayWindowData): THREE.Group<THREE.Object3DEventMap>;
 }
-export {};

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>[]);
     /**
      * 查找兄弟门(双开门)
@@ -36,6 +38,7 @@ export declare class DoorFind {
      * @returns
      */
     adsorpt(dock: IDockInfo, line: LineSegment, maxAngle?: number): Point<Record<string, any>> | null;
+    extendLink(dock: IDockInfo, line: LineSegment): Point<Record<string, any>> | null;
     getLines(): LineSegment<Record<string, any>>[];
 }
 export {};

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

@@ -0,0 +1,15 @@
+import { LineSegment } from '../../LineSegment';
+import { LineUserData } from '../type';
+export interface IGroup<T = any> {
+    type: string;
+    lines: LineSegment<LineUserData>[];
+    data?: T;
+}
+export declare class WallGroupManager {
+    [Symbol.iterator](): ArrayIterator<IGroup<any>>;
+    private groups;
+    add(group: IGroup): void;
+    static fromByLines(lineSegments: LineSegment[]): WallGroupManager;
+    forEach(fun: (group: IGroup, index: number) => void): void;
+    map<T = any>(fun: (group: IGroup, index: number) => T): T[];
+}

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

@@ -1,20 +1,32 @@
 import { LineSegment } from '../../LineSegment';
 import { LineUserData } from '../type';
-import { Point } from '../../Point';
+import { IDrawBayWindowData } from './BayWindowHelper';
+import { WallGroupManager, IGroup } from './WallGroupManager';
+import { HandlerFlow } from '../../HandlerFlow';
+type Vec2 = {
+    x: number;
+    y: number;
+};
 type Hole = {
     id: number;
-    type: "DOOR" | "WINDOW";
-    start: Point;
-    end: Point;
-    height: number;
+    type: "DOOR" | "WINDOW" | "BAY_WINDOW";
+    start: Vec2;
+    end: Vec2;
+    height?: number;
     groundClearance?: number;
-    sillHeight: number;
+    sillHeight?: number;
     openSide?: "RIGHT" | "LEFT" | "UP" | "DOWN";
+    height1?: number;
+    height2?: number;
+    height3?: number;
+    depth?: number;
+    windowWidth?: number;
+    windowHeight?: number;
 };
 type Wall = {
     ID: number;
-    start: Point;
-    end: Point;
+    start: Vec2;
+    end: Vec2;
     thickness: number;
     type: "LINE";
     isDoor: boolean;
@@ -35,6 +47,40 @@ export type ThreeVJiaJsonObject = {
     holes: Hole[];
     rooms: Room[];
 };
+export declare class ThreeVJiaJson extends HandlerFlow<ThreeVJiaJsonObject> {
+    manager: WallGroupManager;
+    index: number;
+    constructor(lines: LineSegment[]);
+    /** 双线墙处理
+     * @param param0
+     * @returns
+     */
+    doubleWallHandle({ lines }: IGroup): LineSegment<Record<string, any>>[];
+    /**
+     * 单线墙处理
+     * @param param0
+     */
+    wallHandle({ lines }: IGroup): LineSegment<LineUserData>[];
+    /**
+     * 门线处理
+     * @param param0
+     */
+    doorHandle({ lines }: IGroup, option?: ThreeVJiaJsonObject): never[];
+    /**
+     * 窗线处理
+     * @param param0
+     */
+    windowHandle({ lines }: IGroup, option?: ThreeVJiaJsonObject): LineSegment<LineUserData>[];
+    /** 飘窗处理
+     * @param data
+     * @returns
+     */
+    bayWindowHandle({ lines, data }: IGroup<IDrawBayWindowData>, option?: ThreeVJiaJsonObject): never[];
+    /** 装换
+     * @returns
+     */
+    transform(): ThreeVJiaJsonObject;
+}
 /**
  * 转为 三维家 墙体结构
  * @param lineSegments
@@ -42,8 +88,8 @@ export type ThreeVJiaJsonObject = {
  * @param updateGroup
  * @returns
  */
-export declare function lineDataToThreeVJiaJson(lineSegments: LineSegment[], angle?: number, updateGroup?: boolean): {
-    lines: LineSegment<LineUserData>[];
+export declare function lineDataToThreeVJiaJson(lineSegments: LineSegment<LineUserData>[], angle?: number, updateGroup?: boolean): {
+    lines: never[];
     toJson(name?: string, communityName?: string): ThreeVJiaJsonObject;
 };
 export {};

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

@@ -0,0 +1,52 @@
+import { LineSegment } from '../../LineSegment';
+import { LineUserData } from '../type';
+type Vec2 = {
+    x: number;
+    y: number;
+};
+type Hole = {
+    id: number;
+    type: "DOOR" | "WINDOW";
+    start: Vec2;
+    end: Vec2;
+    height: number;
+    groundClearance?: number;
+    sillHeight: number;
+    openSide?: "RIGHT" | "LEFT" | "UP" | "DOWN";
+};
+type Wall = {
+    ID: number;
+    start: Vec2;
+    end: Vec2;
+    thickness: number;
+    type: "LINE";
+    isDoor: boolean;
+    loadBearingWall: boolean;
+    height: number;
+};
+type Room = {};
+export type ThreeVJiaJsonObject = {
+    version: string;
+    name: string;
+    communityName: string;
+    city: string;
+    province: string;
+    height: number;
+    walls: Wall[];
+    pillars: any[];
+    beams: any[];
+    holes: Hole[];
+    rooms: Room[];
+};
+/**
+ * 转为 三维家 墙体结构
+ * @param lineSegments
+ * @param angle 弧度
+ * @param updateGroup
+ * @returns
+ */
+export declare function lineDataToThreeVJiaJson(lineSegments: LineSegment<LineUserData>[], angle?: number, updateGroup?: boolean): {
+    lines: LineSegment<LineUserData>[];
+    toJson(name?: string, communityName?: string): ThreeVJiaJsonObject;
+};
+export {};

package/src/utils/HandlerFlow.d.ts

@@ -0,0 +1,10 @@
+import { ArrayMap } from './Map';
+export interface IHandler<T = any> {
+    type: string;
+    handle: (data: any, option?: T) => any;
+}
+export declare class HandlerFlow<T = any> {
+    handlerMap: ArrayMap<string, IHandler<T>>;
+    addHandler(handler: IHandler<T>): void;
+    handle(type: string, data: any, option?: T): any;
+}

package/src/utils/Point.d.ts

@@ -160,6 +160,10 @@ export declare class Point<T = Record<string, any>> {
         y: number;
         z: number;
     };
+    toJson2D(): {
+        x: number;
+        y: number;
+    };
     toVector3(z?: number): Vector3;
     /** 点吸附
      * @param points

package/src/utils/PointVirtualGrid.d.ts

@@ -67,10 +67,7 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * @param radius 半径
      * @returns 相交的节点数组
      */
-    queryCircle(pos: Point, radius: number, excludeOneself?: boolean): {
-        point: Point;
-        userData?: T;
-    }[];
+    queryCircle(pos: Point, radius: number, excludeOneself?: boolean): PvgList<T>;
     /**
      * 查询与包围盒相交的点
      * @param box2 包围盒

package/src/utils/Polygon.d.ts

@@ -27,6 +27,7 @@ export declare class Polygon<T = any> extends Array<Point<T>> {
      * @returns
      */
     area(): number;
+    closedLoop(): boolean;
     /**
      * 获取点相对于多边形的位置
      * @param point