build-dxf 0.0.21 → 0.0.23

package/src/selectLocalFile.js

@@ -125,6 +125,10 @@ class yn extends at {
    * @param count 
    */
   createLineSegments(t, n, r, a = this.container) {
+    if (Array.isArray(t)) {
+      const s = t.flatMap((l) => l?.points?.flatMap((u) => [u.x, u.y, 0]));
+      return this.createLineSegments({ position: s }, t.length * 2, r, a);
+    }
     const o = new _.BufferGeometry();
     Object.keys(t).forEach((s) => {
       const l = t[s];

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

@@ -3,8 +3,11 @@ import { Dxf } from './Dxf';
 /**
  * 角度修正过后的DXF格式数据
  */
-export declare class AngleCorrectionDxf extends Dxf<{}> {
+export declare class AngleCorrectionDxf extends Dxf<{
+    updateData: {};
+}> {
     static name: string;
+    angle: number;
     onAddFromParent(parent: ComponentManager): void;
     update(): Promise<void>;
 }

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

@@ -37,6 +37,7 @@ export interface OriginalDataItem {
             z?: number;
         };
     };
+    wallWidth?: number;
     isWindow?: boolean;
     isVerticalReferenceLine?: boolean;
     drawWindow?: {

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

@@ -4,6 +4,7 @@ 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;
@@ -13,6 +14,81 @@ type ProjectionAnalysisResult = {
     project: LineSegment;
     project2: LineSegment;
 };
+type DoorPoint = {
+    line: LineSegment;
+    point: Point;
+    uuid: string;
+};
+declare class DoorsAnalysis {
+    possibleDoorPoints: DoorPoint[];
+    doorPoint: DoorPoint[];
+    dxf: Dxf;
+    pointVirtualGrid: PointVirtualGrid<LineSegment<Record<string, any>>>;
+    findPointVirtualGrid: PointVirtualGrid<LineSegment>;
+    quadtree: Quadtree;
+    resultList: ProjectionAnalysisResult[];
+    lineSegments: LineSegment[];
+    doorSearchNearAngle: number;
+    doorSearchDistance: number;
+    doors: LineSegment[];
+    lineAnalysis: LineAnalysis;
+    continueFind: boolean;
+    constructor(lineAnalysis: LineAnalysis);
+    private handle;
+    private search;
+    /** 添加可查找点的过滤规则
+     * @param rule
+     */
+    addPointsExcludeRule(rule: (line: LineSegment, point: Point, pointIndex: number) => boolean): void;
+    private _pointsExcludeRule;
+    /**
+     * 查找所有可能为门的点位
+     */
+    getPossiblePoints(): DoorPoint[];
+    /**
+     * 查找已知为门的点位
+     */
+    getDoorPoint(): DoorPoint[];
+    /**
+     * 查找双线墙的点位
+     * @returns
+     */
+    searchDoubleLinePoint(): Map<number, 0 | 1 | -1>;
+    /** 查找方案一：最近点查找
+     * @description 以点为圆心，查找半径内符合角度的点
+     * @param doorPoints
+     * @param possibleDoorPoints
+     * @param doorSearchDistance 查找的距离（半径）
+     * @param doorSearchNearAngle 查找的角度
+     * @returns
+     */
+    searchNearby(doorPoints: DoorPoint[], possibleDoorPoints?: DoorPoint[], doorSearchDistance?: number, doorSearchNearAngle?: number): any[];
+    /** 方案二： 沿方向查找
+     * @description
+     * @param param0
+     * @returns
+     */
+    searchAlongDirection({ point, line }: DoorPoint, doorSearchDistance?: number): {
+        point: Point;
+        line: LineSegment<Record<string, any>>;
+    } | undefined;
+    /** 方案三： 沿法线方向查找
+     * @description
+     * @param param0
+     * @param doorSearchDistance
+     * @returns
+     */
+    searchAlongNormalDirection({ point, line }: DoorPoint, doorSearchDistance?: number): {
+        point: Point;
+        line: LineSegment<Record<string, any>>;
+    } | undefined;
+    /**
+     *
+     * @param line
+     * @returns
+     */
+    findLongLineSegment(line: LineSegment): LineSegment<Record<string, any>>;
+}
 export declare class LineAnalysis extends Component<{
     analysisCompleted: {};
 }> {
@@ -76,6 +152,7 @@ export declare class LineAnalysis extends Component<{
     doorSearchNearAngle: number;
     doorSearchDistance: number;
     doors: LineSegment[];
+    DoorsAnalysis?: DoorsAnalysis;
     doorsAnalysis(): void;
 }
 export {};

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

@@ -0,0 +1,45 @@
+import { Component } from '../../ComponentManager';
+import { LineSegment } from '../../Quadtree/LineSegment';
+/**
+ * 转为 三维家 墙体结构
+ */
+export declare class ThreeVJia extends Component<{
+    updateData: {};
+}> {
+    static name: string;
+    lineSegments: LineSegment<any>[];
+    onAddFromParent(): void;
+    updateData(): void;
+    toJson(): {
+        version: string;
+        name: string;
+        communityName: string;
+        city: string;
+        province: string;
+        height: number;
+        walls: {
+            ID: number;
+            start: {
+                x: number;
+                y: number;
+            };
+            end: {
+                x: number;
+                y: number;
+            };
+            thickness: number;
+            type: string;
+            loadBearingWall: boolean;
+            height: number;
+        }[];
+        pillars: never[];
+        beams: never[];
+        holes: any[];
+        rooms: never[];
+    };
+    /**
+     * 下载
+     * @param filename
+     */
+    download(filename?: string): Promise<void>;
+}

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

@@ -4,6 +4,8 @@ import { EventInput, Renderer } from '../../../RenderPlugin/components';
 import { CommandManager } from '../../../../../CommandManager';
 import { RenderManager } from '../RenderManager';
 import { Default } from './Default';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { Point } from '../../../../../Quadtree/Point';
 export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Component<TEventMap> {
     private _renderer?;
     get renderer(): Renderer;
@@ -43,4 +45,13 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
      * @returns
      */
     createFinally(keys?: string[]): () => void;
+    /**
+     * 创建鼠标移动
+     * @param callBack
+     * @returns
+     */
+    createPointerMove(callBack: (point: Point, isAdsorb: boolean) => void): {
+        destroy(): void;
+        setBaseLine(line: LineSegment | null, point: Point | null): void;
+    };
 }

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

@@ -1,15 +1,11 @@
-import { Component } from '../../../../../ComponentManager';
-import { Editor } from '../Editor';
-import { Renderer } from '../../../RenderPlugin/components';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import { LineUserData } from '../RenderManager';
+import { CommandFlowComponent } from './CommandFlowComponent';
 import * as THREE from "three";
-export declare class Default extends Component<{
+export declare class Default extends CommandFlowComponent<{
     selectLineChange: {};
 }> {
     static name: string;
-    get editor(): Editor;
-    renderer?: Renderer;
     container: THREE.Group<THREE.Object3DEventMap>;
     onAddFromParent(): void;
     selectLines: LineSegment<LineUserData>[];

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

@@ -12,26 +12,21 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
     container: THREE.Group<THREE.Object3DEventMap>;
     shortcutKeys: string[];
     shortcutKeys2: string[];
+    shortcutKeys3: string[];
     static commandName: string;
     recursion: boolean;
+    axisAlignment: boolean;
     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 line
      * @param newStartPoint
      * @param newEndPoint
@@ -55,6 +50,14 @@ export declare class VerticalCorrection extends CommandFlowComponent<{}> {
      * @param vistedList
      */
     correction(targettLine: LineSegment, resultList?: any[], vistedList?: Set<LineSegment>): any[];
+    /** 轴对齐垂直修正
+     * @param targettLine
+     * @returns
+     */
+    axisAlignmentCorrection(targettLine: LineSegment): {
+        newLines: LineSegment<Record<string, any>>[];
+        oldLines: LineSegment<LineUserData>[];
+    };
     /** 开始
      * @param next
      */

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

@@ -13,6 +13,7 @@ export type LineUserData = {
     isDoor?: boolean;
     isWindow?: boolean;
     isVerticalReferenceLine?: boolean;
+    wallWidth?: number;
     drawWindow?: {
         p: THREE.Vector3;
         width: number;
@@ -27,10 +28,6 @@ export declare class RenderManager extends Component<{}> {
     lines: LineSegment<LineUserData>[];
     pointVirtualGrid: PointVirtualGrid<LineSegment<LineUserData>>;
     quadtree: Quadtree<any>;
-    actionHistory: Set<{
-        type: "addLine" | "removeLine";
-        data: any;
-    }>;
     verticalReferenceLineFlag: THREE.Mesh<THREE.PlaneGeometry, THREE.MeshBasicMaterial, THREE.Object3DEventMap>;
     onAddFromParent(): void;
     private updatedMode;
@@ -50,6 +47,11 @@ export declare class RenderManager extends Component<{}> {
      * @param line
      */
     removeLine(line: LineSegment<LineUserData>): void;
+    /**
+     * 删除
+     * @param lines
+     */
+    removeLines(lines: LineSegment<LineUserData>[]): void;
     /**
      * 绘制
      */

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

@@ -3,6 +3,7 @@ import { CSS2DRenderer, CSS2DObject } from 'three/addons/renderers/CSS2DRenderer
 import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
 import { Component } from '../../../../ComponentManager';
 import { Point } from '../../../../Quadtree/Point';
+import { LineSegment } from '../../../../Quadtree/LineSegment';
 import * as THREE from "three";
 export interface RendererDescription {
     canvas: HTMLCanvasElement;
@@ -85,6 +86,6 @@ export declare class Renderer extends Component<{
      * @param map
      * @param count
      */
-    createLineSegments(map: Record<string, number[]>, count: number, parameters?: THREE.LineBasicMaterialParameters, parent?: THREE.Object3D): THREE.LineSegments<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.LineBasicMaterial, THREE.Object3DEventMap>;
+    createLineSegments(map: Record<string, number[]> | LineSegment[], count: number, parameters?: THREE.LineBasicMaterialParameters, parent?: THREE.Object3D): THREE.LineSegments;
     destroy(): void;
 }

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

@@ -87,4 +87,10 @@ export declare class Box2 {
      * @returns
      */
     static fromByPoints(...points: Point[]): Box2;
+    /**
+     *
+     * @param points
+     * @returns
+     */
+    static fromByLineSegment(...lines: LineSegment[]): Box2;
 }

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

@@ -6,7 +6,6 @@ import { Rectangle } from './Rectangle';
 export declare class LineSegment<T = Record<string, any>> {
     points: Point[];
     userData: T;
-    line: any;
     get center(): Point<Record<string, any>>;
     get start(): Point<Record<string, any>>;
     get end(): Point<Record<string, any>>;
@@ -124,6 +123,11 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param line
      */
     directionEqual(line: LineSegment, errAngle?: number): boolean;
+    /**
+     * 两条线段是否平行
+     * @param line
+     */
+    parallel(line: LineSegment, errAngle?: number): boolean;
     /**
      * 两条线段方向相反否一致
      * @param line

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

@@ -1,82 +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[];
-    shortcutKeys2: string[];
-    static commandName: string;
-    recursion: boolean;
-    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, line: LineSegment): {
-        queryList: {
-            point: Point;
-            userData?: LineSegment<import('..').LineUserData> | undefined;
-        }[];
-        parallelList: {
-            point: Point;
-            userData?: LineSegment<import('..').LineUserData> | undefined;
-        }[];
-    };
-    /**
-     *
-     * @param line
-     * @param point
-     * @param newPoint
-     */
-    setLinePoint(line: LineSegment, newStartPoint?: Point, newEndPoint?: Point, mode?: "start" | "end" | "all", record?: any[]): void;
-    /** 修正2
-     * 第一步：确定需要修复的线段
-     * 第二步：查找与该线段相交的其他线段
-     * 第三步：找出两端点相交的线段，其他为区间相交
-     * 第四步：修正相交的线段的另一个端点
-     * 第五步：判断是否有方向一致的线段，有就调整，调整方法：查找连续平行的线段，求点在线段方向的投影，直到不平行的线段结束
-     * 第六步: 中间线段采用投影修正
-     * @param targettLine
-     * @param vistedList
-     */
-    correction(targettLine: LineSegment, entryPoint?: Point, resultList?: any[], vistedList?: Set<LineSegment | Point>): any[] | undefined;
-    /** 开始
-     * @param next
-     */
-    verticalCorrection(next: any, selectLines: LineSegment[]): void;
-    /** 执行完成
-     * @param data
-     */
-    private completed;
-    /** 回滚操作
-     * @param data
-     */
-    private rollback;
-    /** 撤回回滚
-     * @param lines
-     * @returns
-     */
-    private revokeRollback;
-}