build-dxf 0.1.16 → 0.1.17

package/package.json

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

package/src/build.js

@@ -1491,7 +1491,7 @@ class LineSegment {
     const p3 = line.start;
     const p4 = line.end;
     const denom = (p1.x - p2.x) * (p3.y - p4.y) - (p1.y - p2.y) * (p3.x - p4.x);
-    if (Math.abs(denom) < 1e-10) {
+    if (Math.abs(denom) < 1e-9) {
       return null;
     }
     const t = ((p1.x - p3.x) * (p3.y - p4.y) - (p1.y - p3.y) * (p3.x - p4.x)) / denom;
@@ -1896,22 +1896,29 @@ class LineSegment {
       if (start.point.distance(end.point) < distanceThreshold) return [group2];
       const maxList = [...list].sort((a, b) => b.line.length() - a.line.length()), first = maxList[0], second = maxList[1], firstLength = first.line.length(), secondLength = second.line.length(), projLine = first.line.projectLineSegment(second.line), projLineLength = projLine.length();
       if (first.point.distance(second.point) > distanceThreshold || secondLength / firstLength > 0.5 && projLineLength / secondLength < 0.5) {
-        const group1 = [first.line], group22 = [second.line];
+        const group12 = [first.line], group222 = [second.line];
         for (let i = 0; i < list.length; i++) {
           const opt = list[i];
           if (opt === first || opt === second) continue;
           const currentProjectLine = second.line.projectLineSegment(opt.line), len = currentProjectLine.length();
-          if (second.point.distance(opt.point) <= distanceThreshold && len / secondLength > 0) group22.push(opt.line);
-          else group1.push(opt.line);
+          if (second.point.distance(opt.point) <= distanceThreshold && len / secondLength > 0) group222.push(opt.line);
+          else group12.push(opt.line);
         }
-        return [group1, group22];
-      }
-      let index2 = 1;
-      for (; index2 < list.length; index2++) {
-        const { point: point2 } = list[index2];
-        if (list[0].point.distance(point2) > distanceThreshold) break;
+        return [group12, group222];
+      }
+      const group1 = [list[0].line], group22 = [], startV = principalAxisStartMap.get(list[0].line) ?? 0, endV = principalAxisEndMap.get(list[0].line) ?? 0, min = startV < endV ? startV : endV, max = startV > endV ? startV : endV;
+      for (let i = 1; i < list.length; i++) {
+        const { point: point2, line } = list[i];
+        if (list[0].point.distance(point2) < distanceThreshold) {
+          const startV2 = principalAxisStartMap.get(line) ?? 0, endV2 = principalAxisEndMap.get(line) ?? 0;
+          if (min <= startV2 && startV2 <= max || min <= endV2 && endV2 <= max) {
+            group1.push(list[i].line);
+            continue;
+          }
+        }
+        group22.push(list[i].line);
       }
-      return [list.slice(0, index2).map((o) => o.line), list.slice(index2).map((o) => o.line)];
+      return [group1, group22];
     }).flat(1);
     return groups;
   }
@@ -3616,7 +3623,7 @@ function clippingDoubleWall(lines) {
   }
   return groups;
 }
-const defaultWallWidth$1 = DEFAULT_WALL_WIDTH;
+const defaultWallWidth = DEFAULT_WALL_WIDTH;
 function doubleWallPoint(grid, line) {
   const startList = grid.queryPoint(line.start, true).map((item) => {
     if (LineGroupType.hasType(item.userData, "doubleWall")) return "doubleWall";
@@ -3636,11 +3643,11 @@ function doubleWallPoint(grid, line) {
 function winDrawLine(line, grid) {
   if (line.userData.isWindow && Array.isArray(line.userData.drawWindow)) {
     mergeWindow(line);
-    const list = grid && doubleWallPoint(grid, line), dwh = defaultWallWidth$1 * 0.5;
+    const list = grid && doubleWallPoint(grid, line), dwh = defaultWallWidth * 0.5;
     return line.userData.drawWindow.map(({ full, width, p, height, groundClearance }) => {
       if (full) width = line.length();
       const point2 = Point.from(p), direct = line.direction(), winLine = point2.expandAsLine(direct, width).directionMove(direct, -width * 0.5);
-      winLine.userData = { wallWidth: defaultWallWidth$1, height, groundClearance };
+      winLine.userData = { wallWidth: defaultWallWidth, height, groundClearance };
       winLine.start.copy(line.projectPoint(winLine.start, false));
       winLine.end.copy(line.projectPoint(winLine.end, false));
       if (!list) return winLine;
@@ -3655,7 +3662,7 @@ function winDrawLine(line, grid) {
         winLine.endShrink(diff);
       }
       return winLine;
-    }).filter((line2) => line2.length() > defaultWallWidth$1);
+    }).filter((line2) => line2.length() > defaultWallWidth);
   }
   return null;
 }
@@ -3680,7 +3687,7 @@ function doubleWinDrawLine(lines) {
     }
     winLine2.userData = { wallWidth, height, groundClearance };
     return winLine2;
-  }) ?? []).filter((line) => line.length() > defaultWallWidth$1);
+  }) ?? []).filter((line) => line.length() > defaultWallWidth);
 }
 function getWinDrawData(doubleWallGroup, wall, lines = []) {
   const grid = new PointVirtualGrid();
@@ -3737,7 +3744,6 @@ class Group {
     return group2;
   }
 }
-const defaultWallWidth = 0.12;
 const units = {
   Unitless: 1,
   // 无单位，1米 = 1（无单位）
@@ -3807,32 +3813,6 @@ class CAD {
     this.needUpdate = true;
     return groups.map((lines) => this.addGroup(lines, type));
   }
-  /** 添加组并执行偏移
-   * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
-   */
-  addGroupByOffset2(lines, joinType = "jtMiter", endType = "etOpenButt", scale = 1e5) {
-    const groups = LineSegment.groupByPoint(lines);
-    const polygons = groups.flatMap((group2) => Polygon.multipleFromByLines(group2));
-    for (let i = 0; i < polygons.length; i++) {
-      const polygon2 = polygons[i];
-      polygon2.forEach((p) => p.multiplyScalar(scale));
-      let solutions = new ClipperLib.Paths();
-      const offset2 = new ClipperLib.ClipperOffset(2, 0.25);
-      offset2.AddPath(
-        polygon2,
-        ClipperLib.JoinType[joinType],
-        ClipperLib.EndType[endType]
-      );
-      offset2.Execute(solutions, defaultWallWidth / 2 * scale);
-      solutions = solutions.map((solution) => solution.map((p) => Point.from(p).multiplyScalar(1 / scale)));
-      solutions.forEach((solution) => {
-        const polygon22 = new Polygon(solution);
-        this.addGroup(polygon22.toLines(true), "groupOffset", { polygon: polygon22 });
-      });
-    }
-    this.needUpdate = true;
-    return this;
-  }
   /** 添加组并执行偏移
    * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
    */
@@ -3850,7 +3830,7 @@ class CAD {
         ClipperLib.EndType[endType]
       );
     }
-    offset2.Execute(solutions, defaultWallWidth / 2 * scale);
+    offset2.Execute(solutions, DEFAULT_WALL_WIDTH / 2 * scale);
     solutions = solutions.map((solution) => solution.map((p) => Point.from(p).multiplyScalar(1 / scale)));
     solutions.forEach((solution) => {
       const polygon2 = new Polygon(solution);
@@ -4283,7 +4263,7 @@ class DxfDrawPlugin {
         group2.lines.forEach((lineSegment) => {
           if (lineSegment.length() < 0.4) return;
           const line = lineSegment.clone();
-          const doorThickness = defaultWallWidth * 0.2;
+          const doorThickness = DEFAULT_WALL_WIDTH * 0.2;
           const list = [];
           setColor("cyan");
           if (line.length() < 1.2) {
@@ -4303,12 +4283,12 @@ class DxfDrawPlugin {
                 break;
               }
             }
-            door.expansion(-doorThickness * 0.5).expandToRectangle(defaultWallWidth * 0.2, "bothSides").path2D((p1, p2) => drawLine(p1, p2));
+            door.expansion(-doorThickness * 0.5).expandToRectangle(DEFAULT_WALL_WIDTH * 0.2, "bothSides").path2D((p1, p2) => drawLine(p1, p2));
             const a = line.length(), b = door.length(), r = (a ** 2 + b ** 2) / (2 * b), center = door.end.clone().add(door.direction().multiplyScalar(-r)), [startAngle, endAngle] = this.getArcAngleRange(center, line.end, door.end);
             drawArc(center, r, Math.min(startAngle, endAngle), Math.max(startAngle, endAngle));
             list.push(box);
           } else {
-            line.clone().expansion(-defaultWallWidth * 0.5).expandToRectangle(defaultWallWidth).path2D((p1, p2) => drawLine(p1, p2));
+            line.clone().expansion(-DEFAULT_WALL_WIDTH * 0.5).expandToRectangle(DEFAULT_WALL_WIDTH).path2D((p1, p2) => drawLine(p1, p2));
             line.clone().directionMove(line.normal(), doorThickness * 0.5).directionMove(line.direction(), doorThickness * 0.5).expansion(-line.length() * 0.45, "end").forward(doorThickness * 0.5).expandToRectangle(doorThickness).path2D((p1, p2) => drawLine(p1, p2));
             line.clone().directionMove(line.normal(), -doorThickness * 0.5).directionMove(line.direction(), -doorThickness * 0.5).expansion(-line.length() * 0.45, "start").forward(-doorThickness * 0.5).expandToRectangle(doorThickness).path2D((p1, p2) => drawLine(p1, p2));
           }
@@ -4321,7 +4301,7 @@ class DxfDrawPlugin {
         setColor("yellow");
         group2.lines.forEach((line) => {
           drawLine(line.start, line.end);
-          line.expandToRectangle(line?.userData?.wallWidth ?? defaultWallWidth, "bothSides").path2D((p1, p2) => drawLine(p1, p2));
+          line.expandToRectangle(line?.userData?.wallWidth ?? DEFAULT_WALL_WIDTH, "bothSides").path2D((p1, p2) => drawLine(p1, p2));
         });
       }
     });
@@ -4330,7 +4310,7 @@ class DxfDrawPlugin {
       handler({ drawDottedLine, setColor, group: group2 }) {
         group2.lines.forEach((line) => {
           setColor("yellow");
-          line = line.clone().expansion(-defaultWallWidth * 0.5);
+          line = line.clone().expansion(-DEFAULT_WALL_WIDTH * 0.5);
           drawDottedLine(line.start, line.end);
         });
       }
@@ -4368,10 +4348,10 @@ class DxfDataPlugin {
     doors.forEach((line) => {
       const startList = quadtree.queryPoint(line.start).filter((item) => item.line !== line && item.line.vertical(line, 35)), endList = quadtree.queryPoint(line.end).filter((item) => item.line !== line && item.line.vertical(line, 35)), direct = line.direction();
       if (startList.length && !startList.some((item) => LineGroupType.hasType(item.line, "doubleWall"))) {
-        line.start.add(direct.clone().multiplyScalar(defaultWallWidth * 0.5));
+        line.start.add(direct.clone().multiplyScalar(DEFAULT_WALL_WIDTH * 0.5));
       }
       if (endList.length && !endList.some((item) => LineGroupType.hasType(item.line, "doubleWall"))) {
-        line.end.add(direct.clone().multiplyScalar(-defaultWallWidth * 0.5));
+        line.end.add(direct.clone().multiplyScalar(-DEFAULT_WALL_WIDTH * 0.5));
       }
     });
     cad.addGroupByOffset(wall);
@@ -4945,6 +4925,9 @@ class DoubleWallHelper {
       quadtree
     };
   }
+  // static findDoubleLine2( lines: LineSegment<LineUserData>[], wallWidth = 0.4 ) {
+  //     // LineSegment.groupByAxis()
+  // }
   /** 
    * @param lines 
    * @param wallWidth 
@@ -5008,42 +4991,44 @@ class DoubleWallHelper {
     quadtree.clear();
     return lines;
   }
-}
-function shortDistanceLink(lines, radius = 0.1, pointVirtualGrid) {
-  if (!pointVirtualGrid) {
-    pointVirtualGrid = new PointVirtualGrid();
-    lines.forEach((line) => {
-      if (line.userData.isDoor) return;
-      line.points.forEach((p) => pointVirtualGrid?.insert(p, line));
+  /**
+   * 创建分组
+   */
+  static buildGroup(lineSegments) {
+    const doors = [];
+    lineSegments = lineSegments.filter((line) => {
+      if (line.userData.isDoor) {
+        doors.push(line);
+        return false;
+      }
+      return true;
     });
+    lineSegments = buildDoubleWallGroup(lineSegments);
+    lineSegments = this.complementSide(lineSegments);
+    lineSegments = buildDoubleWallGroup(lineSegments, doors, true, true);
+    return [...lineSegments, ...doors];
   }
-  const appendLines = [], visited = /* @__PURE__ */ new Set();
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i], distanceMap = /* @__PURE__ */ new Map();
+}
+function shortDistanceLink(lines, radius = 0.1) {
+  const dpLines = [...findDiscretePointLine2(lines.filter((line) => !line.userData.isDoor), void 0, false)], pointVirtualGrid = createPointVirtualGrid(dpLines), appendLines = [], visited = /* @__PURE__ */ new Set();
+  const getWeight2 = (target, point2, line) => {
+    if (target.weight) return target.weight;
+    const targetLine = target.userData, targetPoint = target.point;
+    const direct1 = line.getAnotherPoint(point2).direction(point2), direct2 = targetLine.getAnotherPoint(targetPoint).direction(targetPoint), direct3 = targetPoint.direction(point2), angle = direct1.angleBetween(direct2), angle2 = direct1.angleBetween(direct3), length = point2.distance(target.point), weight = 1 - length / radius + angle / Math.PI * 1.2 + (1 - angle2 / Math.PI) * 1.2;
+    target.weight = weight;
+    return weight;
+  };
+  for (let i = 0; i < dpLines.length; i++) {
+    const line = dpLines[i];
     if (line.userData.isDoor) continue;
     line.points.forEach((point2) => {
       if (visited.has(point2)) return false;
-      if (pointVirtualGrid.queryPoint(point2).length > 1) return;
-      const list = pointVirtualGrid.queryCircle(point2, radius).filter((item) => {
-        if (visited.has(item.point)) return false;
-        const resLine = item.userData;
-        if (resLine === line || !line.parallel(resLine, 25)) return false;
-        if (pointVirtualGrid.queryPoint(item.point).length > 1) return false;
-        const distance = point2.distance(item.point);
-        if (distance < 1e-3) return false;
-        const direct1 = point2.direction(line.getAnotherPoint(point2)), direct2 = item.point.direction(resLine.getAnotherPoint(item.point));
-        if (180 - direct1.angleBetween(direct2, "angle") < 25) {
-          distanceMap.set(item.point, distance);
-          return true;
-        }
-      }).sort((a, b) => {
-        const aDistance = distanceMap.get(a.point), bDistance = distanceMap.get(b.point);
-        return aDistance - bDistance;
-      });
+      const list = pointVirtualGrid.queryCircle(point2, radius, true).map((item) => Object.assign({}, item)).sort((a, b) => getWeight2(b, point2, line) - getWeight2(a, point2, line));
       if (list.length === 0) return;
-      visited.add(point2);
-      visited.add(list[0].point);
+      const { point: targetPoint } = list[0];
       const targetLine = list[0].userData;
+      visited.add(point2);
+      visited.add(targetPoint);
       const projectLine1 = line.projectLineSegment(targetLine), projectLine2 = targetLine.projectLineSegment(line), len1 = projectLine1.length(), len2 = projectLine2.length();
       if (len1 === 0 && len2 === 0) appendLines.push(new LineSegment(point2.clone(), list[0].point.clone()));
       else appendLines.push(new LineSegment(projectLine1.center, projectLine2.center));
@@ -5068,7 +5053,7 @@ function preprocessing(lines) {
     if (endIntersection.length) door.userData.endIntersection = endIntersection[0].userData;
     else door.userData.endIntersection = quadtree.queryPoint(door.end)[0]?.line;
   });
-  lines = shortDistanceLink(lines, 0.4, pointVirtualGrid);
+  lines = shortDistanceLink(lines, 0.4);
   pointVirtualGrid.clear();
   quadtree.clear();
   return lines;
@@ -5172,170 +5157,12 @@ function correction$1(targettLine, lines, intersectMap, errAngle = 15) {
   delayList.forEach((fun) => fun());
   return { parallelLines, verticalLines, doorLines, windowLines };
 }
-function groupByAxis(lines, principalAxis, crossAxis, principalAxisThreshold, crossAxistThreshold) {
-  const projectPoints = [], crossAxisMap = /* @__PURE__ */ new Map();
-  lines.forEach((line) => {
-    const point2 = crossAxis.projectPoint(line.start, false);
-    if (point2) {
-      point2.userData = line;
-      projectPoints.push(point2);
-      crossAxisMap.set(line, point2);
-    }
-  });
-  projectPoints.sort((a, b) => {
-    return b.distance(crossAxis.start) - a.distance(crossAxis.start);
-  });
-  const groups = [], group2 = [];
-  for (let i = 0; i < projectPoints.length; i++) {
-    const point2 = projectPoints[i];
-    if (i === 0) {
-      group2.push(point2);
-      continue;
-    }
-    const prePoint = projectPoints[i - 1];
-    if (prePoint.distance(point2) < crossAxistThreshold) group2.push(point2);
-    else {
-      groups.push([...group2]);
-      group2.length = 0;
-      group2.push(point2);
-    }
-    if (i === projectPoints.length - 1) groups.push(group2);
-  }
-  return groups.flatMap((group3) => {
-    const points = group3.flatMap((point2) => {
-      const line = point2.userData;
-      return line.points.map((p) => {
-        const point22 = principalAxis.projectPoint(p, false);
-        point22.userData = line;
-        return point22;
-      });
-    });
-    points.sort((a, b) => {
-      return a.distance(principalAxis.start) - b.distance(principalAxis.start);
-    });
-    const map = /* @__PURE__ */ new Map(), newGroup = [];
-    let newGroups = [];
-    points.forEach((point2, i) => {
-      if (map.size === 0 && i > 0) {
-        const prePoint = points[i - 1];
-        if (prePoint.distance(point2) > principalAxisThreshold) {
-          newGroups.push([...newGroup]);
-          newGroup.length = 0;
-        }
-      }
-      map.set(point2.userData, (map.get(point2.userData) ?? 0) + 1);
-      for (const v of map.values()) if (v !== 2) return;
-      newGroup.push(...map.keys());
-      map.clear();
-    });
-    newGroups.push([...newGroup]);
-    return newGroups;
-  });
-}
-function groupByCrossAxis(lines, principalAxis, crossAxis, crossAxistThreshold) {
-  const crossAxisMap = /* @__PURE__ */ new Map(), crossValueList = [], principalAxisStartMap = /* @__PURE__ */ new Map(), principalAxisEndMap = /* @__PURE__ */ new Map();
-  lines.forEach((line) => {
-    const value = crossAxis.projectValue(line.start);
-    const point2 = crossAxis.projectPoint(line.start, false);
-    const opt = { value, line, point: point2, index: -1 };
-    crossAxisMap.set(line, opt);
-    crossValueList.push(opt);
-    line.points.forEach((p, i) => {
-      const value2 = principalAxis.projectValue(p);
-      if (i === 0) principalAxisStartMap.set(line, value2);
-      else principalAxisEndMap.set(line, value2);
-    });
-  });
-  crossValueList.sort((a, b) => b.value - a.value).forEach((item, i) => item.index = i);
-  const unionFindSet = new UnionFindSet(lines.length), lineIndexGenerator = new LineIndexGenerator(lines);
-  function approach(preCrossOpt, crossOpt) {
-    return preCrossOpt.point.distance(crossOpt.point) <= crossAxistThreshold;
-  }
-  function coincide(preCrossOpt, minPrinValue, maxPrinValue) {
-    const prePrinStartV = principalAxisStartMap.get(preCrossOpt.line), prePrinEndV = principalAxisEndMap.get(preCrossOpt.line), minPrePrinValue = prePrinStartV < prePrinEndV ? prePrinStartV : prePrinEndV, maxPrePrinValue = prePrinStartV > prePrinEndV ? prePrinStartV : prePrinEndV;
-    return minPrePrinValue >= minPrinValue && minPrePrinValue <= maxPrinValue || maxPrePrinValue >= minPrinValue && maxPrePrinValue <= maxPrinValue || minPrinValue >= minPrePrinValue && minPrinValue <= maxPrePrinValue || maxPrinValue >= minPrePrinValue && maxPrinValue <= maxPrePrinValue;
-  }
-  for (let i = 0; i < crossValueList.length; i++) {
-    const crossOpt = crossValueList[i], { line } = crossOpt, prinStartV = principalAxisStartMap.get(line), prinEndV = principalAxisEndMap.get(line), minPrinValue = prinStartV < prinEndV ? prinStartV : prinEndV, maxPrinValue = prinStartV > prinEndV ? prinStartV : prinEndV;
-    for (let j = i - 1; j >= 0; j--) {
-      const pre = crossValueList[j];
-      if (approach(pre, crossOpt)) {
-        if (coincide(pre, minPrinValue, maxPrinValue)) {
-          unionFindSet.union(lineIndexGenerator.getIndex(line), lineIndexGenerator.getIndex(pre.line));
-          break;
-        }
-      } else break;
-    }
-  }
-  let groups = unionFindSet.getAllSets().valueArray.map((group2) => group2.map((index2) => lineIndexGenerator.getLine(index2)));
-  groups = groups.map((group2) => {
-    if (group2.length <= 2) return [group2];
-    const list = group2.map((line) => crossAxisMap.get(line)).sort((a, b) => a.value - b.value), start = list[0], end = list[list.length - 1];
-    if (start.point.distance(end.point) < crossAxistThreshold) return [group2];
-    const maxList = [...list].sort((a, b) => b.line.length() - a.line.length()), first = maxList[0], second = maxList[0], firstLength = first.line.length(), secondLength = second.line.length(), projLine = first.line.projectLineSegment(second.line), projLineLength = projLine.length();
-    if (first.point.distance(second.point) > crossAxistThreshold || secondLength / firstLength > 0.5 && projLineLength / secondLength < 0.5) {
-      const group1 = [first.line], group22 = [second.line];
-      for (let i = 0; i < list.length; i++) {
-        const opt = list[i];
-        if (opt === first || opt === second) continue;
-        const currentProjectLine = second.line.projectLineSegment(opt.line), len = currentProjectLine.length();
-        if (second.point.distance(opt.point) <= crossAxistThreshold && len / secondLength > 0) group22.push(opt.line);
-        else group1.push(opt.line);
-      }
-      return [group1, group22];
-    }
-    let index2 = 1;
-    for (; index2 < list.length; index2++) {
-      const { point: point2 } = list[index2];
-      if (list[0].point.distance(point2) > crossAxistThreshold) break;
-    }
-    return [list.slice(0, index2).map((o) => o.line), list.slice(index2).map((o) => o.line)];
-  }).flat(1);
-  return groups;
-}
-function groupByAxisByintersect(lines, intersectionPointInfoMap) {
-  function dfs(line, group2 = /* @__PURE__ */ new Set()) {
-    if (group2.has(line)) return group2;
-    group2.add(line);
-    const infoList = intersectionPointInfoMap.get(line);
-    if (!infoList) return group2;
-    for (let i = 0; i < infoList.length; i++) {
-      const { line: line2, angle } = infoList[i];
-      if (line2.parallel(angle, 0.5)) dfs(line2, group2);
-    }
-    return group2;
-  }
-  const visited = /* @__PURE__ */ new Set(), groups = [];
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (visited.has(line)) continue;
-    const group2 = dfs(line);
-    groups.push([...group2]);
-  }
-  return groups;
-}
-function group(parallelLines, verticalLines, xAxisLine, yAxisLine2, intersectionPointInfoMap, option) {
-  const {
-    principalAxisThreshold = 0.3,
-    crossAxistThreshold = 0.08,
-    groupMethod = "principalAndCross"
-  } = option ?? {};
-  const methods = {
-    cross: () => [
-      ...groupByCrossAxis(parallelLines, yAxisLine2, xAxisLine, crossAxistThreshold),
-      ...groupByCrossAxis(verticalLines, xAxisLine, yAxisLine2, crossAxistThreshold)
-    ],
-    principalAndCross: () => [
-      ...groupByAxis(parallelLines, yAxisLine2, xAxisLine, principalAxisThreshold, crossAxistThreshold),
-      ...groupByAxis(verticalLines, xAxisLine, yAxisLine2, principalAxisThreshold, crossAxistThreshold)
-    ],
-    originalInterPoint: () => [
-      ...groupByAxisByintersect(parallelLines, intersectionPointInfoMap),
-      ...groupByAxisByintersect(verticalLines, intersectionPointInfoMap)
-    ]
-  };
-  if (methods[groupMethod]) return methods[groupMethod]();
-  return methods.originalInterPoint();
+function group(parallelLines, verticalLines, xAxisLine, yAxisLine2, option) {
+  const { crossAxistThreshold = 0.08 } = option ?? {};
+  return [
+    ...LineSegment.groupByCrossAxis(parallelLines, xAxisLine, crossAxistThreshold),
+    ...LineSegment.groupByCrossAxis(verticalLines, yAxisLine2, crossAxistThreshold)
+  ];
 }
 function removeGroupLinkLine(groups, intersectmap) {
   const removeSet = /* @__PURE__ */ new Set();
@@ -5602,7 +5429,7 @@ class AxisAlignCorr {
       center.clone().add(direction.clone().multiplyScalar(-1e3)),
       center.clone().add(direction.clone().multiplyScalar(1e3))
     );
-    let groups = group(parallelLines, verticalLines, xAxisLine, yAxisLine2, intersectionMap, option);
+    let groups = group(parallelLines, verticalLines, xAxisLine, yAxisLine2, option);
     groups = removeGroupLinkLine(groups, intersectionMap);
     let newLines = lineSegmentFitting(groups, 0.1, option);
     newLines = LineSegment.brokenLineMerging(newLines, mergeLineUserData);
@@ -5648,20 +5475,6 @@ function originalDataToLineData(data) {
     verticalReferenceIndex
   };
 }
-function createGroup$1(lineSegments) {
-  const doors = [];
-  lineSegments = lineSegments.filter((line) => {
-    if (line.userData.isDoor) {
-      doors.push(line);
-      return false;
-    }
-    return true;
-  });
-  lineSegments = buildDoubleWallGroup(lineSegments);
-  lineSegments = DoubleWallHelper.complementSide(lineSegments);
-  lineSegments = buildDoubleWallGroup(lineSegments, doors, true, true);
-  return [...lineSegments, ...doors];
-}
 function getIntersection(line, mode, cell) {
   return cell.reduce((list, item, i) => {
     const currentLine = item.userData;
@@ -5716,6 +5529,7 @@ function correction(line, wallWidth = 0.12, appendLines, grid, quadtree) {
   if (line.userData.isDoor) return quadtree.update(line);
   if (!doorIntersection.length) return;
   doorIntersection.forEach(({ line: doorLine }) => {
+    if (line.parallel(doorLine, 25)) return;
     const interPoint = line.getIntersection(doorLine);
     if (!interPoint) return;
     if (doorLine.start.distance(interPoint) < doorLine.end.distance(interPoint)) {
@@ -5794,7 +5608,7 @@ class BoundExt {
    */
   static boundExtbyTraj(opt) {
     let { lines, trajectory, wallWidth = 0.12, updateDoubleWallGroup = false, findCallBack } = opt;
-    if (updateDoubleWallGroup) lines = createGroup$1(lines);
+    if (updateDoubleWallGroup) lines = DoubleWallHelper.buildGroup(lines);
     const trajectoryPoints = Object.keys(trajectory).map((key) => Point.from(trajectory[key]));
     const findLines = BoundExt.findExtWallByTraj(lines, trajectoryPoints);
     let exteriorLines = findLines.filter((line) => line.userData.expandDirect);
@@ -5814,22 +5628,8 @@ class BoundExt {
     };
   }
 }
-function createGroup(lineSegments) {
-  const doors = [];
-  lineSegments = lineSegments.filter((line) => {
-    if (line.userData.isDoor) {
-      doors.push(line);
-      return false;
-    }
-    return true;
-  });
-  lineSegments = buildDoubleWallGroup(lineSegments);
-  lineSegments = DoubleWallHelper.complementSide(lineSegments);
-  lineSegments = buildDoubleWallGroup(lineSegments, doors, true, true);
-  return [...lineSegments, ...doors];
-}
 function getGroups(lines, updateGroup = true) {
-  if (updateGroup) lines = createGroup(lines);
+  if (updateGroup) lines = DoubleWallHelper.buildGroup(lines);
   const map = lines.reduce((map2, line) => {
     const groups = LineGroupType.get(line);
     groups.forEach((group2) => {

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

@@ -0,0 +1,11 @@
+declare const _default: import('vue').DefineComponent<{}, {
+    url: string;
+    type?: string | undefined;
+    $props: {
+        readonly url?: string | undefined;
+        readonly type?: string | undefined;
+    };
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {
+    container: HTMLDivElement;
+}, HTMLDivElement>;
+export default _default;

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

@@ -62,10 +62,6 @@ export declare class CAD {
      * @param type
      */
     addGroups(groups: LineSegmentType[][], type?: string): Group[];
-    /** 添加组并执行偏移
-     * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
-     */
-    addGroupByOffset2(lines: LineSegmentType[], joinType?: JoinType, endType?: EndType, scale?: number): this;
     /** 添加组并执行偏移
      * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
      */

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

@@ -29,5 +29,9 @@ export declare class DoubleWallHelper {
      * @returns
      */
     static complementSide(lines: LineSegment<LineUserData>[], wallWidth?: number): LineSegment<LineUserData>[];
+    /**
+     * 创建分组
+     */
+    static buildGroup(lineSegments: LineSegment<LineUserData>[]): (LineSegment<Record<string, any>> | LineSegment<LineUserData>)[];
 }
 export {};

package/src/utils/GpuComputed.d.ts

@@ -0,0 +1,30 @@
+type ValueType = "number" | "boolean" | "vec2" | "vec3" | "vec4" | "mat3x3" | "mat4x4";
+type OptionType = {
+    workgroup_size?: [number, number, number];
+    structName?: string;
+    dataName?: string;
+    globalInvocationIdName?: string;
+};
+export declare class GpuComputed {
+    constructor();
+    getDevice(): Promise<{
+        adapter: GPUAdapter | null;
+        device: GPUDevice;
+        groupLayout: GPUBindGroupLayout;
+    }>;
+    createPipleline(code: string, buffer: Float32Array<ArrayBuffer>): Promise<void>;
+    buildBuffer(data: Record<string, any>[], keys?: string[], types?: ValueType[]): {
+        buffer: number[];
+        stride: number;
+        layout: {
+            name: string;
+            type: ValueType;
+            offset: number;
+            size: number;
+        }[];
+        count: number;
+    };
+    private buildCode;
+    computed(data: any[], code: string, option?: OptionType): Promise<void>;
+}
+export {};