build-dxf 0.0.18 → 0.0.19

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

@@ -0,0 +1,23 @@
+import { EventDispatcher } from '../ComponentManager';
+type CommandFlowCallBack = ((next: (data?: any) => void, data?: any) => void);
+export declare class CommandFlow extends EventDispatcher<{
+    started: {};
+    executing: {
+        index: number;
+    };
+    executionCompleted: {
+        index: number;
+        data?: any;
+    };
+    executionInterrupt: {
+        index: number;
+    };
+    completed: {
+        data?: any;
+    };
+    finally: {};
+}> {
+    list: CommandFlowCallBack[];
+    add(operation: CommandFlowCallBack): this;
+}
+export {};

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

@@ -0,0 +1,59 @@
+import { EventDispatcher } from '../ComponentManager';
+import { CommandFlow } from './CommandFlow';
+export declare class CommandManager extends EventDispatcher<{
+    startedBefore: {
+        name: string;
+        currentName: string | null;
+    };
+    started: {
+        name: string;
+    };
+    cancel: {
+        name: string;
+    };
+    executing: {
+        name: string;
+        index: number;
+    };
+    executionCompleted: {
+        name: string;
+        index: number;
+        data?: any;
+    };
+    executionInterrupt: {
+        name: string;
+        index: number;
+    };
+    completed: {
+        name: string;
+        data?: any;
+    };
+    finally: {
+        name: string;
+    };
+}> {
+    commandFlowMap: Map<string, CommandFlow>;
+    lock: boolean;
+    private abortController;
+    private resolve;
+    currentName: string | null;
+    private _disabled;
+    set disabled(disabled: boolean);
+    get disabled(): boolean;
+    constructor();
+    /** 添加命令流
+     * @param name
+     * @returns
+     */
+    addCommandFlow(name: string): CommandFlow;
+    private executionPromise;
+    private executionResolve;
+    /** 执行控制流
+     * @param name
+     * @returns
+     */
+    start(name: string, data?: any, step?: number): Promise<any>;
+    /** 取消当前命令
+     */
+    cancel(): void;
+}

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

@@ -0,0 +1,2 @@
+export * from './CommandFlow';
+export * from './CommandManager';

package/src/utils/ComponentManager/EventDispatcher.d.ts

@@ -1,4 +1,14 @@
-import { EventDispatcher as ED } from 'three';
+import { EventDispatcher as ED, EventListener } from 'three';
 export declare class EventDispatcher<TEventMap extends {} = {}> extends ED<TEventMap> {
     uuid: string;
+    addEventListener<T extends Extract<keyof TEventMap, string>>(type: T, listener: EventListener<TEventMap[T], T, this>, option?: {
+        once: boolean;
+    }): () => void;
+    private eventRecordStack;
+    addEventRecord(name: string, ...cancels: (() => void)[]): {
+        add: (cancel: () => void) => {
+            add: /*elided*/ any;
+        };
+    };
+    canceEventRecord(name: string): void;
 }

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

@@ -7,32 +7,33 @@ export interface OriginalDataItem {
     start: {
         x: number;
         y: number;
-        z: number;
+        z?: number;
     };
     end: {
         x: number;
         y: number;
-        z: number;
+        z?: number;
     };
     insetionArr: {
         index: number;
         p: {
             x: number;
             y: number;
-            z: number;
+            z?: number;
         };
     }[];
     isDoor?: boolean;
+    doorDirectConnection?: boolean;
     drawDoorData?: {
         start: {
             x: number;
             y: number;
-            z: number;
+            z?: number;
         };
         n: {
             x: number;
             y: number;
-            z: number;
+            z?: number;
         };
     };
     isWindow?: boolean;
@@ -40,11 +41,11 @@ export interface OriginalDataItem {
         p: {
             x: number;
             y: number;
-            z: number;
+            z?: number;
         };
         width: number;
         full: boolean;
-    };
+    }[];
 }
 /**
  * [开始点, 结束点, 相交点, 是否是门, 索引]
@@ -87,6 +88,7 @@ export declare class Dxf extends Component<{
     lineSegments: LineSegment<{
         isDoor: boolean;
         isWindow: boolean;
+        drawDoorData: any[];
     }>[];
     originalZAverage: number;
     static EndType: {
@@ -104,6 +106,7 @@ export declare class Dxf extends Component<{
     get lines(): LineSegment<{
         isDoor: boolean;
         isWindow: boolean;
+        drawDoorData: any[];
     }>[];
     /**初始化
      * @param data 点云数据
@@ -133,7 +136,7 @@ export declare class Dxf extends Component<{
      * @description 处理线路拓扑，使线路有序链接，形成长路径
      * @param lines
      */
-    lineTopology(lines: Point[][]): Point[][];
+    lineTopology(lines: Point[][]): Point<Record<string, any>>[][];
     /** 合并方向相同的线段
      * @param lines
      * @param errAngle
@@ -148,21 +151,21 @@ export declare class Dxf extends Component<{
      * @description 突变长度小于墙体宽度，该线段可能为突起线段，
      * @description 判断后续第2线段与上一条线段是否方向相同，相同就为突刺
      */
-    lineSegmentStraightening(path: Point[]): Point[];
+    lineSegmentStraightening(path: Point[]): Point<Record<string, any>>[];
     /**
      * 移除短线段
      * @todo 根据线段两端线段长度，选取参照物_|▔▔
      * @param path
      */
-    removeShortLine(path: Point[], shortLine?: number): Point[];
+    removeShortLine(path: Point[], shortLine?: number): Point<Record<string, any>>[];
     /** 线偏移
      * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
      */
-    lineOffset(endType?: number, joinType?: number, scale?: number): Point[][];
+    lineOffset(endType?: number, joinType?: number, scale?: number): Point<Record<string, any>>[][];
     /**
      * 将点云结构转换为Float32Array
      */
-    to3DArray(scale: number): Float32Array<ArrayBuffer>;
+    to3DArray(scale: number, z?: number): Float32Array<ArrayBuffer>;
     /** 获取角度范围
      * @param center
      * @param p1

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

@@ -4,7 +4,6 @@ import { Variable } from './Variable';
 import { Quadtree } from '../../Quadtree/Quadtree';
 import { LineSegment } from '../../Quadtree/LineSegment';
 import { Point } from '../../Quadtree/Point';
-import { PointVirtualGrid } from '../../PointVirtualGrid';
 import * as THREE from "three";
 type ProjectionAnalysisResult = {
     source: LineSegment;
@@ -38,7 +37,7 @@ export declare class LineAnalysis extends Component {
      * @returns
      */
     expandLineSegment(p1: Point, p2: Point, width?: number): {
-        points: Point[];
+        points: Point<Record<string, any>>[];
         indices: number[];
         rectIndices: number[];
     };
@@ -53,14 +52,6 @@ export declare class LineAnalysis extends Component {
      * @param result
      */
     createRectangle(result: ProjectionAnalysisResult): void;
-    pointVirtualGrid: PointVirtualGrid<{
-        index: number;
-        type: "start" | "end";
-    }>;
-    /**
-     * 构建点的虚拟网格索引
-     */
-    buildVirtualGrid(): void;
     quadtree?: Quadtree;
     /**
      * 构建线段四叉树，快速查找，
@@ -83,16 +74,6 @@ export declare class LineAnalysis extends Component {
     doorSearchNearAngle: number;
     doorSearchDistance: number;
     doors: LineSegment[];
-    /**
-     * 门的位置判断
-     */
     doorsAnalysis(): void;
-    /**
-     *
-     * @param line
-     * @returns
-     */
-    findLongLineSegment(line: LineSegment): LineSegment<Record<string, any>>;
-    doorsAnalysis2(): void;
 }
 export {};

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

@@ -14,6 +14,10 @@ interface EventType {
         y: number;
     }>;
     currentKeyUp: EventData<string>;
+    currentKeyDown: EventData<string>;
+    currentMouseUp: EventData<string>;
+    currentMouseDown: EventData<string>;
+    focus: EventData<boolean>;
 }
 export declare class Variable extends Component<EventType> {
     static name: string;
@@ -27,6 +31,10 @@ export declare class Variable extends Component<EventType> {
         y: number;
     };
     currentKeyUp: string;
+    currentKeyDown: string;
+    currentMouseUp: string;
+    currentMouseDown: string;
+    focus: boolean;
     set<KeyT extends keyof EventType>(key: KeyT, value: any): void;
     get<KeyT extends keyof EventType>(key: KeyT): this[KeyT] | undefined;
 }

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

@@ -0,0 +1,36 @@
+import { Component } from '../../../../../ComponentManager';
+import { Editor } from '../Editor';
+import { EventInput, Renderer } from '../../../RenderPlugin/components';
+import { CommandManager } from '../../../../../CommandManager';
+import { RenderManager } from '../RenderManager';
+export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Component<TEventMap> {
+    private _renderer?;
+    get renderer(): Renderer;
+    private _domElement?;
+    get domElement(): HTMLDivElement;
+    private _editor?;
+    get editor(): Editor;
+    private _eventInput?;
+    get eventInput(): EventInput;
+    private _renderManager?;
+    get renderManager(): RenderManager;
+    private _commandManager?;
+    get commandManager(): CommandManager;
+    interruptKeys: string[];
+    /**
+     * 创建中断
+     * @returns
+     */
+    createInterrupt(): (next: any, data: any) => void;
+    /**
+     * 创建鼠标图标变化
+     * @param cursor
+     * @returns
+     */
+    createCursor(cursor: string): (next: any, data: any) => void;
+    /**
+     * 创建清理
+     * @returns
+     */
+    createFinally(): () => void;
+}

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

@@ -0,0 +1,57 @@
+import { Component } from '../../../../../ComponentManager';
+import { Editor } from '../Editor';
+import { Renderer } from '../../../RenderPlugin/components';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { LineUserData } from '../RenderManager';
+import * as THREE from "three";
+export declare class Default extends Component<{}> {
+    static name: string;
+    get editor(): Editor;
+    renderer?: Renderer;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    onAddFromParent(): void;
+    selectLines: LineSegment<LineUserData>[];
+    selectLineObject3D: THREE.Mesh<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.Material | THREE.Material[], THREE.Object3DEventMap>;
+    /** 添加选择的线段
+     * @param lineSegment
+     */
+    addSelectLine(lineSegment: LineSegment): void;
+    /** 移除选择的线段
+     * @param lineSegment
+     */
+    removeSelectLine(lineSegment: LineSegment): void;
+    /**
+     * 删除选择的线段
+     */
+    deleteSelectLine(): void;
+    /**
+     * 删除选择线段上的窗户
+     */
+    deleteSelectWindow(): void;
+    /**
+     * 如果只选择两个线段，可为两个未链接的点创建连接
+     */
+    connection(): void;
+    /**
+     * 如果只选择两个线段，可为两个未链接的点创建连接, 通过计算交点，线段延长到交点
+     */
+    intersectionConnection(): void;
+    /**
+     * 如果只选择两个线段, 且两个线段在一条路径上，合并线段
+     */
+    mergeLine(): void;
+    private _timer;
+    /**
+     * 更新选择的线段
+     */
+    updateSelectLinesGeometry(): void;
+    /**
+     * 开始执行
+     * @param next
+     */
+    start(): void;
+    /**
+     * 清理
+     */
+    finally(): void;
+}

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

@@ -0,0 +1,19 @@
+import { ComponentManager } from '../../../../../ComponentManager';
+import { Point } from '../../../../../Quadtree/Point';
+import { CommandFlowComponent } from './CommandFlowComponent';
+import * as THREE from "three";
+export declare class DrawDoorLine extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    interruptKeys: string[];
+    shortcutKeys: string[];
+    commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /** 选择点
+     * @param next
+     */
+    selectPoint(next: any): void;
+    /** 执行完成
+     */
+    completed(points: Point[]): void;
+}

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

@@ -0,0 +1,20 @@
+import { Point } from '../../../../../Quadtree/Point';
+import { CommandFlowComponent } from './CommandFlowComponent';
+import * as THREE from "three";
+export declare class DrawLine extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    interruptKeys: string[];
+    withdrawalKeys: string[];
+    shortcutKeys: string[];
+    confirmKeys: string[];
+    commandName: string;
+    onAddFromParent(): void;
+    /** 选择点
+     * @param next
+     */
+    selectPoint(next: any): void;
+    /** 执行完成
+     */
+    completed(points: Point[]): void;
+}

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

@@ -0,0 +1,25 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import * as THREE from "three";
+export declare class DrawWindow extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    interruptKeys: string[];
+    shortcutKeys: string[];
+    commandName: string;
+    onAddFromParent(): void;
+    /** 选择开始点
+     * @param next
+     */
+    selectPointStart(next: any): void;
+    /** 选择结束点
+     * @param next
+     */
+    selectPointEnd(next: any, { point, line }: {
+        point: THREE.Vector3;
+        line: LineSegment;
+    }): void;
+    /** 执行完成
+     */
+    completed(data: any): void;
+}

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

@@ -0,0 +1,27 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import * as THREE from "three";
+export declare class PointDrag extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    interruptKeys: string[];
+    shortcutKeys: string[];
+    commandName: string;
+    onAddFromParent(): void;
+    /** 选择开始点
+     * @param next
+     */
+    selectPoint(next: any): void;
+    /** 拖拽点
+     * @description 拖拽点到指定位置
+     * @param next
+     * @param param1
+     */
+    drag(next: any, { point, line }: {
+        point: THREE.Vector3;
+        line: LineSegment;
+    }): void;
+    /** 执行完成
+     */
+    completed(data: any): void;
+}

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

@@ -1,7 +1,10 @@
-import { Component, ComponentManager } from '../../../../ComponentManager';
+import { Component } from '../../../../ComponentManager';
 import { Dxf } from '../../../components/Dxf';
 import { Variable } from '../../../components/Variable';
-import { Renderer } from '../../RenderPlugin/components';
+import { DomContainer, DomEventRegister, EventInput, Renderer } from '../../RenderPlugin/components';
+import { RenderManager } from './RenderManager';
+import { CommandManager } from '../../../../CommandManager';
+import { App } from 'vue';
 import * as THREE from "three";
 export declare class Editor extends Component<{
     pointerPositionChange: {
@@ -13,9 +16,25 @@ export declare class Editor extends Component<{
     get renderer(): Renderer;
     get dxf(): Dxf;
     get variable(): Variable;
+    get eventInput(): EventInput;
+    get renderManager(): RenderManager;
+    get domEventRegister(): DomEventRegister;
+    get domContainer(): DomContainer;
+    commandManager: CommandManager;
     plane: THREE.Mesh<THREE.PlaneGeometry, THREE.Material | THREE.Material[], THREE.Object3DEventMap>;
-    onAddFromParent(parent: ComponentManager): void;
+    app?: App<Element>;
+    domElement: HTMLDivElement;
+    onAddFromParent(): void;
+    coords: THREE.Vector2;
+    pointerPosition: THREE.Vector2;
     private _exitEditCallBack?;
+    /**
+     * 打开编辑器
+     */
     openEdit(): void;
+    /**
+     * 退出编辑
+     */
     exitEdit(): void;
+    destroy(): void;
 }

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

@@ -0,0 +1,88 @@
+import { LineSegment } from '../../../../Quadtree/LineSegment';
+import { Component } from '../../../../ComponentManager';
+import { Dxf, OriginalDataItem } from '../../../components/Dxf';
+import { Variable } from '../../../components/Variable';
+import { EventInput, Renderer } from '../../RenderPlugin/components';
+import { PointVirtualGrid } from '../../../../PointVirtualGrid';
+import { Editor } from './Editor';
+import { Quadtree, QuadtreeNode } from '../../../../Quadtree/Quadtree';
+import { DxfLineModel } from '../../ModelDataPlugin/components';
+import * as THREE from "three";
+export type LineUserData = {
+    doorDirectConnection?: boolean;
+    isDoor?: boolean;
+    isWindow?: boolean;
+    drawDoorData?: {
+        p: THREE.Vector3;
+        width: number;
+        full: boolean;
+    }[];
+    quadtreeNode?: QuadtreeNode;
+};
+export declare class RenderManager extends Component<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    lines: LineSegment<LineUserData>[];
+    pointVirtualGrid: PointVirtualGrid<LineSegment<LineUserData>>;
+    quadtree: Quadtree<any>;
+    actionHistory: Set<{
+        type: "addLine" | "removeLine";
+        data: any;
+    }>;
+    onAddFromParent(): void;
+    private updatedMode;
+    /** 重新设置数据
+     */
+    reset(): void;
+    /** 添加线段
+     * @param line
+     */
+    addLine(line: LineSegment<LineUserData>): void;
+    /**
+     * 批量添加
+     * @param lines
+     */
+    addLines(lines: LineSegment<LineUserData>[]): void;
+    /** 移除线段
+     * @param line
+     */
+    removeLine(line: LineSegment<LineUserData>): void;
+    /**
+     * 绘制
+     */
+    draw(synchronize?: boolean): void;
+    /** 获取鼠标当前点, 吸附后的点
+     * @param point
+     * @returns
+     */
+    adsorption(radius?: number, pointVirtualGrid?: PointVirtualGrid<LineSegment<LineUserData>>, quadtree?: Quadtree<any>): {
+        point: THREE.Vector3;
+        find: boolean;
+        mode: string;
+        line: LineSegment;
+    } | {
+        point: THREE.Vector3;
+        find: boolean;
+        mode?: undefined;
+        line?: undefined;
+    };
+    /** 创建几何体
+     * @param rectangle
+     */
+    createGeometry(map: Record<string, number[]>, count: number): THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>;
+    /**
+     * 转为json
+     */
+    toJson(): OriginalDataItem[];
+    private _timer;
+    /**
+     * 同步到dxf
+     */
+    synchronizeDxf(): void;
+    get renderer(): Renderer;
+    get dxf(): Dxf;
+    get variable(): Variable;
+    get eventInput(): EventInput;
+    get editor(): Editor;
+    get dxfLineModel(): DxfLineModel;
+}

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

@@ -0,0 +1,6 @@
+export * from './Editor';
+export * from './RenderManager';
+export * from './CommandFlow/Default';
+export * from './CommandFlow/DrawDoorLine';
+export * from './CommandFlow/DrawLine';
+export * from './CommandFlow/DrawWindow';

package/src/utils/DxfSystem/plugin/Editor/pages/EditorTool.vue.d.ts

@@ -0,0 +1,6 @@
+import { DxfSystem } from '../../..';
+type __VLS_Props = {
+    dxfSystem: DxfSystem;
+};
+declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
+export default _default;

package/src/utils/DxfSystem/plugin/ModelDataPlugin/components/DxfLineModel.d.ts

@@ -1,9 +1,13 @@
 import { Component, ComponentManager } from '../../../../ComponentManager';
 import * as THREE from "three";
-export declare class DxfLineModel extends Component {
+export declare class DxfLineModel extends Component<{
+    modelUpdate: {
+        model: THREE.Group;
+    };
+}> {
     static name: string;
-    private dxfLineModel;
-    private dxfDoorsLineModel;
+    dxfLineModel: THREE.LineSegments<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.Material | THREE.Material[], THREE.Object3DEventMap>;
+    dxfDoorsLineModel: THREE.LineSegments<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.Material | THREE.Material[], THREE.Object3DEventMap>;
     dxfModelGroup: THREE.Group<THREE.Object3DEventMap>;
     onAddFromParent(parent: ComponentManager): void;
     updateMode(): void;

package/src/utils/DxfSystem/plugin/ModelDataPlugin/index.d.ts

@@ -1,4 +1,12 @@
 import { DxfSystem } from '../..';
 import * as components from "./components";
-declare function ModelDataPlugin(dxfSystem: DxfSystem): void;
+type Option = {
+    detailsPoint?: boolean;
+    whiteModel?: boolean;
+    dxfLineModel?: boolean;
+};
+declare function ModelDataPlugin_(dxfSystem: DxfSystem, option?: Option): void;
+declare const ModelDataPlugin: typeof ModelDataPlugin_ & {
+    create(option?: Option): (dxfSystem: DxfSystem) => void;
+};
 export { components, ModelDataPlugin };

package/src/utils/DxfSystem/plugin/RenderPlugin/components/DomContainer.d.ts

@@ -4,5 +4,6 @@ export declare class DomContainer extends Component {
     domElement: HTMLDivElement;
     canvas: HTMLCanvasElement;
     html2DRenderer: HTMLDivElement;
+    html3DRenderer: HTMLDivElement;
     constructor();
 }