build-dxf 0.1.151 → 0.1.153

package/package.json

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

package/src/build.js

@@ -12667,8 +12667,18 @@ class BayWindow {
           }
         }
       }
-      this.bayWindowGroup.name = `飘窗_${i}`;
+      const num = Number(i) + 1;
+      this.bayWindowGroup.name = `飘窗_${num}`;
       this.bayWindowGroup.userData.category = "bayWindow";
+      this.bayWindowGroup.userData.width = data[i].data.windowWidth;
+      this.bayWindowGroup.userData.height = data[i].data.height2;
+      this.bayWindowGroup.userData.groundHeight = data[i].data.height3;
+      this.bayWindowGroup.userData.distanceToTheTop = data[i].data.height1;
+      for (const w in data[i].lines) {
+        if (data[i].lines[w].userData.isWindow) {
+          this.bayWindowGroup.userData.depth = data[i].dottedLine.distanceToSegment(data[i].lines[w]);
+        }
+      }
       Scenario.Instance.group.add(this.bayWindowGroup);
     }
   }
@@ -13455,8 +13465,8 @@ class BayWindow {
     let height2 = Scenario.Instance.height + objData.height3 + objData.height2;
     mesh.position.z = height1;
     mesh2.position.z = height2;
-    Scenario.Instance?.group.add(mesh);
-    Scenario.Instance?.group.add(mesh2);
+    this.bayWindowGroup.add(mesh);
+    this.bayWindowGroup.add(mesh2);
   }
   // 共用线处理
   // sharedLineProcessing(sharedLine: any, data: any) {
@@ -14259,6 +14269,11 @@ class Scenario {
   installBalconys(data, index2) {
     let balconyGroup = new Group$1();
     balconyGroup.name = `阳台${index2}`;
+    balconyGroup.userData.category = "balcony";
+    balconyGroup.userData.height = data.userData.height;
+    balconyGroup.userData.width = data.length;
+    balconyGroup.userData.depth = 0;
+    balconyGroup.userData.groundHeight = 0;
     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);
@@ -14282,7 +14297,7 @@ class Scenario {
         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";
+        menModel.userData.category = "balcony_";
         balconyGroup.add(menModel);
         this.group.add(balconyGroup);
       }
@@ -14317,7 +14332,7 @@ class Scenario {
         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";
+        balconyModel.userData.category = "balcony_";
         balconyGroup.add(balconyModel);
       }
       this.group.add(balconyGroup);
@@ -14751,14 +14766,28 @@ class Scenario {
   }
   // 生成梁模型
   generateBeamModel(line) {
-    if (!line.userData.expansionDirction) return null;
-    const directionX = line.userData.expansionDirction.x * line.userData.expansionWidth;
-    const directionY = line.userData.expansionDirction.y * line.userData.expansionWidth;
-    let pointStart = new THREE.Vector3(line.start.x, line.start.y, this.height);
-    let pointEnd = new THREE.Vector3(line.end.x, line.end.y, this.height);
-    let startExpansion = new THREE.Vector3(pointStart.x + directionX, pointStart.y + directionY, this.height);
-    let endExpansion = new THREE.Vector3(pointEnd.x + directionX, pointEnd.y + directionY, this.height);
-    const basePoints = [pointStart, pointEnd, endExpansion, startExpansion];
+    let basePoints;
+    if (!line.userData.expansionWidth) {
+      let wallWidth;
+      if (line.userData.wallWidth) {
+        wallWidth = line.userData.wallWidth;
+      } else {
+        wallWidth = 0.06;
+      }
+      const MobileX = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, wallWidth, true);
+      const MobileY = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, wallWidth, false);
+      let startingPoint = this.xinLine(MobileX, MobileY, line.start, 0);
+      let finishLine = this.xinLine(MobileX, MobileY, line.end, 1);
+      basePoints = [startingPoint[0], startingPoint[1], finishLine[1], finishLine[0]];
+    } else {
+      const directionX = line.userData.expansionDirction.x * line.userData.expansionWidth;
+      const directionY = line.userData.expansionDirction.y * line.userData.expansionWidth;
+      let pointStart = new THREE.Vector3(line.start.x, line.start.y, this.height);
+      let pointEnd = new THREE.Vector3(line.end.x, line.end.y, this.height);
+      let startExpansion = new THREE.Vector3(pointStart.x + directionX, pointStart.y + directionY, this.height);
+      let endExpansion = new THREE.Vector3(pointEnd.x + directionX, pointEnd.y + directionY, this.height);
+      basePoints = [pointStart, pointEnd, endExpansion, startExpansion];
+    }
     const geometry = this.createParallelepipedFromBase(basePoints, line.userData.height);
     const material = new THREE.MeshStandardMaterial({
       // color: 0x4f90d4,
@@ -22885,40 +22914,35 @@ function doorToHole(lines, option) {
   });
   return lines;
 }
+function getBeamNearWallVec(line) {
+  const iterator = WallHole.getIterator(line);
+  for (const hole of iterator) {
+    if ("beamNearWallVec" in hole) return Point.from(hole.beamNearWallVec);
+  }
+}
 function beamSupportLine(lines, {}) {
   const lsh = Quadtree.from(lines);
-  const filter = (line, targetLine) => {
-    if (targetLine === line) return false;
-    if (!targetLine.isParallelTo(targetLine, 10)) return false;
-    const len = line.projectLineSegment(targetLine).length;
-    if (len < 1e-3) return false;
-    return true;
-  };
-  const get2 = (line, direct) => {
-    const startRes = lsh.raycast(line.start, direct, 1e-5, 1).filter(({ targetLine }) => filter(line, targetLine));
-    if (!startRes.length) return;
-    const endRes = lsh.raycast(line.end, direct, 1e-5, 1).filter(({ targetLine }) => filter(line, targetLine));
-    if (!endRes.length) return;
-    const start = startRes[0], end = endRes[0], [p1, p2] = start.distance < end.distance ? [line.start, start.intersectPoint] : [line.end, end.intersectPoint], dir = p2.directionFrom(p1), width = p1.distance(p2);
-    return { dir, width };
-  };
   lines.forEach((line) => {
     if (WallHole.isBeam(line)) {
       const findLine = line.clone();
-      findLine.setLength(findLine.length - 2e-4);
-      const result = (() => {
-        const normal = findLine.normal();
-        const n_normal = normal.clone().multiplyScalar(-1);
-        let result1 = get2(findLine, normal);
-        let result2 = get2(findLine, n_normal);
-        if (result1 && result2) return result1.width < result2.width ? result1 : result2;
-        if (result1) return result1;
-        if (result2) return result2;
-      })();
-      if (result) {
-        const { width, dir } = result;
-        line.userData.expansionWidth = width;
-        line.userData.expansionDirction = dir.toJson2D();
+      findLine.setLength(findLine.length - 4e-3);
+      let rectangle = line.toRectangle(2, "butt");
+      const center = findLine.center;
+      const beamNearWallVec = getBeamNearWallVec(line);
+      const list = lsh.queryRect(rectangle).filter((target) => {
+        if (target.line === line) return false;
+        if (!target.line.isParallelTo(findLine, 10)) return false;
+        if (beamNearWallVec) {
+          const dir = target.line.center.directionFrom(center);
+          if (dir.dot(beamNearWallVec) < 0) return false;
+        }
+        return true;
+      }).map((item) => item.line).sort((a2, b4) => a2.distanceToPoint(center) - b4.distanceToPoint(center));
+      if (list.length) {
+        const line2 = list[0];
+        const point2 = line2.projectPoint(center, false);
+        line.userData.expansionWidth = point2.distance(center);
+        line.userData.expansionDirction = point2.directionFrom(center);
       }
     }
   });

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

@@ -74,7 +74,7 @@ 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 | null;
+    generateBeamModel(line: any): Brush;
     generateColumnModel(data: any, lines: any, Height: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
     createAPlane(lines: LineSegment<Record<string, any>>[], menList: LineSegment<Record<string, any>>[]): void;
     modelLoader(): Promise<void>;