build-dxf 0.1.156 → 0.1.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.156",
+  "version": "0.1.158",
   "description": "",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -8,6 +8,7 @@ import { Brush, Evaluator, SUBTRACTION } from "three-bvh-csg";
 import { OBJExporter } from "three/examples/jsm/exporters/OBJExporter.js";
 const VITE_OSS_BASEURL = "https://image.cnyang.cn/common-assets/".endsWith("/") ? "https://image.cnyang.cn/common-assets/" : "https://image.cnyang.cn/common-assets//";
 const DEFAULT_WALL_WIDTH = 0.12;
+const MAX_WALL_WIDTH = 0.3;
 const DEFAULT_WALL_HEIGHT = 2.8;
 const DEFAULT_DOOR_HEIGHT = 2.1;
 const DOUBLE_DOOR_WIDTH = 1.5;
@@ -9711,7 +9712,7 @@ class DoubleWallFinder {
    * @returns 
    */
   static find(lines, obstacle = [], esp = 0.4) {
-    lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => WallHole.isBeam(line) ? "beam" : "lines")).handle("lines", (lines2) => {
+    lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (_line) => "lines")).handle("lines", (lines2) => {
       const parallelAxis = lines2[0], verticalAxis = parallelAxis.clone().rotate(Math.PI * 0.5), [group1, group2] = LineSegmentUtils.groupByParallelToAxis(lines2, lines2[0], 5), newLines1 = this.group(group1, parallelAxis, verticalAxis, esp), newLines2 = this.group(group2, verticalAxis, parallelAxis, esp), appendLines = newLines1.concat(newLines2);
       lines2 = lines2.concat(appendLines);
       return lines2;
@@ -10107,7 +10108,14 @@ function clippingInsertObjectDoubleWall(lines) {
   }
   if (!polygons.length) return [lines];
   polygons = Polygon.booleanOp(polygons[0], polygons.slice(1), { type: "Union", scale: 1e4 });
-  const newLines = polygons.map((poly2) => poly2.toLines()).flat().filter((line) => quadtree.queryCircle(line.center, 0.01).length === 0);
+  const newLines = polygons.map((poly2) => poly2.toLines()).flat().flatMap((line) => {
+    let list = quadtree.queryRect(line.toRectangle(2e-4, "butt")).map((res) => res.line).filter((l) => l.isParallelTo(line, 10));
+    if (list.length) {
+      const newLines2 = LineSegmentUtils.clippingByLines(line, list);
+      return newLines2 ?? [];
+    }
+    return [line];
+  });
   lines.push(...newLines);
   PointUtils.adsorb(lines.flatMap((line) => line.points), 1e-4);
   lines = splitIntersectedLine(lines.map((line) => line.clone()), 1e-9);
@@ -12009,7 +12017,7 @@ function correction(lines, targettLine, option) {
         const max = Math.max(...projValues), min = Math.min(...projValues), dist = precision4((max - min) * axis.length);
         if (dist < DEFAULT_WALL_WIDTH) return;
         group2.forEach((line) => {
-          line.userData.wallWidth = dist;
+          line.userData.wallWidth = Math.min(dist, MAX_WALL_WIDTH);
         });
       },
       onLayoutDesign(lines3, delKey) {
@@ -12096,6 +12104,7 @@ function breakpointMerging(lines) {
 function init(lines, option) {
   lines = breakpointMerging(lines);
   lines = splitIntersectedLine(lines, 1e-9, { balconyRailing: { behavior: "discard", filteringRatio: 0.2 } });
+  WallHole.merge(lines);
   if (option.trajectory) {
     sparse(option.trajectory, 0.2);
     sparse(option.trajectory, 0.5);
@@ -13746,7 +13755,6 @@ class Scenario {
         const edges = new THREE.EdgesGeometry(geometry);
         new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
         if (colorValue && liangOriginalData) {
-          cube.material.color = new THREE.Color(5214420);
           const point1 = new THREE.Vector3(liangOriginalData.start.x, liangOriginalData.start.y, 0);
           const point2 = new THREE.Vector3(liangOriginalData.end.x, liangOriginalData.end.y, 0);
           this.liangNum = this.liangNum + 1;
@@ -14745,10 +14753,11 @@ class Scenario {
   generateBeamModel(line) {
     let basePoints;
     let expansionPoints;
+    let cube;
     if (!line.userData.expansionWidth && !line.userData.expansionDirction) {
       let wallWidth;
       if (line.userData.wallWidth) {
-        wallWidth = line.userData.wallWidth;
+        wallWidth = line.userData.wallWidth / 2;
       } else {
         wallWidth = 0.06;
       }
@@ -14757,7 +14766,16 @@ class Scenario {
       let startingPoint = this.xinLine(MobileX, MobileY, line.start, this.height ? this.height : 0);
       let finishLine = this.xinLine(MobileX, MobileY, line.end, this.height ? this.height : 0);
       basePoints = [startingPoint[0], startingPoint[1], finishLine[1], finishLine[0]];
-      expansionPoints = this.expandRectangleSimple(startingPoint[0], startingPoint[1], finishLine[1], finishLine[0], 0.01);
+      const geometry = this.createParallelepipedFromBase(basePoints, line.userData.height);
+      const material2 = new THREE.MeshStandardMaterial({
+        color: 5214420,
+        side: THREE.DoubleSide
+      });
+      const beamList = WallHoleDrawData.singleHoleLine(line);
+      cube = new THREE.Mesh(geometry, material2);
+      for (const w in beamList) {
+        cube = this.pierceTheBeam(cube, beamList[Number(w)], wallWidth, 0);
+      }
     } else {
       const directionX = line.userData.expansionDirction.x * line.userData.expansionWidth;
       const directionY = line.userData.expansionDirction.y * line.userData.expansionWidth;
@@ -14766,23 +14784,42 @@ class Scenario {
       let startExpansion = new THREE.Vector3(pointStart.x + directionX, pointStart.y + directionY, this.height ? this.height : 0);
       let endExpansion = new THREE.Vector3(pointEnd.x + directionX, pointEnd.y + directionY, this.height ? this.height : 0);
       basePoints = [pointStart, pointEnd, endExpansion, startExpansion];
-      expansionPoints = this.expandRectangleSimple(pointStart, pointEnd, endExpansion, startExpansion, 0.01);
+      const geometry = this.createParallelepipedFromBase(basePoints, line.userData.height);
+      const material2 = new THREE.MeshStandardMaterial({
+        color: 5214420,
+        side: THREE.DoubleSide
+      });
+      const beamList = WallHoleDrawData.singleHoleLine(line);
+      cube = new THREE.Mesh(geometry, material2);
+      for (const w in beamList) {
+        cube = this.pierceTheBeam(cube, beamList[Number(w)], line, 1);
+      }
     }
-    const geometry = this.createParallelepipedFromBase(basePoints, line.userData.height);
     const material = new THREE.MeshStandardMaterial({
       // color: 0x4f90d4,
       color: this.color,
       side: THREE.DoubleSide
     });
-    const cube = new THREE.Mesh(geometry, material);
-    const bodyGeometry = this.createParallelepipedFromBase(expansionPoints, line.userData.rooftopPz);
+    const beamLint = WallHoleDrawData.singleHoleLine(line);
+    const point1 = new THREE.Vector3(basePoints[0].x, basePoints[0].y, basePoints[0].z + beamLint[0].userData.height - 1e-3);
+    const point2 = new THREE.Vector3(basePoints[1].x, basePoints[1].y, basePoints[1].z + beamLint[0].userData.height - 1e-3);
+    const point3 = new THREE.Vector3(basePoints[2].x, basePoints[2].y, basePoints[2].z + beamLint[0].userData.height - 1e-3);
+    const point4 = new THREE.Vector3(basePoints[3].x, basePoints[3].y, basePoints[3].z + beamLint[0].userData.height - 1e-3);
+    expansionPoints = this.expandRectangleSimple(point1, point2, point3, point4, 1e-3);
+    const bodyGeometry = this.createParallelepipedFromBase(expansionPoints, line.userData.height - beamLint[0].userData.height + 2e-3);
     const brush1 = new Brush(cube.geometry);
     brush1.updateMatrixWorld();
     const brush2 = new Brush(bodyGeometry);
     brush2.updateMatrixWorld();
     const evaluator = new Evaluator();
-    const result = evaluator.evaluate(brush1, brush2, SUBTRACTION);
-    result.material = cube.material;
+    const wallCube = evaluator.evaluate(brush1, brush2, SUBTRACTION);
+    wallCube.material = new THREE.MeshStandardMaterial({
+      // color: 0x4f90d4,
+      color: this.color,
+      side: THREE.DoubleSide
+    });
+    this.group.add(wallCube);
+    const result = new THREE.Mesh(bodyGeometry, material);
     this.liangNum = this.liangNum + 1;
     result.name = `梁_${this.liangNum}`;
     result.userData.category = "beam";
@@ -14792,6 +14829,38 @@ class Scenario {
     result.userData.groundHeight = line.userData.rooftopPz;
     return result;
   }
+  pierceTheBeam(model, line, wall, num) {
+    if (num) {
+      const brush1 = new Brush(model.geometry);
+      const directionX = wall.userData.expansionDirction.x * wall.userData.expansionWidth;
+      const directionY = wall.userData.expansionDirction.y * wall.userData.expansionWidth;
+      let pointStart = new THREE.Vector3(line.start.x, line.start.y, this.height ? this.height : 0);
+      let pointEnd = new THREE.Vector3(line.end.x, line.end.y, this.height ? this.height : 0);
+      let startExpansion = new THREE.Vector3(pointStart.x + directionX, pointStart.y + directionY, this.height ? this.height : 0);
+      let endExpansion = new THREE.Vector3(pointEnd.x + directionX, pointEnd.y + directionY, this.height ? this.height : 0);
+      const expansionPoints = this.expandRectangleSimple(pointStart, pointEnd, endExpansion, startExpansion, 0.01);
+      const bodyGeometry = this.createParallelepipedFromBase(expansionPoints, line.userData.height);
+      const brush2 = new Brush(bodyGeometry);
+      brush2.updateMatrixWorld();
+      const evaluator = new Evaluator();
+      const result = evaluator.evaluate(brush1, brush2, SUBTRACTION);
+      return result;
+    } else {
+      const brush1 = new Brush(model.geometry);
+      brush1.updateMatrixWorld();
+      const MobileX = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, wall, true);
+      const MobileY = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, wall, false);
+      let startingPoint = this.xinLine(MobileX, MobileY, line.start, this.height ? this.height : 0);
+      let finishLine = this.xinLine(MobileX, MobileY, line.end, this.height ? this.height : 0);
+      const expansionPoints = this.expandRectangleSimple(startingPoint[0], startingPoint[1], finishLine[1], finishLine[0], 0.01);
+      const bodyGeometry = this.createParallelepipedFromBase(expansionPoints, line.userData.height);
+      const brush2 = new Brush(bodyGeometry);
+      brush2.updateMatrixWorld();
+      const evaluator = new Evaluator();
+      const result = evaluator.evaluate(brush1, brush2, SUBTRACTION);
+      return result;
+    }
+  }
   // 生成柱模型
   generateColumnModel(data, lines, Height) {
     let basePoints = [];
@@ -23000,13 +23069,14 @@ function findRooms(lines, trajectory2) {
 }
 function removeRoomSundries(lines, { trajectory: trajectory2 }) {
   if (trajectory2) {
-    const ls2 = [...findDiscretePointLine(lines)];
-    const rooms = findRooms(lines, trajectory2);
-    const removeLines = ls2.filter((line) => {
+    const rooms = findRooms(lines, trajectory2), counterMap = new CounterMap();
+    findDiscretePoint(lines).forEach((l) => counterMap.increment(l));
+    const ls2 = counterMap.getByCount(2), removeLines = ls2.filter((line) => {
       const center = line.center;
-      return !!rooms.find((room) => room.ploy.pointWithin(center));
-    });
-    const set2 = new Set(removeLines);
+      return !!rooms.find((room) => {
+        return room.ploy.pointWithin(center) && !room.lines.find((l) => l == line);
+      });
+    }), set2 = new Set(removeLines);
     lines = lines.filter((line) => !set2.has(line));
   }
   return lines;

package/src/constants.d.ts

@@ -1,6 +1,7 @@
 export declare const API_BASE_URL = "";
 export declare const VITE_OSS_BASEURL: any;
 export declare const DEFAULT_WALL_WIDTH = 0.12;
+export declare const MAX_WALL_WIDTH = 0.3;
 export declare const DEFAULT_WALL_HEIGHT = 2.8;
 export declare const DOUBLE_WALL_FIND_WIDTH = 0.4;
 export declare const DEFAULT_DOOR_HEIGHT = 2.1;

package/src/dxf-system/utils/WallHole.d.ts

@@ -85,7 +85,7 @@ export declare class WallHole {
      * @param line
      * @returns
      */
-    static getMinWidth(key: HoleStorageType, type?: HoleType): 0.2 | 0.05 | 0.3 | 0.35;
+    static getMinWidth(key: HoleStorageType, type?: HoleType): 0.3 | 0.2 | 0.05 | 0.35;
     /** 清理孔洞
      * @param target
      * @param key

package/src/utils/modelScenario/scenario.d.ts

@@ -80,7 +80,8 @@ export default class Scenario {
     overhangWallOffset(data: any, index: string, height: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
     dashedLineCeilingTreatment(data: any, index: number | string, item: any): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
     overallTreatmentOfSingleLineWalls(data: any): void;
-    generateBeamModel(line: any): Brush;
+    generateBeamModel(line: any): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap>;
+    pierceTheBeam(model: any, line: LineSegment, wall: any, num: number): Brush;
     generateColumnModel(data: any, lines: any, Height: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
     addThePassModel(line: LineSegment): void;
     createAPlane(lines: LineSegment<Record<string, any>>[], menList: LineSegment<Record<string, any>>[]): void;