build-dxf 0.0.15 → 0.0.16

package/package.json

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

package/src/build.js

@@ -2138,13 +2138,8 @@ class LineAnalysis extends Component {
    * 门的位置判断
    */
   doorsAnalysis() {
-    const dxf = this.Dxf;
-    const doorPoints = [];
-    const pointVirtualGrid = this.pointVirtualGrid;
-    const quadtree = this.quadtree;
-    const doorSearchNearAngle = this.doorSearchNearAngle;
-    const doorSearchDistance = this.doorSearchDistance;
-    const doors = [];
+    this.parent?.findComponentByName("Renderer");
+    const dxf = this.Dxf, doorPoints = [], pointVirtualGrid = this.pointVirtualGrid, quadtree = this.quadtree, doorSearchNearAngle = this.doorSearchNearAngle, doorSearchDistance = this.doorSearchDistance, doors = [];
     const excludePoints = dxf.doors.flatMap((item) => {
       const index2 = item[4];
       const doorData = dxf.originalData[index2];
@@ -2362,24 +2357,79 @@ class LineAnalysis extends Component {
       };
     }).filter((i) => !!i && i.start.distance(i.end) < doorSearchDistance);
     doors.push(...doors_);
-    searchNearRasult.forEach((item) => {
-      doors.push({
-        start: doorPoints[item.doorIndex].point,
-        end: doorPoints[item.findDoorIndex].point,
-        index: doorPoints[item.doorIndex].index
-      });
+    searchNearRasult.forEach((item, i) => {
+      const start = doorPoints[item.doorIndex].point.clone();
+      const end = doorPoints[item.findDoorIndex].point.clone();
+      const startLine = this.findLongLineSegment(doorPoints[item.doorIndex].line);
+      const endLine = this.findLongLineSegment(doorPoints[item.findDoorIndex].line);
+      const p = startLine.projectPoint(end);
+      if (p) {
+        start.copy(p);
+        const l = new LineSegment(start, end);
+        const angle = endLine.includedAngle(l);
+        if (angle < 10 || angle > 170 || Math.abs(90 - angle) < 10) {
+          doors.push({
+            start,
+            end,
+            index: doorPoints[item.doorIndex].index
+          });
+        }
+      } else {
+        const p2 = endLine.projectPoint(start);
+        if (p2) end.copy(p2);
+        const l = new LineSegment(start, end);
+        const angle = startLine.includedAngle(l);
+        if (angle < 10 || angle > 170 || Math.abs(90 - angle) < 10) {
+          doors.push({
+            start,
+            end,
+            index: doorPoints[item.doorIndex].index
+          });
+        }
+      }
     });
     dxf.doorLineSegment.length = 0;
-    doors.forEach((p) => dxf.doorLineSegment.push(new LineSegment(p?.start, p?.end)));
-    dxf.doorLineSegment = dxf.doorLineSegment.filter((i) => {
-      const len = i.length();
-      if (len < 0.4) return false;
-      if (len > 1.2) {
-        this.addData(i.start.clone(), i.end.clone());
-      }
-      return true;
+    doors.forEach((p) => {
+      const line = new LineSegment(p?.start, p?.end);
+      const len = line.length();
+      if (len < 0.4) return;
+      const center = line.center, normal = line.normal();
+      const rLine = new LineSegment(
+        center.clone(),
+        center.clone().add(normal.clone().multiplyScalar(1))
+      );
+      rLine.directionMove(normal, -0.5);
+      const res = this.quadtree?.queryLineSegment(rLine);
+      if (res?.length) return;
+      dxf.doorLineSegment.push(line);
     });
   }
+  findLongLineSegment(line) {
+    const resLine = line.clone();
+    const res1 = this.pointVirtualGrid.queryPoint(line.start);
+    const res2 = this.pointVirtualGrid.queryPoint(line.end);
+    for (let i = 0; i < res1.length; i++) {
+      const { userData } = res1[i];
+      const line2 = this.lineSegmentList[userData?.index];
+      if (line2 === line) continue;
+      if (line2 && line2.directionEqual(line)) {
+        if (line2.start.equal(line.start)) resLine.start.copy(line2.end);
+        else resLine.start.copy(line2.start);
+        break;
+      }
+    }
+    for (let i = 0; i < res2.length; i++) {
+      const { userData } = res2[i];
+      const line2 = this.lineSegmentList[userData?.index];
+      if (line2 === line) continue;
+      if (line2 && line2.directionEqual(line)) {
+        if (line2.end.equal(line.end)) resLine.end.copy(line2.start);
+        else resLine.end.copy(line2.end);
+        break;
+      }
+    }
+    return resLine;
+  }
 }
 class DxfSystem extends ComponentManager {
   Dxf;

package/src/utils/DxfSystem/components/LineAnalysis.d.ts

@@ -84,5 +84,6 @@ export declare class LineAnalysis extends Component {
      * 门的位置判断
      */
     doorsAnalysis(): void;
+    findLongLineSegment(line: LineSegment): LineSegment<Record<string, any>>;
 }
 export {};