build-dxf 0.1.153 → 0.1.155

package/package.json

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

package/src/build.js

@@ -9665,148 +9665,6 @@ class BuildGroup {
   }
 }
 class DoubleWallFinder {
-  static errorAngle = 4;
-  /** 线段投影分析
-   * @param index 
-   * @param sourceLineSegment 
-   * @param lineSegmentList 
-   * @returns 
-   */
-  static projectionAnalysis(index2, sourceIndex, sourceLineSegment, lineSegmentList) {
-    const temLineSegment = lineSegmentList[index2], direct = sourceLineSegment.direction(), temDirect = temLineSegment.direction(), angle = direct.angle(temDirect, { unit: "degree", range: "180" });
-    if (angle < this.errorAngle || angle > 180 - this.errorAngle) {
-      let data;
-      let dist = sourceLineSegment.distanceToSegment(temLineSegment);
-      const p1 = temLineSegment.projectLineSegment(sourceLineSegment), p2 = sourceLineSegment.projectLineSegment(temLineSegment);
-      if (p1.length > p2.length) {
-        data = {
-          target: temLineSegment,
-          targetIndex: index2,
-          source: sourceLineSegment,
-          sourceIndex,
-          project: p1,
-          project2: p2,
-          minDistance: dist
-        };
-      } else {
-        data = {
-          target: sourceLineSegment,
-          targetIndex: sourceIndex,
-          source: temLineSegment,
-          sourceIndex: index2,
-          project: p2,
-          project2: p1,
-          minDistance: dist
-        };
-      }
-      if (!data || data.project.length < 0.08 || data.project2.length < 0.08) return;
-      return data;
-    }
-  }
-  /** 查找
-   * @param lines 
-   * @param wallWidth 
-   * @returns 
-   */
-  static findDoubleLine(lines, wallWidth = 0.4) {
-    let walls = lines.filter((line) => !line.userData.isDoor), visited = /* @__PURE__ */ new Set(), resultList = [];
-    walls = walls.filter((line) => !line.userData.isWindowWall);
-    let quadtree = new Quadtree(Box2.fromByLineSegment(...walls));
-    walls.forEach((line, index2) => quadtree.insert({ line, userData: index2 }));
-    walls.forEach((sourceLineSegment, i) => {
-      const rectangle = Rectangle.fromByLineSegment(sourceLineSegment, wallWidth * 2, false, -0.01), ids = quadtree.queryRect(rectangle).map((i2) => i2.userData).filter((index2) => index2 !== i);
-      ids.forEach((id) => {
-        try {
-          if (visited.has(`${i}-${id}`) || visited.has(`${id}-${i}`)) return;
-          const res = this.projectionAnalysis(id, i, sourceLineSegment, walls);
-          if (res) resultList.push(res);
-          visited.add(`${i}-${id}`);
-        } catch (error) {
-          console.log(error);
-        }
-      });
-    });
-    resultList.forEach((result) => {
-      const project0 = result.project, project1 = result.project2;
-      if (project0.angle(project1, { unit: "degree", range: "180" }) > 135) {
-        project1.points = [project1.points[1], project1.points[0]];
-      }
-    });
-    return {
-      resultList,
-      walls,
-      quadtree
-    };
-  }
-  /** 补双线墙壁
-   * @param lines 
-   * @param wallWidth 
-   * @returns 
-   */
-  static complementSide(lines, obstacleAegment = [], wallWidth = 0.4) {
-    const otherLines = [];
-    lines = lines.filter((line) => {
-      if (line.userData.isBayWindow || line.userData.isBalconyRailing || LineGroupType.hasType(line, "bayWindow") && line.userData.isWindow) {
-        otherLines.push(line);
-        return false;
-      }
-      return true;
-    });
-    let { resultList, quadtree } = this.findDoubleLine(lines, wallWidth), removeLines = /* @__PURE__ */ new Set(), clipingMap = /* @__PURE__ */ new Map(), appendLines = [];
-    function addClipingMap(line, line1) {
-      if (!clipingMap.has(line)) clipingMap.set(line, []);
-      const startProj = line.projectPoint(line1.start);
-      const endProj = line.projectPoint(line1.end);
-      const list = clipingMap.get(line);
-      if (startProj) list.push(startProj);
-      if (endProj) list.push(endProj);
-      removeLines.add(line);
-      quadtree.remove(line);
-    }
-    resultList.forEach((result) => {
-      const project0 = result.project, project1 = result.project2, line0 = result.source, line1 = result.target;
-      const newLine1 = new LineSegment(project0.start.clone(), project1.start.clone());
-      const newLine2 = new LineSegment(project0.end.clone(), project1.end.clone());
-      newLine1.userData.height = line0.userData.height;
-      newLine1.userData.rooftopPz = line0.userData.rooftopPz;
-      newLine2.userData.height = line1.userData.height;
-      newLine2.userData.rooftopPz = line1.userData.rooftopPz;
-      appendLines.push(newLine1, newLine2);
-      addClipingMap(line0, project0);
-      addClipingMap(line1, project1);
-    });
-    clipingMap.forEach((list, line) => {
-      const newLines = LineSegmentUtils.clippingByPoints(line, list);
-      newLines.forEach((newLine) => {
-        newLine.userData.height = line.userData.height;
-        newLine.userData.rooftopPz = line.userData.rooftopPz;
-      });
-      lines.push(...newLines);
-    });
-    lines = lines.filter((line) => !removeLines.has(line));
-    quadtree.clear();
-    quadtree = Quadtree.from([...lines, ...otherLines, ...obstacleAegment]);
-    appendLines = splitIntersectedLine(appendLines, 1e-9);
-    appendLines.flatMap((line) => {
-      const queryLines = quadtree.queryRect(line.toRectangle(1e-3, "butt")).filter((item) => item.line.isParallelTo(line)).map((item) => item.line);
-      if (queryLines.length) {
-        const newLines = LineSegmentUtils.clippingByLines(line, queryLines);
-        if (newLines) return newLines.forEach((newLine) => {
-          newLine.userData.height = line.userData.height;
-          newLine.userData.rooftopPz = line.userData.rooftopPz;
-          quadtree.insert(newLine);
-          lines.push(newLine);
-        });
-      }
-      quadtree.insert(line);
-      lines.push(line);
-    });
-    quadtree.clear();
-    lines.push(...otherLines);
-    lines = splitIntersectedLine(lines, 1e-9);
-    PointUtils.adsorb(lines.flatMap((line) => line.points), 1e-4);
-    return lines.filter((line) => line.length > 1e-9);
-  }
   /**
    * @param lines 
    * @param parallelAxis 
@@ -9854,7 +9712,7 @@ class DoubleWallFinder {
    */
   static find(lines, obstacle = [], esp = 0.4) {
     lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => WallHole.isBeam(line) ? "beam" : "lines")).handle("lines", (lines2) => {
-      const parallelAxis = lines2[0], verticalAxis = parallelAxis.clone().rotate(Math.PI * 0.5), [group1, group2] = LineSegmentUtils.groupByParallelToAxis(lines2, lines2[0]), newLines1 = this.group(group1, parallelAxis, verticalAxis, esp), newLines2 = this.group(group2, verticalAxis, parallelAxis, esp), appendLines = newLines1.concat(newLines2);
+      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;
     }).merge();
@@ -12140,7 +11998,10 @@ function correction(lines, targettLine, option) {
   const bayWindow = lines.filter((line) => line.userData.isBayWindow).map((line) => line.center);
   lines = splitIntersectedLine(lines, 1e-9);
   WallHole.filterIllegal(lines).merge(lines);
-  lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => line.userData.isBalconyRailing ? "balconyRailing" : "lines")).handle("lines", (lines2) => {
+  lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => {
+    if (WallHole.isBeam(line)) return "beam";
+    return line.userData.isBalconyRailing ? "balconyRailing" : "lines";
+  })).handle("lines", (lines2) => {
     lines2 = AlignToParallelSegments.align(lines2, {
       onMergeLine: mergeLineUserData,
       onGroup(group2, projValues, axis) {
@@ -12729,8 +12590,8 @@ class BayWindow {
           console.log("夹角异常1", Meshlist);
           continue;
         }
-        this.bayWindowGroup.add(Meshlist.mesh1);
-        this.bayWindowGroup.add(Meshlist.mesh2);
+        Scenario.Instance.group.add(Meshlist.mesh1);
+        Scenario.Instance.group.add(Meshlist.mesh2);
       }
     }
   }
@@ -13393,8 +13254,9 @@ class BayWindow {
       menModel.rotation.y = angleRad;
       menModel.scale.set((distance2 + 0.12) / size2.x, height / size2.y, wallWidth / size2.z);
       menModel.position.set(center.x, center.y, groundClearance);
-      menModel.name = `窗_${index2}`;
-      menModel.userData.category = "window";
+      Scenario.Instance.windowForm = Scenario.Instance.windowForm + 1;
+      menModel.name = `窗体_${Scenario.Instance.windowForm}`;
+      menModel.userData.category = "windowForm";
       menModel.userData.winUuid = data.userData.winUuid;
       menModel.userData.lineUuid = data.userData.lineUuid;
       menModel.userData.width = distance2;
@@ -13550,7 +13412,17 @@ class Scenario {
   box;
   singleLineWallValue;
   liangNum;
+  // 梁堆叠
   zhuNum;
+  // 柱堆叠
+  poortNum;
+  // 垭口堆叠
+  doorNum;
+  // 门堆叠
+  windowNum;
+  // 窗堆叠
+  windowForm;
+  // 飘窗体堆叠
   static _instance;
   static get Instance() {
     return Scenario._instance;
@@ -13564,6 +13436,10 @@ class Scenario {
     this.axesHelper = new THREE.AxesHelper(20);
     this.liangNum = 0;
     this.zhuNum = 0;
+    this.poortNum = 0;
+    this.doorNum = 0;
+    this.windowNum = 0;
+    this.windowForm = 0;
     this.scene.add(this.axesHelper);
     this.group = null;
     this.closedArray = [];
@@ -13633,6 +13509,10 @@ class Scenario {
     this.group = new Group$1();
     this.liangNum = 0;
     this.zhuNum = 0;
+    this.poortNum = 0;
+    this.doorNum = 0;
+    this.windowNum = 0;
+    this.windowForm = 0;
     this.expandedList = [];
     if (!BayWindow.Instance) new BayWindow();
     BayWindow.Instance.bayWindowExpansion = [];
@@ -13768,8 +13648,11 @@ class Scenario {
                 } else if (doubleLinesWindow[x].userData.type === "door") {
                   this.singleLineWallMountedDoor(doubleLinesWindow[x], x);
                 } else if (doubleLinesWindow[x].userData.type === "beam") ;
-                else ;
-                this.group.add(this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight));
+                else if (doubleLinesWindow[x].userData.type === "passageEntrance") {
+                  this.addThePassModel(doubleLinesWindow[x]);
+                }
+                let mesh = this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight);
+                this.group.add(mesh);
               } else if (houMesh) {
                 if (Number(x) === doubleLinesWindow.length - 1) {
                   const edges = new THREE.EdgesGeometry(this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight).geometry);
@@ -13779,8 +13662,11 @@ class Scenario {
                   } else if (doubleLinesWindow[x].userData.type === "door") {
                     this.singleLineWallMountedDoor(doubleLinesWindow[x], x);
                   } else if (doubleLinesWindow[x].userData.type === "beam") ;
-                  else ;
-                  this.group.add(this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight));
+                  else if (doubleLinesWindow[x].userData.type === "passageEntrance") {
+                    this.addThePassModel(doubleLinesWindow[x]);
+                  }
+                  let mesh = this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight);
+                  this.group.add(mesh);
                 } else {
                   if (doubleLinesWindow[x].userData.type === "window") {
                     this.installWindows(doubleLinesWindow[x], x);
@@ -13788,6 +13674,9 @@ class Scenario {
                     this.singleLineWallMountedDoor(doubleLinesWindow[x], x);
                   }
                   if (doubleLinesWindow[x].userData.type === "beam") ;
+                  else if (doubleLinesWindow[x].userData.type === "passageEntrance") {
+                    this.addThePassModel(doubleLinesWindow[x]);
+                  }
                   houMesh = this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight);
                 }
               } else {
@@ -13796,7 +13685,9 @@ class Scenario {
                 } else if (doubleLinesWindow[x].userData.type === "door") {
                   this.singleLineWallMountedDoor(doubleLinesWindow[x], x);
                 } else if (doubleLinesWindow[x].userData.type === "beam") ;
-                else ;
+                else if (doubleLinesWindow[x].userData.type === "passageEntrance") {
+                  this.addThePassModel(doubleLinesWindow[x]);
+                }
                 houMesh = this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight);
               }
             }
@@ -14215,7 +14106,8 @@ class Scenario {
       menModel.rotation.y = angleRad;
       menModel.scale.set(distance2 / size2.x, height / size2.y, wallWidth / size2.z);
       menModel.position.set(data.center.x, data.center.y, groundClearance);
-      menModel.name = `窗_${index2}`;
+      this.windowNum = this.windowNum + 1;
+      menModel.name = `窗_${this.windowNum}`;
       menModel.userData.category = "window";
       menModel.userData.winUuid = data.userData.winUuid;
       menModel.userData.lineUuid = data.userData.lineUuid;
@@ -14254,7 +14146,8 @@ class Scenario {
       menModel.rotation.y = angleRad;
       menModel.scale.set(distance2 / size2.x, height / size2.y, wallWidth / size2.z);
       menModel.position.set(data.center.x, data.center.y, groundClearance);
-      menModel.name = `门_${index2}`;
+      this.doorNum = this.doorNum + 1;
+      menModel.name = `门_${this.doorNum}`;
       menModel.userData.category = "door";
       menModel.userData.winUuid = data.userData.winUuid;
       menModel.userData.lineUuid = data.userData.lineUuid;
@@ -14402,7 +14295,7 @@ class Scenario {
     const evaluator = new Evaluator();
     const result = evaluator.evaluate(brush1, brush2, SUBTRACTION);
     result.material = mesh.material;
-    if (mesh.userData.category === "beam") {
+    if (mesh.userData.category === "beam" || mesh.userData.category === "passageEntrance") {
       result.name = mesh.name;
       result.userData = mesh.userData;
     }
@@ -14511,6 +14404,82 @@ class Scenario {
     const point22 = new THREE.Vector3(point2.x - x - xOverflow, point2.y + y - YOverflow, wallHeight);
     return [point1, point22];
   }
+  // 只往长边方向偏移指定距离的新坐标
+  expandRectangleAlongLongSide(p1, p2, p3, p4, expandAmount = 0.01) {
+    const edge12 = new THREE.Vector3().copy(p2).sub(p1);
+    const edge23 = new THREE.Vector3().copy(p3).sub(p2);
+    const edge34 = new THREE.Vector3().copy(p4).sub(p3);
+    const edge41 = new THREE.Vector3().copy(p1).sub(p4);
+    const len12 = edge12.length();
+    const len23 = edge23.length();
+    const len34 = edge34.length();
+    const len41 = edge41.length();
+    let longEdgeDirection;
+    let longEdgeStart1, longEdgeEnd1;
+    let longEdgeStart2, longEdgeEnd2;
+    if (len12 >= len23 && len12 >= len34 && len12 >= len41) {
+      longEdgeDirection = edge12.clone().normalize();
+      edge23.clone().normalize();
+      longEdgeStart1 = p1;
+      longEdgeEnd1 = p2;
+      longEdgeStart2 = p4;
+      longEdgeEnd2 = p3;
+    } else if (len23 >= len12 && len23 >= len34 && len23 >= len41) {
+      longEdgeDirection = edge23.clone().normalize();
+      edge34.clone().normalize();
+      longEdgeStart1 = p2;
+      longEdgeEnd1 = p3;
+      longEdgeStart2 = p1;
+      longEdgeEnd2 = p4;
+    } else if (len34 >= len12 && len34 >= len23 && len34 >= len41) {
+      longEdgeDirection = edge34.clone().normalize();
+      edge41.clone().normalize();
+      longEdgeStart1 = p3;
+      longEdgeEnd1 = p4;
+      longEdgeStart2 = p2;
+      longEdgeEnd2 = p1;
+    } else {
+      longEdgeDirection = edge41.clone().normalize();
+      edge12.clone().normalize();
+      longEdgeStart1 = p4;
+      longEdgeEnd1 = p1;
+      longEdgeStart2 = p3;
+      longEdgeEnd2 = p2;
+    }
+    const newP1 = longEdgeStart1.clone().add(longEdgeDirection.clone().multiplyScalar(-expandAmount));
+    const newP2 = longEdgeEnd1.clone().add(longEdgeDirection.clone().multiplyScalar(expandAmount));
+    const newP3 = longEdgeEnd2.clone().add(longEdgeDirection.clone().multiplyScalar(expandAmount));
+    const newP4 = longEdgeStart2.clone().add(longEdgeDirection.clone().multiplyScalar(-expandAmount));
+    return [newP1, newP2, newP3, newP4];
+  }
+  // 往长边和短边方向都偏移指定距离的新坐标
+  expandRectangleSimple(p1, p2, p3, p4, expandAmount = 0.01) {
+    const edge12 = new THREE.Vector3().copy(p2).sub(p1);
+    const edge14 = new THREE.Vector3().copy(p4).sub(p1);
+    const len12 = edge12.length();
+    const len14 = edge14.length();
+    let longEdgeDir, shortEdgeDir;
+    let halfLong, halfShort;
+    if (len12 >= len14) {
+      longEdgeDir = edge12.clone().normalize();
+      shortEdgeDir = edge14.clone().normalize();
+      halfLong = len12 / 2;
+      halfShort = len14 / 2;
+    } else {
+      longEdgeDir = edge14.clone().normalize();
+      shortEdgeDir = edge12.clone().normalize();
+      halfLong = len14 / 2;
+      halfShort = len12 / 2;
+    }
+    const center = new THREE.Vector3().copy(p1).add(p2).add(p3).add(p4).multiplyScalar(0.25);
+    const newHalfLong = halfLong + expandAmount;
+    const newHalfShort = halfShort + expandAmount;
+    const newP1 = center.clone().addScaledVector(longEdgeDir, -newHalfLong).addScaledVector(shortEdgeDir, -newHalfShort);
+    const newP2 = center.clone().addScaledVector(longEdgeDir, newHalfLong).addScaledVector(shortEdgeDir, -newHalfShort);
+    const newP3 = center.clone().addScaledVector(longEdgeDir, newHalfLong).addScaledVector(shortEdgeDir, newHalfShort);
+    const newP4 = center.clone().addScaledVector(longEdgeDir, -newHalfLong).addScaledVector(shortEdgeDir, newHalfShort);
+    return [newP1, newP2, newP3, newP4];
+  }
   // 外扩还是内缩偏移点坐标
   xinLine1(x, y, pointa, pointb, num, wallHeight) {
     let point1;
@@ -14722,7 +14691,9 @@ class Scenario {
                   this.installWindows(winDraw[x2], x2);
                 } else if (winDraw[x2].userData.type === "door") {
                   this.singleLineWallMountedDoor(winDraw[x2], x2);
-                } else ;
+                } else if (winDraw[x2].userData.type === "passageEntrance") {
+                  this.addThePassModel(winDraw[x2]);
+                }
                 let mesh = this.windowTreatment(winDraw[x2], Mesh, wallHeight);
                 this.group.add(mesh);
               } else if (houMesh) {
@@ -14732,7 +14703,9 @@ class Scenario {
                     this.installWindows(winDraw[x2], x2);
                   } else if (winDraw[x2].userData.type === "door") {
                     this.singleLineWallMountedDoor(winDraw[x2], x2);
-                  } else ;
+                  } else if (winDraw[x2].userData.type === "passageEntrance") {
+                    this.addThePassModel(winDraw[x2]);
+                  }
                   new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
                   let mesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
                   this.group.add(mesh);
@@ -14743,7 +14716,9 @@ class Scenario {
                     this.singleLineWallMountedDoor(winDraw[x2], x2);
                   } else if (winDraw[x2].userData.type === "beam") {
                     console.log("梁");
-                  } else ;
+                  } else if (winDraw[x2].userData.type === "passageEntrance") {
+                    this.addThePassModel(winDraw[x2]);
+                  }
                   houMesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
                 }
               } else {
@@ -14753,7 +14728,9 @@ class Scenario {
                   this.singleLineWallMountedDoor(winDraw[x2], x2);
                 } else if (winDraw[x2].userData.type === "beam") {
                   console.log("梁");
-                } else ;
+                } else if (winDraw[x2].userData.type === "passageEntrance") {
+                  this.addThePassModel(winDraw[x2]);
+                }
                 houMesh = this.windowTreatment(winDraw[x2], Mesh, wallHeight);
               }
             }
@@ -14767,7 +14744,8 @@ class Scenario {
   // 生成梁模型
   generateBeamModel(line) {
     let basePoints;
-    if (!line.userData.expansionWidth) {
+    let expansionPoints;
+    if (!line.userData.expansionWidth && !line.userData.expansionDirction) {
       let wallWidth;
       if (line.userData.wallWidth) {
         wallWidth = line.userData.wallWidth;
@@ -14776,17 +14754,19 @@ class Scenario {
       }
       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);
+      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);
     } 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);
+      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);
       basePoints = [pointStart, pointEnd, endExpansion, startExpansion];
+      expansionPoints = this.expandRectangleSimple(pointStart, pointEnd, endExpansion, startExpansion, 0.01);
     }
     const geometry = this.createParallelepipedFromBase(basePoints, line.userData.height);
     const material = new THREE.MeshStandardMaterial({
@@ -14795,7 +14775,7 @@ class Scenario {
       side: THREE.DoubleSide
     });
     const cube = new THREE.Mesh(geometry, material);
-    const bodyGeometry = this.createParallelepipedFromBase(basePoints, line.userData.rooftopPz);
+    const bodyGeometry = this.createParallelepipedFromBase(expansionPoints, line.userData.rooftopPz);
     const brush1 = new Brush(cube.geometry);
     brush1.updateMatrixWorld();
     const brush2 = new Brush(bodyGeometry);
@@ -14814,7 +14794,6 @@ class Scenario {
   }
   // 生成柱模型
   generateColumnModel(data, lines, Height) {
-    console.log(lines);
     let basePoints = [];
     for (const i in data) {
       basePoints.push(new THREE.Vector3(data[i].x, data[i].y, this.height ? this.height : 0));
@@ -14868,6 +14847,32 @@ class Scenario {
       return cube;
     }
   }
+  // 安装垭口模型
+  addThePassModel(line) {
+    const MobileX = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, line.userData.wallWidth * 0.5, true);
+    const MobileY = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, line.userData.wallWidth * 0.5, 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);
+    let basePoints = [startingPoint[0], startingPoint[1], finishLine[1], finishLine[0]];
+    const geometry = this.createParallelepipedFromBase(basePoints, line.userData.height);
+    const material = new THREE.MeshStandardMaterial({
+      color: 5214420,
+      transparent: true,
+      opacity: 0,
+      side: THREE.DoubleSide
+    });
+    const cube = new THREE.Mesh(geometry, material);
+    if (line.userData.type === "passageEntrance") {
+      this.poortNum = this.poortNum + 1;
+      cube.name = `垭口_${this.poortNum}`;
+      cube.userData.category = "passageEntrance";
+      cube.userData.height = line.userData.height;
+      cube.userData.width = line.length;
+      cube.userData.depth = line.userData.wallWidth;
+      cube.userData.groundHeight = 0;
+    }
+    this.group.add(cube);
+  }
   // 
   createAPlane(lines, menList) {
     const lineList = lines;

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

@@ -1,40 +1,6 @@
 import { LineSegment } from '../../utils/algorithms/LineSegment';
-import { Quadtree } from '../../utils/algorithms/Quadtree';
 import { LineUserData } from '../type';
-type ProjectionAnalysisResult = {
-    source: LineSegment;
-    sourceIndex: number;
-    target: LineSegment;
-    targetIndex: number;
-    project: LineSegment;
-    project2: LineSegment;
-    minDistance: number;
-};
 export declare class DoubleWallFinder {
-    static errorAngle: number;
-    /** 线段投影分析
-     * @param index
-     * @param sourceLineSegment
-     * @param lineSegmentList
-     * @returns
-     */
-    private static projectionAnalysis;
-    /** 查找
-     * @param lines
-     * @param wallWidth
-     * @returns
-     */
-    static findDoubleLine(lines: LineSegment<LineUserData>[], wallWidth?: number): {
-        resultList: ProjectionAnalysisResult[];
-        walls: LineSegment<LineUserData>[];
-        quadtree: Quadtree<number>;
-    };
-    /** 补双线墙壁
-     * @param lines
-     * @param wallWidth
-     * @returns
-     */
-    static complementSide(lines: LineSegment<LineUserData>[], obstacleAegment?: LineSegment[], wallWidth?: number): LineSegment<LineUserData>[];
     /**
      * @param lines
      * @param parallelAxis
@@ -56,4 +22,3 @@ export declare class DoubleWallFinder {
      */
     static buildGroup(lineSegments: LineSegment<LineUserData>[]): (LineSegment<Record<string, any>> | LineSegment<LineUserData>)[];
 }
-export {};

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

@@ -40,6 +40,10 @@ export default class Scenario {
     singleLineWallValue: any;
     liangNum: number;
     zhuNum: number;
+    poortNum: number;
+    doorNum: number;
+    windowNum: number;
+    windowForm: number;
     private static _instance?;
     static get Instance(): Scenario | undefined;
     constructor(scene: THREE.Scene, camera: THREE.PerspectiveCamera, renderer: THREE.WebGLRenderer, controls: OrbitControls);
@@ -62,6 +66,8 @@ export default class Scenario {
     doorHoleOpening(wallHeight: number, data: any, data1: any, groundHeight?: number, Height?: number, distance?: number, center?: THREE.Vector3, angleRad?: any, index?: string, doorList?: LineSegment): void;
     angleToXAxisDegrees(x1: number, y1: number, x2: number, y2: number, wide: number, cd: boolean): number;
     xinLine(x: number, y: number, point: THREE.Vector3 | Point, wallHeight: number): THREE.Vector3[];
+    expandRectangleAlongLongSide(p1: THREE.Vector3, p2: THREE.Vector3, p3: THREE.Vector3, p4: THREE.Vector3, expandAmount?: number): THREE.Vector3[];
+    expandRectangleSimple(p1: THREE.Vector3, p2: THREE.Vector3, p3: THREE.Vector3, p4: THREE.Vector3, expandAmount?: number): THREE.Vector3[];
     xinLine1(x: number, y: number, pointa: THREE.Vector3, pointb: THREE.Vector3, num: number, wallHeight: number): any[];
     createParallelepipedFromBase(points: any, height: number): THREE.ExtrudeGeometry;
     correctionSorting(bitem: any): {
@@ -76,6 +82,7 @@ export default class Scenario {
     overallTreatmentOfSingleLineWalls(data: any): void;
     generateBeamModel(line: any): 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;
     modelLoader(): Promise<void>;
     windowModelLoader(): Promise<void>;