build-dxf 0.0.20-1 → 0.0.20-10

package/src/selectLocalFile.js

@@ -69,15 +69,17 @@ class Renderer extends Component {
         this.renderer.setSize(width, height);
         if (this.html2DRenderer) this.html2DRenderer.setSize(width, height);
         if (this.html3DRenderer) this.html3DRenderer.setSize(width, height);
-        if (camera2 instanceof THREE.PerspectiveCamera) {
-          camera2.aspect = width / height;
-        } else if (camera2 instanceof THREE.OrthographicCamera) {
-          camera2.left = -width * 0.5;
-          camera2.right = width * 0.5;
-          camera2.top = height * 0.5;
-          camera2.bottom = -height * 0.5;
+        if (this.orbitControls) {
+          if (camera2 instanceof THREE.PerspectiveCamera) {
+            camera2.aspect = width / height;
+          } else if (camera2 instanceof THREE.OrthographicCamera) {
+            camera2.left = -width * 0.5;
+            camera2.right = width * 0.5;
+            camera2.top = height * 0.5;
+            camera2.bottom = -height * 0.5;
+          }
+          camera2.updateProjectionMatrix();
         }
-        camera2.updateProjectionMatrix();
         this.onResize && this.onResize(width, height);
         this.dispatchEvent({ type: "resize", width, height });
       });
@@ -97,7 +99,6 @@ class Renderer extends Component {
     const directLight = new THREE.DirectionalLight(16777215, 4);
     directLight.position.set(100, -100, 100);
     this.scene.add(directLight);
-    camera.position.set(10, 10, 10);
   }
   /**
    * 世界坐标转屏幕坐标

package/src/utils/CommandManager/CommandFlow.d.ts

@@ -18,6 +18,22 @@ export declare class CommandFlow extends EventDispatcher<{
     finally: {};
 }> {
     list: CommandFlowCallBack[];
+    rollbacklist: ((data?: any) => void)[];
+    revokeRollbacklist: ((data?: any) => void)[];
+    /**
+     *
+     * @param operation
+     * @returns
+     */
     add(operation: CommandFlowCallBack): this;
+    /** 添加回滚回调列表
+     * @param callBack
+     */
+    addRollback(callBack: (data?: any) => void): this;
+    /** 添加撤回回滚回调列表
+     * @param callBack
+     * @returns
+     */
+    addRevokeRollback(callBack: (data?: any) => void): this;
 }
 export {};

package/src/utils/CommandManager/CommandManager.d.ts

@@ -1,5 +1,9 @@
 import { EventDispatcher } from '../ComponentManager';
 import { CommandFlow } from './CommandFlow';
+export type Operation = {
+    name: string;
+    data: any;
+};
 export declare class CommandManager extends EventDispatcher<{
     startedBefore: {
         name: string;
@@ -31,6 +35,12 @@ export declare class CommandManager extends EventDispatcher<{
     finally: {
         name: string;
     };
+    rollback: {
+        name: string;
+    };
+    revokeRollback: {
+        name: string;
+    };
 }> {
     commandFlowMap: Map<string, CommandFlow>;
     lock: boolean;
@@ -40,6 +50,11 @@ export declare class CommandManager extends EventDispatcher<{
     private _disabled;
     set disabled(disabled: boolean);
     get disabled(): boolean;
+    /**
+     * 操作记录
+     */
+    operationList: Operation[];
+    rollbackList: Operation[];
     constructor();
     /** 添加命令流
      * @param name
@@ -56,4 +71,12 @@ export declare class CommandManager extends EventDispatcher<{
     /** 取消当前命令
      */
     cancel(): void;
+    /**
+     * 回滚
+     */
+    rollback(): boolean;
+    /**
+     * 撤销回滚
+     */
+    revokeRollback(): boolean;
 }

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

@@ -22,6 +22,7 @@ export interface OriginalDataItem {
             z?: number;
         };
     }[];
+    length: number;
     isDoor?: boolean;
     doorDirectConnection?: boolean;
     drawDoorData?: {

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

@@ -3,6 +3,7 @@ import { Editor } from '../Editor';
 import { EventInput, Renderer } from '../../../RenderPlugin/components';
 import { CommandManager } from '../../../../../CommandManager';
 import { RenderManager } from '../RenderManager';
+import { Default } from './Default';
 export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Component<TEventMap> {
     private _renderer?;
     get renderer(): Renderer;
@@ -16,6 +17,8 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
     get renderManager(): RenderManager;
     private _commandManager?;
     get commandManager(): CommandManager;
+    private _default?;
+    get default(): Default;
     interruptKeys: string[];
     commandName: string;
     constructor();
@@ -25,7 +28,7 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
      */
     cancel(): void;
     /**
-     * 创建中断
+     * 创建中断处理命令节点
      * @returns
      */
     createInterrupt(): (next: any, data: any) => void;

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

@@ -0,0 +1,33 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 连接选择的线段
+ */
+export declare class ConnectionLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 连接
+     * @param next
+     */
+    private connection;
+    /** 成功
+     * @param next
+     * @param selectLines
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -26,26 +26,6 @@ export declare class Default extends Component<{
      * 移除所有选中线段
      */
     removeSelectLineAll(): void;
-    /**
-     * 删除选择的线段
-     */
-    deleteSelectLine(): void;
-    /**
-     * 删除选择线段上的窗户
-     */
-    deleteSelectWindow(): void;
-    /**
-     * 如果只选择两个线段，可为两个未链接的点创建连接
-     */
-    connection(): void;
-    /**
-     * 如果只选择两个线段，可为两个未链接的点创建连接, 通过计算交点，线段延长到交点
-     */
-    intersectionConnection(): void;
-    /**
-     * 如果只选择两个线段, 且两个线段在一条路径上，合并线段
-     */
-    mergeLine(): void;
     private _timer;
     /**
      * 更新选择的线段

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

@@ -0,0 +1,28 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 删除选择的线段
+ */
+export declare class DeleteSelectLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private delete;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -0,0 +1,33 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 删除选择的线段上的窗户线
+ */
+export declare class DeleteSelectWindow extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private end;
+    /**
+     * 完成
+     * @param list
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -1,5 +1,6 @@
 import { ComponentManager } from '../../../../../ComponentManager';
-import { Point } from '../../../../../Quadtree/Point';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { LineUserData } from '../RenderManager';
 import { CommandFlowComponent } from './CommandFlowComponent';
 import * as THREE from "three";
 export declare class DrawDoorLine extends CommandFlowComponent<{}> {
@@ -12,8 +13,23 @@ export declare class DrawDoorLine extends CommandFlowComponent<{}> {
     /** 选择点
      * @param next
      */
-    selectPoint(next: any): void;
+    private selectPoint;
+    /**
+     * 结束处理
+     * @param next
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(points: Point[]): void;
+    completed(lines: LineSegment<LineUserData>[]): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -1,8 +1,11 @@
-import { Point } from '../../../../../Quadtree/Point';
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
-export declare class DrawLine extends CommandFlowComponent<{}> {
+export declare class DrawLine extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
@@ -14,8 +17,21 @@ export declare class DrawLine extends CommandFlowComponent<{}> {
     /** 选择点
      * @param next
      */
-    selectPoint(next: any): void;
+    private selectPoint;
+    /** 结束， 汇总结果
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(points: Point[]): void;
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -1,5 +1,6 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { LineUserData } from '../RenderManager';
 import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
 export declare class DrawWindow extends CommandFlowComponent<{}> {
@@ -20,7 +21,25 @@ export declare class DrawWindow extends CommandFlowComponent<{}> {
         point: THREE.Vector3;
         line: LineSegment;
     }): void;
+    /**
+     * 结束处理
+     * @param next
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(data: any): void;
+    completed({ doorDataItem, line }: {
+        doorDataItem: any;
+        line: LineSegment<LineUserData>;
+    }): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param data
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -0,0 +1,33 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 连接选择的线段
+ */
+export declare class IntersectionConnectionLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private connection;
+    /** 执行完成
+     * @param next
+     * @param selectLines
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -0,0 +1,32 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 合并同向线段
+ */
+export declare class MergeLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private mergeLine;
+    /** 执行完成
+     * @param data
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -2,7 +2,11 @@ import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
-export declare class PointDrag extends CommandFlowComponent<{}> {
+export declare class PointDrag extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
@@ -25,4 +29,13 @@ export declare class PointDrag extends CommandFlowComponent<{}> {
     /** 执行完成
      */
     completed(data: any): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

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

@@ -0,0 +1,30 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import * as THREE from "three";
+/**
+ * 选择全部命令
+ */
+export declare class SelectAll extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /** 开始
+     * @param next
+     */
+    selectAll(next: any): void;
+    /** 执行完成
+     */
+    completed(lines: LineSegment[]): void;
+    /** 回滚操作
+     * @param lines
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -0,0 +1,63 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { Point } from '../../../../../Quadtree/Point';
+import * as THREE from "three";
+/**
+ * 垂直纠正
+ */
+export declare class VerticalCorrection extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    constraint(next: any, selectLines: LineSegment[]): void;
+    /**
+     * 线段是否为结尾线段
+     * @param line
+     */
+    lineIsPathEnd(line: LineSegment): boolean;
+    /**
+     *
+     * @param line0
+     * @param line1
+     */
+    isTowLineSegmentConnect(line0: LineSegment, line1: LineSegment): boolean;
+    /**
+     * 获取所有相同点的位置信息
+     * @param point
+     * @param point2
+     */
+    getSamePointAll(point: Point, point2: Point): {
+        point: Point<Record<string, any>>;
+        oldPoint: Point<Record<string, any>>;
+        newPoint: Point<Record<string, any>>;
+        line: LineSegment;
+    }[];
+    /** 修正
+     * @param targettLine
+     * @param vistedList
+     */
+    correction(targettLine: LineSegment, resultList?: any[], vistedList?: Set<LineSegment>): any[] | undefined;
+    /** 开始
+     * @param next
+     */
+    verticalCorrection(next: any, selectLines: LineSegment[]): void;
+    /** 执行完成
+     * @param data
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

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

@@ -4,3 +4,4 @@ export * from './CommandFlow/Default';
 export * from './CommandFlow/DrawDoorLine';
 export * from './CommandFlow/DrawLine';
 export * from './CommandFlow/DrawWindow';
+export * from './CommandFlow/VerticalCorrection';

package/src/utils/Quadtree/LineSegment.d.ts

@@ -11,6 +11,7 @@ export declare class LineSegment<T = Record<string, any>> {
     get start(): Point<Record<string, any>>;
     get end(): Point<Record<string, any>>;
     constructor(p1?: Point, p2?: Point);
+    set(p1: Point, p2: Point): void;
     /** 膨胀
      * @description 向线段的两个端点分别膨胀 width
      * @param width

package/src/utils/Quadtree/Point.d.ts

@@ -125,9 +125,10 @@ export declare class Point<T = Record<string, any>> {
         x: number;
         y: number;
     }): void;
-    toJson(): {
+    toJson(z?: number): {
         x: number;
         y: number;
+        z: number;
     };
     static from(arr: any): Point<Record<string, any>>;
     static zero(): Point<Record<string, any>>;