build-dxf 0.1.76 → 0.1.78

package/package.json

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

package/src/build.js

@@ -1300,6 +1300,9 @@ class LineSegment {
   currentData = {};
   // line: any
   uuid = uuid();
+  get len() {
+    return this.length();
+  }
   get center() {
     return new Point(
       this.points[0].x + (this.points[1].x - this.points[0].x) * 0.5,
@@ -5933,6 +5936,9 @@ var Side = /* @__PURE__ */ ((Side2) => {
   return Side2;
 })(Side || {});
 class MiniCircles {
+  debug = {
+    angle: false
+  };
   /** 通过并查集，查找为环的一部分边
    * @description 
    * @param lines 
@@ -6038,6 +6044,7 @@ class MiniCircles {
         A = B;
         B = minC;
         path.add(mineLie);
+        if (this.debug.angle) drawText(minAngle.toFixed(), mineLie?.center);
       } else return;
     }
   }
@@ -6540,17 +6547,6 @@ class MaxiCircles extends MiniCircles {
 }
 const maxiCircles = new MaxiCircles();
 let trajectory;
-function isPolyHasTrajectoryPoint(lines) {
-  if (!trajectory) return true;
-  const ploy = Polygon.fromByLines2(lines);
-  const box = ploy.getBox2();
-  for (let i = 0; i < trajectory.length; i++) {
-    const p2 = trajectory[i];
-    if (p2.x < box.minX || p2.x > box.maxX || p2.y < box.minY || p2.y > box.maxY) continue;
-    if (ploy.pointWithin(p2)) return false;
-  }
-  return true;
-}
 function isDoublePeDoorCircle(circle) {
   const doors = circle.filter((line) => line.userData.passageEntrance?.some((item) => item.type === "door")), map = /* @__PURE__ */ new Map(), matching = [];
   doors.forEach((door) => {
@@ -6563,8 +6559,20 @@ function isDoublePeDoorCircle(circle) {
   });
   return matching.length > 0;
 }
+function isPolyHasTrajectoryPoint(lines) {
+  if (isDoublePeDoorCircle(lines)) return true;
+  if (!trajectory) return true;
+  const ploy = Polygon.fromByLines2(lines);
+  const box = ploy.getBox2();
+  for (let i = 0; i < trajectory.length; i++) {
+    const p2 = trajectory[i];
+    if (p2.x < box.minX || p2.x > box.maxX || p2.y < box.minY || p2.y > box.maxY) continue;
+    if (ploy.pointWithin(p2)) return false;
+  }
+  return true;
+}
 function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
-  const doorLines = [], otherLines = [], peDoorLines = [];
+  const doorLines = [], otherLines = [];
   for (let i = 0; i < lines_.length; i++) {
     const line = lines_[i];
     if (line.userData.isDoor) {
@@ -6574,15 +6582,10 @@ function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
     if (line.userData.isBayWindow) {
       continue;
     }
-    if (WallInsertObject.isDoor(line)) peDoorLines.push(line);
-    else otherLines.push(line);
+    otherLines.push(line);
   }
   let { internalEdges, circles } = maxiCircles.maxiCircles(otherLines, (circles2) => circles2.filter(isPolyHasTrajectoryPoint));
-  let peDoorCircles = maxiCircles.miniCircle(lines_, {
-    circleEdges: peDoorLines,
-    side: Side.IN
-  }).circles.filter(isPolyHasTrajectoryPoint).filter(isDoublePeDoorCircle);
-  const finalCircles = maxiCircles.mergeCircles([...circles, ...peDoorCircles], internalEdges).circles.filter((circle) => circle.length > 3);
+  const finalCircles = circles.filter((circle) => circle.length > 3);
   lines_.forEach((line) => LineGroupType.removeByTypes(line, ["doubleWall", "wall"]));
   const grid = new PointVirtualGrid(), finalCirclesSet = new Set(finalCircles.flat(2));
   otherLines.forEach((line) => !finalCirclesSet.has(line) && grid.insert(line.center, line));
@@ -6748,7 +6751,7 @@ class DoubleWallHelper {
       addClipingMap(line1, project1);
     });
     clipingMap.forEach((list, line) => {
-      const newLines = LineSegment.clipping(line, list, clippingLineUserData);
+      const newLines = LineSegment.clipping(line, list);
       lines.push(...newLines);
     });
     lines = lines.filter((line) => !removeLines.has(line));
@@ -6971,6 +6974,7 @@ class WallInsertObjectDrawData {
    * @returns 
    */
   static doubleDrawLine(lines) {
+    if (lines.length < 3) return [];
     lines = [...lines].sort((a2, b4) => a2.length() - b4.length());
     const line1 = lines[0], line2 = lines[1], wallWidth = Math.min(line1.length(), line2.length());
     let wallHeight = 0;
@@ -8235,7 +8239,7 @@ class DxfDataPlugin extends Pipeline {
         line.end.add(direct.clone().multiplyScalar(-DEFAULT_WALL_WIDTH * 0.5));
       }
     });
-    cad.addGroupAndOffset([...untreatedWall, ...passageEntrance], { type: "wall" });
+    cad.addGroupAndOffset([...untreatedWall], { type: "wall" });
     cad.addGroups(untreatedDoubleWallGroup, "doubleWall");
     cad.unionGroupAll("wall");
     const offsetWidth = 0.05;
@@ -8610,7 +8614,7 @@ function axisAlignCorr$1(lines, targettLine, option) {
   }
   new WallInsertObject(lines).recomputed().merge();
   newLines.push(...doorLines);
-  Point.adsorb(newLines.flatMap((line) => line.points), 1e-5);
+  Point.adsorb(newLines.flatMap((line) => line.points), 1e-4);
   lines = removeShortLine(lines, 0.05);
   return newLines;
 }
@@ -8719,7 +8723,7 @@ class BoundExt {
     const walls = lines.filter((line) => !line.userData.isDoor);
     lines = [...LineSegment.brokenLineMerging(walls, mergeLineUserData), ...doors];
     WallInsertObject.recomputed(lines);
-    lines = lines.filter((line) => line.length() > 0.01).filter((line) => line.userData.isDoor ? line.length() > 0.25 : true);
+    lines = lines.filter((line) => line.length() > 1e-4).filter((line) => line.userData.isDoor ? line.length() > 0.25 : true);
     findCallBack && findCallBack([...exteriorLines, ...appendLines], trajectoryPoints);
     return {
       lines,
@@ -10934,10 +10938,7 @@ class Scenario {
                     this.installWindows(winDraw[x2], x2);
                   } else if (winDraw[x2].userData.type === "door") {
                     this.singleLineWallMountedDoor(winDraw[x2], x2);
-                    console.log("安装了门");
-                  } else {
-                    console.log("单线垭口");
-                  }
+                  } else ;
                   new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
                   let mesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
                   mesh.name = `单线墙_${Number(x2) / 2}`;
@@ -10948,10 +10949,7 @@ class Scenario {
                     this.installWindows(winDraw[x2], x2);
                   } else if (winDraw[x2].userData.type === "door") {
                     this.singleLineWallMountedDoor(winDraw[x2], x2);
-                    console.log("安装了门");
-                  } else {
-                    console.log("单线垭口");
-                  }
+                  } else ;
                   houMesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
                 }
               } else {
@@ -10959,10 +10957,7 @@ class Scenario {
                   this.installWindows(winDraw[x2], x2);
                 } else if (winDraw[x2].userData.type === "door") {
                   this.singleLineWallMountedDoor(winDraw[x2], x2);
-                  console.log("安装了门");
-                } else {
-                  console.log("单线垭口");
-                }
+                } else ;
                 houMesh = this.windowTreatment(winDraw[x2], Mesh, wallHeight);
               }
             }
@@ -19834,7 +19829,7 @@ function drawPoint(point2, parameters, offset = 1e-3) {
     }
   }
 }
-function drawText(text, point2, style, offset = 1e-3) {
+function drawText$1(text, point2, style, offset = 1e-3) {
   const dxfSystem = DxfSystem.finalInstance;
   if (dxfSystem) {
     const renderer = dxfSystem.findComponentByName("Renderer");
@@ -22034,7 +22029,7 @@ class Log {
 if (typeof window !== "undefined") {
   window.drawLines = drawLines;
   window.drawPoint = drawPoint;
-  window.drawText = drawText;
+  window.drawText = drawText$1;
   window.randomColor = () => Math.floor(Math.random() * 16777215);
   window.Log = Log;
   window.TEST = false;
@@ -22224,7 +22219,7 @@ export {
   cloneUserData as c,
   createQuadtree as d,
   Lines as e,
-  drawText as f,
+  drawText$1 as f,
   getDefaultExportFromCjs as g,
   LineSegmentUndirectedGraph as h,
   mergeLineUserData as i,

package/src/utils/algorithmsStructures/LineSegment.d.ts

@@ -9,6 +9,7 @@ export declare class LineSegment<T = Record<string, any>> {
     userData: T;
     currentData: Record<string | number | symbol, any>;
     uuid: string;
+    get len(): number;
     get center(): Point<Record<string, any>>;
     get start(): Point<Record<string, any>>;
     get end(): Point<Record<string, any>>;

package/src/utils/algorithmsStructures/MiniCircles.d.ts

@@ -13,6 +13,9 @@ export interface MiniCirclesOption {
     circleEdges?: LineSegment[];
 }
 export declare class MiniCircles {
+    debug: {
+        angle: boolean;
+    };
     /** 通过并查集，查找为环的一部分边
      * @description
      * @param lines