build-dxf 0.1.69 → 0.1.71

package/package.json

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

package/src/build.js

@@ -6159,7 +6159,7 @@ class BayWindowHelper {
       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 if (line.userData.isWindow && line.userData.drawWindow && line.userData.drawWindow.length) windowLine = line;
         else deptLine = line;
       }
       if (bayWindowLine && windowLine && deptLine) {
@@ -6197,7 +6197,7 @@ class BayWindowHelper {
     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 if (line.userData.isWindow && line.userData.drawWindow && line.userData.drawWindow.length) windowLine = line;
     }
     if (bayWindowLine && windowLine) {
       const { width, height, groundClearance } = windowLine.userData.drawWindow[0];
@@ -17869,17 +17869,16 @@ class SceneAutoGenerat {
   }
   buildPlane(lines) {
     lines = lineSegmentClipping(lines, 0);
-    lines = lines.filter((line) => {
-      if (LineGroupType.hasType(line, "bayWindow") && !line.userData.isBayWindow) return false;
-      return true;
-    });
-    LineSegment.groupByPath(lines).forEach((lines2, i) => {
-      const removeSet = findDiscretePointLine2(lines2, null, true);
-      lines2 = lines2.filter((line) => !removeSet.has(line));
-      const doors = lines2.filter((line) => line.userData.isDoor), maxiCircles2 = new MaxiCircles(), { circles } = maxiCircles2.miniCircle(lines2, { circleEdges: doors, side: Side.IN }), { circles: outCircles } = maxiCircles2.miniCircle(lines2, { circleEdges: doors, side: Side.OUT }), ploys = circles.map(((p2) => Polygon.fromByLinePath(p2)));
+    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 }), { circles: outCircles } = maxiCircles2.miniCircle(lines, { circleEdges: doors, side: Side.OUT }), ploys = circles.map(((p2) => Polygon.fromByLinePath(p2))), ploys2 = LineGroupType.getGroupsByType(group2, "bayWindow").map((lines2) => {
+        const poly = Polygon.fromByLines2(lines2);
+        if (poly.closedLoop()) return poly;
+      }).filter((poly) => !!poly);
       outCircles.forEach((circle) => {
         const polygon2 = Polygon.fromByLinePath(circle);
-        const newPolys = Polygon.booleanOp(polygon2, ploys, { scale: 100, type: "Difference" });
+        const newPolys = Polygon.booleanOp(polygon2, [...ploys, ...ploys2], { scale: 100, type: "Difference" });
         newPolys.forEach((poly, j) => {
           const geometry = this.createGeometryByLines(poly.toLines());
           const mesh = new THREE.Mesh(geometry, new THREE.MeshStandardMaterial({ color: 11184810, side: THREE.DoubleSide }));