build-dxf 0.1.45 → 0.1.46

package/package.json

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

package/src/build.js

@@ -3132,18 +3132,22 @@ class Polygon extends Array {
    * @returns 
    */
   static fromByLinePath(lines, polygon2 = new Polygon()) {
-    const points = lines.flatMap((line, index2) => {
-      if (index2 === 0) {
-        const lines2 = lines[index2 + 1];
-        if (line.sameEndpointAsStart(lines2)) return [line.end, line.start];
-        else return [line.start, line.end];
-      } else {
-        const lines2 = lines[index2 - 1];
-        if (line.sameEndpointAsStart(lines2)) return [line.end];
-        else return [line.start];
-      }
-    });
-    polygon2.set(points);
+    if (lines.length < 2) {
+      polygon2.set(lines[0].points);
+    } else {
+      const points = lines.flatMap((line, index2) => {
+        if (index2 === 0) {
+          const lines2 = lines[index2 + 1];
+          if (line.sameEndpointAsStart(lines2)) return [line.end, line.start];
+          else return [line.start, line.end];
+        } else {
+          const lines2 = lines[index2 - 1];
+          if (line.sameEndpointAsStart(lines2)) return [line.end];
+          else return [line.start];
+        }
+      });
+      polygon2.set(points);
+    }
     return polygon2;
   }
 }
@@ -14643,7 +14647,6 @@ class DoorFind {
     const openDoors = doors.filter((line) => !line.userData.doorDirectConnection), closeDoors = doors.filter((line) => line.userData.doorDirectConnection);
     this.grid = createPointVirtualGrid(noDoorLines);
     this.quadtree = createQuadtree([...noDoorLines, ...closeDoors]);
-    openDoors.forEach((l) => l.userData.doorDirectConnection = true);
     closeDoors.forEach((line) => this.findCloseDoors(line));
     openDoors.forEach((line) => this.findOpenDoors(line));
   }

package/src/index3.js

@@ -10504,10 +10504,11 @@ class CommandFlowComponent extends Component {
       });
     };
     const end = () => {
+      if (ended) return;
+      ended = true;
       handle.destroy();
       pointMesh.removeFromParent();
       resolve_ && resolve_(null);
-      ended = true;
       editor.renderManager.setAuxiliaryLineVisible(false);
     };
     const {
@@ -10561,6 +10562,13 @@ class CommandFlowComponent extends Component {
             return this;
           }
         };
+      },
+      // 等待每一个按键
+      async awaitEach(callBack, mode_ = "all") {
+        for await (const result of this.points(mode_)) {
+          callBack(result);
+        }
+        return this;
       }
     };
   }
@@ -14914,23 +14922,21 @@ class RayDistance extends CommandFlowComponent {
   onAddFromParent(parent) {
     super.onAddFromParent(parent);
     this.editor.container.add(this.container);
-    const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.createCursor("no-drop")).add(this.selectPoint.bind(this), { prompt: `请选择线段上的一个点作为发射点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择发射点, ${this.formatText("ESC")} 取消命令` }).setLoop(true);
-    commandFlow.writeOperationRecord = false;
-    commandFlow.addEventListener("finally", this.createFinally());
-    this.eventInput.addKeyCombination(this.commandName, this.shortcutKeys);
-    this.eventInput.addEventListener("codeChange", async () => this.eventInput.isKeyCombination(this.commandName) && await this.commandManager.start(this.commandName));
-    this.eventInput.addCancelDefaultBehavior(() => this.eventInput.isOnlyKeyDowns(this.shortcutKeys));
+    const commandFlow = this.initCommandFlow({
+      shortcutKeys: this.shortcutKeys,
+      writeOperationRecord: false,
+      loop: true
+    });
+    commandFlow.add(this.createCursor("no-drop")).add(this.selectPoint.bind(this), { prompt: `请选择线段上的一个点作为发射点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择发射点, ${this.formatText("ESC")} 取消命令` });
   }
   /** 选择点
    * @param next 
    */
   async selectPoint(next) {
     const pointSelector = this.createPointSelector();
-    this.addEventRecord("clear", () => {
-      pointSelector.end();
-      this.container.clear();
-    });
+    this.addEventRecord("clear", () => this.container.clear());
     const result = await pointSelector.next("line_point");
+    if (!result) return;
     next(result);
   }
   /** 射线
@@ -14995,28 +15001,30 @@ class ManualDistance extends CommandFlowComponent {
   onAddFromParent(parent) {
     super.onAddFromParent(parent);
     this.editor.container.add(this.container);
-    const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.createCursor("no-drop")).add(this.selectPoint.bind(this), { prompt: `请选择两个点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择, ${this.formatText("ESC")} 取消命令` }).setLoop(true);
-    commandFlow.writeOperationRecord = false;
-    commandFlow.addEventListener("finally", this.createFinally());
-    this.eventInput.addKeyCombination(this.commandName, this.shortcutKeys);
-    this.eventInput.addEventListener("codeChange", async () => this.eventInput.isKeyCombination(this.commandName) && await this.commandManager.start(this.commandName));
-    this.eventInput.addCancelDefaultBehavior(() => this.eventInput.isOnlyKeyDowns(this.shortcutKeys));
+    const commandFlow = this.initCommandFlow({
+      shortcutKeys: this.shortcutKeys,
+      writeOperationRecord: false,
+      loop: true
+    });
+    commandFlow.add(this.createCursor("crosshair")).add(this.selectPoint.bind(this), { prompt: `请选择两个点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择, ${this.formatText("ESC")} 取消命令` });
   }
   /** 选择点
    * @param next 
    */
   async selectPoint(next) {
     const pointSelector = this.createPointSelector();
-    this.addEventRecord("clear", () => {
-      this.container.clear();
-      pointSelector.end();
-    });
-    const point1 = (await pointSelector.next("all")).point;
-    this.renderer.createCircle(point1, {}, this.container);
-    const point2 = (await pointSelector.next("all")).point;
-    this.renderer.createCircle(point2, {}, this.container);
-    pointSelector.end();
-    next({ point1, point2 });
+    this.addEventRecord(this.COMMAND_END_EVEBT_RECORD_NAME, () => this.container.clear());
+    let points = [];
+    await pointSelector.awaitEach((result) => {
+      if (!result) return;
+      const { point } = result;
+      this.renderer.createCircle(point, {}, this.container);
+      points.push(point);
+      if (points.length === 2) pointSelector.end();
+    }, "all");
+    if (points.length === 2) {
+      next({ point1: points[0], point2: points[1] });
+    }
   }
   /** 射线
    * @param points 

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/{CommandFlowComponent.d.ts → CFComponent.d.ts}

@@ -187,6 +187,35 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
             }>;
             [Symbol.asyncIterator](): /*elided*/ any;
         };
+        awaitEach(callBack: (result: {
+            point: Point<Record<string, any>>;
+            line?: LineSegment;
+        } | null) => void, mode_?: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): Promise<{
+            readonly ended: boolean;
+            end: () => void;
+            next: (mode_: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null") => Promise<{
+                point: Point;
+                line?: LineSegment;
+            } | null>;
+            setBaseLine(line: LineSegment<Record<string, any>> | null, point: Point | null): void;
+            points(mode_: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): {
+                next(): Promise<{
+                    value: {
+                        point: Point;
+                        line?: LineSegment;
+                    };
+                    done: boolean;
+                } | {
+                    value: null;
+                    done: boolean;
+                }>;
+                [Symbol.asyncIterator](): /*elided*/ any;
+            };
+            awaitEach(callBack: (result: {
+                point: Point<Record<string, any>>;
+                line?: LineSegment;
+            } | null) => void, mode_?: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null"): Promise</*elided*/ any>;
+        }>;
     };
     /**
      * 创建拖拽点

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/ClippingLine.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { LineSegment } from '../../../../../LineSegment';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { Point } from '../../../../../Point';

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/Default.d.ts

@@ -1,5 +1,5 @@
 import { LineSegment } from '../../../../../LineSegment';
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { LineUserData } from '../../../../type';
 import * as THREE from "three";
 /**

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DeleteSelectLine.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 /**
  * 删除选择的线段

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DrawDoorLine.d.ts

@@ -1,6 +1,6 @@
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineSegment } from '../../../../../LineSegment';
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import * as THREE from "three";
 export declare class DrawDoorLine extends CommandFlowComponent<{
     pointerMove: {

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DrawLine.d.ts

@@ -1,5 +1,5 @@
 import { LineSegment } from '../../../../../LineSegment';
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
 export declare class DrawLine extends CommandFlowComponent<{

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DrawWindow.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { LineSegment } from '../../../../../LineSegment';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineUserData } from '../../../../type';

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/ManualDistance.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { Point } from '../../../../../Point';
 import * as THREE from "three";

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/MergeLine.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 /**
  * 合并同向线段

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/PointDrag/index.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from '../CommandFlowComponent';
+import { CommandFlowComponent } from '../CFComponent';
 import { ComponentManager } from '../../../../../../ComponentManager';
 import { WindowValueOption } from './modifyWindow';
 import { DoorValueOption } from './modifyDoor';

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/PropertiesPanel.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineSegment } from '../../../../../LineSegment';
 import * as THREE from "three";

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/RayDistance.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { Point } from '../../../../../Point';
 import * as THREE from "three";

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/SelectAll.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineSegment } from '../../../../../LineSegment';
 import * as THREE from "three";

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/TwoLineConnectionLine.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 /**
  * 两线段链接

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/TwoPointConnection.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 /**
  * 两点链接

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/VerticalCorr.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineSegment } from '../../../../../LineSegment';
 import { Point } from '../../../../../Point';

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/VerticalCorrContinue.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import { LineSegment } from '../../../../../LineSegment';
 import * as THREE from "three";

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/VerticalReferenceLine.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 /**
  * 设置y轴垂直基准线段

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/ViewAngle.d.ts

@@ -1,4 +1,4 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
+import { CommandFlowComponent } from './CFComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 /**
  * 合并同向线段