build-dxf 0.1.72 → 0.1.74

package/package.json

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

package/src/build.js

@@ -4850,6 +4850,76 @@ class Polygon extends Array {
     const last = this[this.length - 1];
     return first.equal(last);
   }
+  /** 闭合路径向路径外膨胀width
+   * @param width 
+   */
+  closedExpansion(width, scale2 = 100) {
+    if (this.length < 3) return null;
+    const inv = 1 / scale2;
+    const path = this.clone().scale(scale2).round();
+    const co2 = new ClipperLib.ClipperOffset(
+      2,
+      // miter limit
+      0.25 * scale2
+    );
+    co2.AddPath(
+      path,
+      ClipperLib.JoinType.jtMiter,
+      // 角处理方式
+      ClipperLib.EndType.etClosedPolygon
+    );
+    const solution = [];
+    co2.Execute(solution, width * scale2);
+    if (!solution.length) return null;
+    const result = solution[0].map(
+      (p2) => new Point(p2.X * inv, p2.Y * inv)
+    );
+    this.set(result);
+    return this;
+  }
+  clipByLine(line) {
+    if (this.length < 3) return [];
+    const intersections = [];
+    const lines = this.toLines(true);
+    for (let i = 0; i < lines.length; i++) {
+      const l = lines[i];
+      const p2 = l.getIntersection(line);
+      if (p2) {
+        intersections.push({
+          index: i,
+          point: p2
+        });
+      }
+    }
+    if (intersections.length < 2) return [this.clone()];
+    intersections.sort((a22, b22) => a22.index - b22.index);
+    const newPoints = [];
+    for (let i = 0; i < this.length; i++) {
+      const p2 = this[i].clone();
+      newPoints.push(p2);
+      intersections.forEach((inter) => {
+        if (inter.index === i) {
+          newPoints.push(inter.point.clone());
+        }
+      });
+    }
+    const polygon2 = new Polygon(newPoints);
+    const left = [];
+    const right = [];
+    const a2 = line.start;
+    const b4 = line.end;
+    const side = (p2) => {
+      return (b4.x - a2.x) * (p2.y - a2.y) - (b4.y - a2.y) * (p2.x - a2.x);
+    };
+    polygon2.forEach((p2) => {
+      if (side(p2) >= 0) left.push(p2.clone());
+      if (side(p2) <= 0) right.push(p2.clone());
+    });
+    const results = [];
+    if (left.length >= 3) results.push(new Polygon(left));
+    if (right.length >= 3) results.push(new Polygon(right));
+    return results;
+  }
   /**
    * 获取点相对于多边形的位置
    * @param point 
@@ -5010,7 +5080,7 @@ class Polygon extends Array {
       const p2 = this[i].clone(), nextP = this[(i + 1) % this.length].clone();
       lines.push(new LineSegment(p2, nextP));
     }
-    return lines;
+    return lines.filter((line) => line.length() > 1e-9);
   }
   toArrays() {
     return this.map((p2) => p2.toArray());
@@ -6046,6 +6116,7 @@ function segmentationPath(lines, clipLine) {
   const groups = LineSegment.groupByPosition(lines, queryLine);
   const newGroups = [];
   groups.forEach((group2) => {
+    Point.adsorb(group2.flatMap((line) => line.points), 5e-4);
     const points = [...findDiscretePoint(group2).keys()].sort((a2, b4) => a2.distance(queryLine.start, true) - b4.distance(queryLine.start, true));
     for (let i = 0; i < points.length; i += 2) {
       const p1 = points[i], p2 = points[i + 1];
@@ -8203,7 +8274,7 @@ class BoundExt {
     const walls = lines.filter((line) => !line.userData.isDoor);
     lines = [...LineSegment.brokenLineMerging(walls, mergeLineUserData), ...doors];
     recomputedWindow(...lines);
-    lines = lines.filter((line) => line.length() > 0.01);
+    lines = lines.filter((line) => line.length() > 0.01).filter((line) => line.userData.isDoor ? line.length() > 0.25 : true);
     findCallBack && findCallBack([...exteriorLines, ...appendLines], trajectoryPoints);
     return {
       lines,
@@ -8227,8 +8298,13 @@ class HandlerFlow {
 class ThreeVJiaJson extends HandlerFlow {
   manager;
   index = 0;
-  constructor(lines) {
+  version = "1.0";
+  maxHeight;
+  lines;
+  constructor(lines, maxHeight) {
     super();
+    this.maxHeight = maxHeight;
+    this.lines = lines;
     this.manager = WallGroupManager.fromByLines(lines);
     this.addHandler({ type: "bayWindow", handle: this.bayWindowHandle.bind(this) });
     this.addHandler({ type: "doubleWall", handle: this.doubleWallHandle.bind(this) });
@@ -8281,7 +8357,7 @@ class ThreeVJiaJson extends HandlerFlow {
         groundClearance: line.userData.drawDoorData?.sillHeight ?? DOOR_GROUND_CLEARANCE_HEIGHT
       });
     });
-    return [];
+    return lines;
   }
   /**
    * 窗线处理
@@ -8311,24 +8387,41 @@ class ThreeVJiaJson extends HandlerFlow {
    * @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(),
-        pictures: [
-          "https://image.cnyang.cn/pano/PJ1772163638nmb/image/1527725175900.jpg",
-          "https://image.cnyang.cn/pano/PJ1772163638nmb/image/1527725221900.jpg"
-        ]
+    if (this.version === "2.0") {
+      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(),
+          pictures: [
+            "https://image.cnyang.cn/pano/PJ1772163638nmb/image/1527725175900.jpg",
+            "https://image.cnyang.cn/pano/PJ1772163638nmb/image/1527725221900.jpg"
+          ]
+        });
+      }
+    } else {
+      const wallLines = [];
+      const winLines = [];
+      lines.forEach((line) => {
+        if (line.userData.isWindow) winLines.push(line);
+        else if (!line.userData.isBayWindow) wallLines.push(line);
+      });
+      this.manager.add({
+        type: "wall",
+        lines: wallLines
+      });
+      this.manager.add({
+        type: "window",
+        lines: winLines
       });
     }
     return [];
@@ -8340,6 +8433,24 @@ class ThreeVJiaJson extends HandlerFlow {
   balconyRailing({ lines }) {
     return lines;
   }
+  findRooms(lines) {
+    lines = lineSegmentClipping(lines, 0);
+    LineSegment.groupByPath(lines).forEach((group2, i) => {
+      const removeSet = findDiscretePointLine2(group2, null, true);
+      lines = group2.filter((line) => !removeSet.has(line) && !line.userData.isBayWindow);
+      const doors = lines.filter((line) => line.userData.isDoor), maxiCircles2 = new MaxiCircles(), { circles } = maxiCircles2.miniCircle(lines, { circleEdges: doors, side: Side.IN }), ploys = circles.map(((p2) => Polygon.fromByLinePath(p2)));
+      ploys.forEach((ploy) => {
+        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);
+        drawPoint(center);
+      });
+    });
+  }
   /** 装换
    * @returns 
    */
@@ -8350,7 +8461,7 @@ class ThreeVJiaJson extends HandlerFlow {
       communityName: "",
       city: "",
       province: "",
-      height: 0,
+      height: this.maxHeight,
       walls: [],
       pillars: [],
       beams: [],
@@ -8367,13 +8478,14 @@ class ThreeVJiaJson extends HandlerFlow {
         type: "LINE",
         isDoor: false,
         loadBearingWall: false,
-        height: line.userData.height ?? DEFAULT_WALL_HEIGHT
+        // height: line.userData.height ?? DEFAULT_WALL_HEIGHT
+        height: this.maxHeight
       });
     });
     return option;
   }
 }
-function lineDataToThreeVJiaJson$1(lineSegments, angle = 0, updateGroup = true) {
+function lineDataToThreeVJiaJson(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) => {
@@ -8381,10 +8493,24 @@ function lineDataToThreeVJiaJson$1(lineSegments, angle = 0, updateGroup = true)
         point2.rotate(center, angle2);
         windowItem.p = point2.toJson(windowItem.p.z);
       });
+    } else if (line.userData.isPassageEntrance) {
+      line.userData.passageEntrance?.forEach((item) => {
+        const point2 = Point.from(item.p);
+        point2.rotate(center, angle2);
+        item.p = point2.toJson(item.p.z);
+      });
+    }
+  });
+  const heights = [DEFAULT_WALL_HEIGHT];
+  lineSegments.forEach((line) => {
+    if (line.userData.isDoor) heights.push(line.userData.height ?? 0);
+    else if (line.userData.isWindow) {
+      line.userData.drawWindow?.forEach((item) => heights.push(item.height ?? 0));
     }
   });
+  const maxHeight = Math.max(...heights);
   if (updateGroup) lineSegments = DoubleWallHelper.buildGroup(lineSegments);
-  const threeVJiaJson = new ThreeVJiaJson(lineSegments);
+  const threeVJiaJson = new ThreeVJiaJson(lineSegments, maxHeight);
   return {
     lines: [],
     toJson(name = "测试", communityName = "") {
@@ -8499,6 +8625,9 @@ LoadModel.addNameMap("window", "窗户");
 LoadModel.addNameMap("wall", "单线墙");
 LoadModel.addNameMap("doubleWall", "双线墙");
 LoadModel.addNameMap("balcony", "阳台");
+LoadModel.addNameMap("balconyFilm", "阳台片");
+LoadModel.addNameMap("balconyFilmFilm", "阳台片片");
+LoadModel.addNameMap("balconyFilmFilmFilm", "阳台片片片");
 class BayWindow {
   bayWindowExpansion = [];
   dottedLinePoints = [];
@@ -10055,6 +10184,8 @@ class Scenario {
   }
   // 安装阳台
   installBalconys(data, index2) {
+    let balconyGroup = new Group$1();
+    balconyGroup.name = `阳台${index2}`;
     const point1 = new THREE.Vector3(data.start.x, data.start.y, 0);
     const point2 = new THREE.Vector3(data.end.x, data.end.y, 0);
     new THREE.Vector3(data.center.x, data.center.y, 0);
@@ -10066,19 +10197,57 @@ class Scenario {
     const wallWidth = data.userData.wallWidth ? data.userData.wallWidth : 0.18;
     (data.userData.groundClearance ?? this.WindowGroundHeight) + this.height;
     let menModel = this.balconyModely.clone();
-    if (data.center && distance2) {
-      menModel.position.set(data.center.x, data.center.y, 0);
-      const box32 = new THREE.Box3();
-      box32.setFromObject(menModel);
-      let size2 = new THREE.Vector3();
-      box32.getSize(size2);
-      menModel.rotation.x = Math.PI / 2;
-      menModel.rotation.y = angleRad;
-      menModel.scale.set(distance2 / size2.x, height / size2.y, wallWidth / size2.z);
-      menModel.position.set(data.center.x, data.center.y, this.height);
-      menModel.name = `阳台_${index2}`;
-      menModel.userData.category = "balcony";
-      this.group.add(menModel);
+    if (distance2 < 1.2) {
+      if (data.center && distance2) {
+        menModel.position.set(data.center.x, data.center.y, 0);
+        const box32 = new THREE.Box3();
+        box32.setFromObject(menModel);
+        let size2 = new THREE.Vector3();
+        box32.getSize(size2);
+        menModel.rotation.x = Math.PI / 2;
+        menModel.rotation.y = angleRad;
+        menModel.scale.set(distance2 / size2.x, height / size2.y, wallWidth / size2.z);
+        menModel.position.set(data.center.x, data.center.y, this.height);
+        menModel.name = `阳台_${index2}`;
+        menModel.userData.category = "balcony";
+        balconyGroup.add(menModel);
+        this.group.add(balconyGroup);
+      }
+    } else {
+      let splitLineInto7Points = function(startPoint, endPoint) {
+        const points2 = [];
+        const startVec = new THREE.Vector3(startPoint.x, startPoint.y, startPoint.z);
+        const endVec = new THREE.Vector3(endPoint.x, endPoint.y, endPoint.z);
+        for (let i = 0; i <= npc; i++) {
+          const fraction = i / npc;
+          const point3 = new THREE.Vector3();
+          point3.lerpVectors(startVec, endVec, fraction);
+          points2.push(point3);
+        }
+        return points2;
+      };
+      let npc = 0;
+      npc = distance2 / 0.8;
+      npc = Math.round(npc);
+      const points = splitLineInto7Points(point1, point2);
+      for (let o = 0; o < points.length - 1; o++) {
+        const spacing = points[o].distanceTo(points[o + 1]);
+        const center = new THREE.Vector3();
+        center.lerpVectors(points[o], points[o + 1], 0.5);
+        let balconyModel = this.balconyModely.clone();
+        const box32 = new THREE.Box3();
+        box32.setFromObject(menModel);
+        let size2 = new THREE.Vector3();
+        box32.getSize(size2);
+        balconyModel.rotation.x = Math.PI / 2;
+        balconyModel.rotation.y = angleRad;
+        balconyModel.scale.set(spacing / size2.x, height / size2.y, wallWidth / size2.z);
+        balconyModel.position.set(center.x, center.y, this.height);
+        balconyModel.name = `阳台_${index2}`;
+        balconyModel.userData.category = "balcony";
+        balconyGroup.add(balconyModel);
+      }
+      this.group.add(balconyGroup);
     }
   }
   // 放置柜子
@@ -10517,7 +10686,7 @@ class Scenario {
   }
   // 获取阳台模型
   async balconyModelLoader() {
-    this.balconyModely = await LoadModel.loadGlb("balcony");
+    this.balconyModely = await LoadModel.loadGlb("balconyFilmFilmFilm");
   }
   damian() {
     const planeGeometry = new THREE.BufferGeometry();
@@ -18646,6 +18815,52 @@ const PRE_PROCESSOR = {
     console.log(`外墙外扩总消耗时间： ${(performance.now() - t2).toFixed(2)} ms 处理线段数量：`, lines.length);
     return lines;
   },
+  /** 双线墙对齐单线墙
+   * @param lines 
+   * @returns 
+   */
+  DoubleWallAlignment(lines) {
+    const singleWall = lines.filter((line) => !LineGroupType.hasType(line, "doubleWall") && !line.userData.isDoor), doorLines = lines.filter((line) => line.userData.isDoor), grid = createPointVirtualGrid(singleWall.filter((line) => !line.userData.isDoor)), quadtree = createQuadtree(singleWall), doubleWalls = LineGroupType.getGroupsByType(lines, "doubleWall"), offset2 = -DEFAULT_WALL_WIDTH * 0.5, tree = createQuadtree(doubleWalls.flat());
+    const newDoubleWalls = doubleWalls.flatMap((doubleWall) => {
+      const poly = Polygon.fromByLines2(doubleWall);
+      Polygon.ensureCCW(poly);
+      doubleWall = poly.toLines();
+      doubleWall.forEach((line) => {
+        const list = tree.queryCircle(line.center, 1e-6);
+        if (list.length) line.userData = list[0].line.userData;
+      });
+      const expLines = doubleWall.filter((line) => {
+        if (line.length() < 1e-3) return false;
+        for (let i = 0; i < line.points.length; i++) {
+          const point2 = line.points[i];
+          let list = grid.queryPoint(point2);
+          if (list.length !== 1) continue;
+          list = grid.queryPoint(point2).filter((item) => item.userData?.parallel(line));
+          if (list.length !== 1) continue;
+          return true;
+        }
+        return false;
+      });
+      const newLines = expLines.flatMap((line) => {
+        const normal = line.normal(), oldLine = line.clone(), id = LineGroupType.getIdByType(line, "doubleWall");
+        line.directionMove(normal, offset2);
+        return [
+          new LineSegment(oldLine.start.clone(), line.start.clone()),
+          new LineSegment(oldLine.end.clone(), line.end.clone())
+        ].filter((l) => {
+          LineGroupType.set(l, id, "doubleWall");
+          return quadtree.queryPoint(l.center).length === 0;
+        });
+      });
+      return [newLines, doubleWall].flat(10);
+    });
+    lines = [singleWall, newDoubleWalls].flat(10);
+    lines = LineSegmentUndirectedGraph.breakpointMerging(lines, mergeLineUserData);
+    lines = lineSegmentClipping(lines, 1e-9);
+    lines = buildDoubleWallGroup(lines, lines.filter((line) => line.userData.isDoor), true, true);
+    lines.push(...doorLines);
+    return lines;
+  },
   /** 图形角度修正
    * @param lines 
    * @returns 
@@ -18738,12 +18953,55 @@ const PRE_PROCESSOR = {
     lineSegments.push(...appendLines);
     return lineSegments;
   },
-  /** 
+  /** 门点纠值
    * @param lineSegments 
    * @returns 
    */
   DoorPointCorr(lineSegments) {
     return lineSegments;
+  },
+  /** 短连接合并
+   * @description 合并链接两条平行线的短线段，且两条平行线的至少有一条线段另一个端点只有一条与之相连的线段且垂直
+   */
+  shortLinkMerging(lineSegments) {
+    const minWidth = 0.05, grid = createPointVirtualGrid(lineSegments), shortLines = lineSegments.filter((line) => line.length() < minWidth);
+    const removeLines = /* @__PURE__ */ new Set();
+    for (let i = 0; i < shortLines.length; i++) {
+      const line = shortLines[i];
+      const intersLines = [];
+      for (let j = 0; j < 2; j++) {
+        const point2 = line.points[j];
+        const list = grid.queryPoint(point2, true);
+        if (list.length != 1) break;
+        const line2 = list[0].userData;
+        if (!line2.vertical(line)) break;
+        intersLines.push([line2, list[0].point]);
+      }
+      if (intersLines.length === 2) {
+        for (let i2 = 0; i2 < 2; i2++) {
+          const [line2, point2] = intersLines[i2], [_, point3] = intersLines[i2 === 0 ? 1 : 0], otherPoint = line2.getAnotherPoint(point2), list = grid.queryPoint(otherPoint, true);
+          if (list.length == 1 && list[0].userData?.vertical(line2)) {
+            const line4 = list[0].userData;
+            const newP = line4.projectPoint(point3);
+            if (newP) {
+              point3.copy(newP);
+              list[0].point.copy(newP);
+              removeLines.add(line);
+              removeLines.add(line2);
+              break;
+            }
+          }
+        }
+      }
+    }
+    return lineSegments.filter((line) => !removeLines.has(line));
+  },
+  /**
+   * 移除与双线墙链接的短线段
+   */
+  removeShortDoubleWall(lineSegments) {
+    const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall"), freePointLines = [...findDiscretePointLine2(lineSegments)].filter((line) => line.length() < 0.3), grid = createPointVirtualGrid(doubleWalls.flat(4)), lines = freePointLines.filter((line) => grid.queryPoint(line.start).length > 0 || grid.queryPoint(line.end).length > 0), removeSet = new Set(lines);
+    return lineSegments.filter((line) => !removeSet.has(line));
   }
 };
 class Dxf extends Component {
@@ -18968,6 +19226,7 @@ class CorrectionDxf extends Dxf {
   onAddFromParent(parent) {
     parent.Dxf.addEventListener("cadChange", (e) => {
       e.options.trajectory && this.addPreProcessor(PRE_PROCESSOR.BoundExt);
+      this.addPreProcessor(PRE_PROCESSOR.DoubleWallAlignment);
       const lines = parent.Dxf.getLineSegments(true);
       this.set(lineDataToOriginalData(lines, parent.Dxf.originalZAverage), {
         trajectory: e.options.trajectory,
@@ -19056,139 +19315,6 @@ 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 = [];
@@ -19207,7 +19333,7 @@ class ThreeVJia extends Component {
   updateData() {
     if (!this.neededUpdate) return;
     const angleCorrectionDxf = this.parent?.findComponentByName("CorrectionDxf");
-    this.cacheJson = lineDataToThreeVJiaJson(angleCorrectionDxf.getLineSegments(), 0).toJson();
+    this.cacheJson = lineDataToThreeVJiaJson(angleCorrectionDxf.getLineSegments(), angleCorrectionDxf.angle).toJson();
     this.neededUpdate = false;
   }
   /** 转为json
@@ -19328,7 +19454,7 @@ function drawLines$1(lines, parameters, offset2 = 1e-3) {
     }
   }
 }
-function drawPoint(point2, parameters, offset2 = 1e-3) {
+function drawPoint$1(point2, parameters, offset2 = 1e-3) {
   const dxfSystem = DxfSystem.finalInstance;
   if (dxfSystem) {
     const renderer = dxfSystem.findComponentByName("Renderer");
@@ -21416,7 +21542,7 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   findVerticalReference,
   gltf,
   lineDataToOriginalData,
-  lineDataToThreeVJiaJson: lineDataToThreeVJiaJson$1,
+  lineDataToThreeVJiaJson,
   lineSegmentClipping,
   mergeLineUserData,
   mergeWindow,
@@ -21516,7 +21642,7 @@ class Log {
 }
 if (typeof window !== "undefined") {
   window.drawLines = drawLines$1;
-  window.drawPoint = drawPoint;
+  window.drawPoint = drawPoint$1;
   window.drawText = drawText$1;
   window.randomColor = () => Math.floor(Math.random() * 16777215);
   window.Log = Log;
@@ -21590,7 +21716,10 @@ async function buildJson(opt) {
     }
   }
   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 (opt.axisAlignCorr !== false) {
+    dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.AxisAlignCorr);
+    dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.shortLinkMerging);
+  }
   if (trajectory) {
     if (typeof trajectory === "string") {
       if (typeof global !== "undefined") {

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

@@ -7,7 +7,7 @@ import { Dxf } from './Dxf';
  */
 export declare class CorrectionDxf<TEventMap extends {} = {}> extends Dxf<{} & TEventMap> {
     static name: string;
-    static readonly PRE_PROCESSOR: Record<"DoorFind" | "DoorPointCorr" | "DoorSpaceHandle" | "clipDoubleWall" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", (lines: import('../..').LineSegment[], option: SetDataOption, ...arg: any[]) => import('../..').LineSegment[]>;
+    static readonly PRE_PROCESSOR: Record<"DoorFind" | "shortLinkMerging" | "removeShortDoubleWall" | "DoorPointCorr" | "DoorSpaceHandle" | "clipDoubleWall" | "AxisAlignCorr" | "BoundExt" | "DoubleWallAlignment" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", (lines: import('../..').LineSegment[], option: SetDataOption, ...arg: any[]) => import('../..').LineSegment[]>;
     rotateCorrCad?: CAD;
     angle: number;
     constructor();

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

@@ -5,7 +5,7 @@ import { Quadtree } from '../../Quadtree';
 import { SetDataOption, DataItem, LineUserData, OriginalDataItem, Unit } from '../type';
 import { CAD } from '../utils/CAD';
 type PreProcessor = (lines: LineSegment[], option: SetDataOption, ...arg: any[]) => LineSegment[];
-type PreProcessorType = "DoorFind" | "DoorPointCorr" | "DoorSpaceHandle" | "clipDoubleWall" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine";
+type PreProcessorType = "DoorFind" | "shortLinkMerging" | "removeShortDoubleWall" | "DoorPointCorr" | "DoorSpaceHandle" | "clipDoubleWall" | "AxisAlignCorr" | "BoundExt" | "DoubleWallAlignment" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine";
 /**
  * 默认提供的预处理函数
  */

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/lineDataToThreeVJiaJsonOld';
+import { ThreeVJiaJsonObject } from '../utils/lineDataToThreeVJiaJson';
 /**
  * 转为 三维家 墙体结构
  */

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

@@ -29,6 +29,7 @@ export type WallLineGlobalOption = {
     isDoor?: boolean;
     doorAutomaticFind?: boolean;
     doorDirectConnection?: boolean;
+    isPassageEntrance?: boolean;
     topClearance?: number;
     isVerticalReferenceLine?: boolean;
     insetionArr?: {
@@ -74,6 +75,19 @@ export type WallLineGlobalOption = {
         groundClearance: number;
         sillHeight?: number;
     };
+    passageEntrance?: {
+        p: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        width: number;
+        full: boolean;
+        rooftopPz?: number;
+        uuid?: string;
+        height?: number;
+        groundClearance?: number;
+    }[];
 };
 export type LineUserData = {
     quadtreeNode?: QuadtreeNode;

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

@@ -0,0 +1,18 @@
+import { LineSegment } from '../../LineSegment';
+import { LineUserData } from '../type';
+import { PointVirtualGrid } from '../../PointVirtualGrid';
+/**
+ * @param line
+ */
+export declare function peDrawLine(line: LineSegment<LineUserData>, grid?: PointVirtualGrid): LineSegment<any>[] | null;
+/** 获取双线窗户线段
+ * @param lines
+ * @returns
+ */
+export declare function doublePEDrawLine(lines: LineSegment<LineUserData>[]): LineSegment<any>[] | null;
+/** 获取窗户线段
+ * @param doubleWallGroup
+ * @param wall
+ * @returns
+ */
+export declare function getWinDrawData(doubleWallGroup: LineSegment[][], wall: LineSegment[], lines?: LineSegment<LineUserData>[]): LineSegment<Record<string, any>>[];

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

@@ -51,7 +51,10 @@ export type ThreeVJiaJsonObject = {
 export declare class ThreeVJiaJson extends HandlerFlow<ThreeVJiaJsonObject> {
     manager: WallGroupManager;
     index: number;
-    constructor(lines: LineSegment[]);
+    version: string;
+    maxHeight: number;
+    lines: LineSegment[];
+    constructor(lines: LineSegment[], maxHeight: number);
     /** 双线墙处理
      * @param param0
      * @returns
@@ -66,7 +69,7 @@ export declare class ThreeVJiaJson extends HandlerFlow<ThreeVJiaJsonObject> {
      * 门线处理
      * @param param0
      */
-    doorHandle({ lines }: IGroup, option?: ThreeVJiaJsonObject): never[];
+    doorHandle({ lines }: IGroup, option?: ThreeVJiaJsonObject): LineSegment<LineUserData>[];
     /**
      * 窗线处理
      * @param param0
@@ -82,6 +85,7 @@ export declare class ThreeVJiaJson extends HandlerFlow<ThreeVJiaJsonObject> {
      * @returns
      */
     balconyRailing({ lines }: IGroup<IDrawBayWindowData>): LineSegment<LineUserData>[];
+    findRooms(lines: LineSegment<LineUserData>[]): void;
     /** 装换
      * @returns
      */

package/src/utils/Polygon.d.ts

@@ -28,6 +28,11 @@ export declare class Polygon<T = any> extends Array<Point<T>> {
      */
     area(): number;
     closedLoop(): boolean;
+    /** 闭合路径向路径外膨胀width
+     * @param width
+     */
+    closedExpansion(width: number, scale?: number): this | null;
+    clipByLine(line: LineSegment): Polygon<Record<string, any>>[];
     /**
      * 获取点相对于多边形的位置
      * @param point