build-dxf 0.0.20-8 → 0.0.20

package/src/selectLocalFile.js

@@ -69,17 +69,15 @@ 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 (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();
+        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();
         this.onResize && this.onResize(width, height);
         this.dispatchEvent({ type: "resize", width, height });
       });
@@ -99,6 +97,7 @@ 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,10 +18,6 @@ export declare class CommandFlow extends EventDispatcher<{
     finally: {};
 }> {
     list: CommandFlowCallBack[];
-    rollbacklist: CommandFlowCallBack[];
-    revokeList: CommandFlowCallBack[];
     add(operation: CommandFlowCallBack): this;
-    addRollback(callBack: (data?: any) => void): void;
-    addRevoke(callBack: (data?: any) => void): void;
 }
 export {};

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

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

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

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

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

@@ -3,7 +3,6 @@ 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;
@@ -17,8 +16,6 @@ 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();
@@ -28,7 +25,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/Default.d.ts

@@ -26,6 +26,26 @@ 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/index.d.ts

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

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

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

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

@@ -1,19 +0,0 @@
-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;
-}

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

@@ -1,19 +0,0 @@
-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;
-}

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

@@ -1,19 +0,0 @@
-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 connection;
-}

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

@@ -1,19 +0,0 @@
-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;
-}

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

@@ -1,17 +0,0 @@
-import { CommandFlowComponent } from './CommandFlowComponent';
-import { ComponentManager } from '../../../../../ComponentManager';
-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;
-}

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

@@ -1,39 +0,0 @@
-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 point
-     * @param point2
-     */
-    setPointAll(point: Point, point2: Point): void;
-    /** 修正
-     * @param selectLine
-     * @param vistedList
-     */
-    correction(selectLine: LineSegment, vistedList?: Set<LineSegment>): Set<LineSegment<Record<string, any>>> | undefined;
-    /** 开始
-     * @param next
-     */
-    verticalCorrection(next: any, selectLines: LineSegment[]): void;
-}

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

@@ -1,19 +0,0 @@
-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;
-}