build-dxf 0.0.43 → 0.0.44

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

@@ -1,11 +1,15 @@
 import { ComponentManager } from '../ComponentManager';
 import { AngleCorrectionDxf } from './components/AngleCorrectionDxf';
+import { DoorsAnalysisComponent } from './components/DoorsAnalysis';
 import { Dxf } from './components/Dxf';
+import { LineAnalysis } from './components/LineAnalysis';
 import { Variable } from './components/Variable';
 export declare class DxfSystem extends ComponentManager {
     Dxf: Dxf;
     AngleCorrectionDxf: AngleCorrectionDxf;
     Variable: Variable;
+    LineAnalysis: LineAnalysis;
+    DoorsAnalysis: DoorsAnalysisComponent;
     wallWidth: number;
     environment: "node" | "browser" | "unknown";
     static finalInstance?: DxfSystem;

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

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

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

@@ -0,0 +1,118 @@
+import { Component, ComponentManager } from '../../ComponentManager';
+import { Dxf } from './Dxf';
+import { Quadtree } from '../../Quadtree/Quadtree';
+import { LineSegment } from '../../Quadtree/LineSegment';
+import { Point } from '../../Quadtree/Point';
+import { PointVirtualGrid } from '../../PointVirtualGrid';
+import { LineAnalysis } from './LineAnalysis';
+type ProjectionAnalysisResult = {
+    source: LineSegment;
+    sourceIndex: number;
+    target: LineSegment;
+    targetIndex: number;
+    project: LineSegment;
+    project2: LineSegment;
+};
+type DoorPoint = {
+    line: LineSegment;
+    point: Point;
+    uuid: string;
+};
+declare class DoorsAnalysis {
+    possibleDoorPoints: DoorPoint[];
+    doorPoint: DoorPoint[];
+    calculatedDoorPoint: 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;
+    /** 查找
+     * @param doorPoints
+     * @param possibleDoorPoints
+     * @param minDoorWidth
+     * @param doorSearchDistance
+     * @param doorSearchNearAngle
+     * @returns
+     */
+    private search;
+    /** 添加可查找点的过滤规则
+     * @param rule
+     */
+    addPointsExcludeRule(rule: (line: LineSegment, point: Point, pointIndex: number) => boolean): void;
+    private _pointsExcludeRule;
+    /**
+     * 查找所有可能为门的点位
+     */
+    getPossiblePoints(): DoorPoint[];
+    /**
+     * 查找已知为门的点位
+     */
+    getDoorPoint(): {
+        doorPoints: DoorPoint[];
+        calculatedDoorPoint: 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 DoorsAnalysisComponent extends Component<{
+    analysisCompleted: {};
+}> {
+    doorSearchNearAngle: number;
+    doorSearchDistance: number;
+    DoorsAnalysis?: DoorsAnalysis;
+    skipFindDoor: boolean;
+    needsSaveDoor: boolean;
+    doors: LineSegment[];
+    /**
+     *
+     * @param parent
+     */
+    onAddFromParent(parent: ComponentManager): void;
+}
+export {};

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;
@@ -14,93 +13,6 @@ type ProjectionAnalysisResult = {
     project: LineSegment;
     project2: LineSegment;
 };
-type DoorPoint = {
-    line: LineSegment;
-    point: Point;
-    uuid: string;
-};
-declare class DoorsAnalysis {
-    possibleDoorPoints: DoorPoint[];
-    doorPoint: DoorPoint[];
-    calculatedDoorPoint: 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;
-    /** 查找
-     * @param doorPoints
-     * @param possibleDoorPoints
-     * @param minDoorWidth
-     * @param doorSearchDistance
-     * @param doorSearchNearAngle
-     * @returns
-     */
-    private search;
-    /** 添加可查找点的过滤规则
-     * @param rule
-     */
-    addPointsExcludeRule(rule: (line: LineSegment, point: Point, pointIndex: number) => boolean): void;
-    private _pointsExcludeRule;
-    /**
-     * 查找所有可能为门的点位
-     */
-    getPossiblePoints(): DoorPoint[];
-    /**
-     * 查找已知为门的点位
-     */
-    getDoorPoint(): {
-        doorPoints: DoorPoint[];
-        calculatedDoorPoint: 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: {};
 }> {
@@ -161,11 +73,5 @@ export declare class LineAnalysis extends Component<{
      * @returns
      */
     private projectionAnalysis;
-    doorSearchNearAngle: number;
-    doorSearchDistance: number;
-    doors: LineSegment[];
-    DoorsAnalysis?: DoorsAnalysis;
-    skipFindDoor: boolean;
-    doorsAnalysis(): void;
 }
 export {};

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

@@ -1,7 +1,7 @@
 import { Component } from '../../../../ComponentManager';
 import { Dxf } from '../../../components/Dxf';
 import { Variable } from '../../../components/Variable';
-import { DomContainer, DomEventRegister, EventInput, Renderer } from '../../RenderPlugin/components';
+import { Renderer, DomContainer, DomEventRegister, EventInput } from '../../RenderPlugin/components';
 import { RenderManager } from './RenderManager';
 import { CommandManager } from '../../../../CommandManager';
 import { App } from 'vue';

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

@@ -47,7 +47,7 @@ export declare class RenderManager extends Component<{}> {
      * @param point
      * @returns
      */
-    adsorption(radius?: number, _?: PointVirtualGrid<LineSegment<LineUserData>>, quadtree?: Quadtree<any>): {
+    adsorption(radius?: number, _?: PointVirtualGrid | null, quadtree?: Quadtree<any>): {
         point: THREE.Vector3;
         find: boolean;
         mode: string;
@@ -55,8 +55,8 @@ export declare class RenderManager extends Component<{}> {
     } | {
         point: THREE.Vector3;
         find: boolean;
-        mode?: undefined;
-        line?: undefined;
+        line: undefined;
+        mode: undefined;
     };
     /** 创建几何体
      * @param rectangle

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

@@ -1,6 +1,9 @@
 import { CSS3DRenderer, CSS3DObject, CSS3DSprite } from 'three/addons/renderers/CSS3DRenderer.js';
 import { CSS2DRenderer, CSS2DObject } from 'three/addons/renderers/CSS2DRenderer.js';
 import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
+import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
+import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js';
+import { KTX2Loader } from 'three/examples/jsm/loaders/KTX2Loader.js';
 import { Component } from '../../../../ComponentManager';
 import { Point } from '../../../../Quadtree/Point';
 import { LineSegment } from '../../../../Quadtree/LineSegment';
@@ -50,6 +53,9 @@ export declare class Renderer extends Component<{
     width: number;
     height: number;
     private tweenTaskList;
+    static loader: GLTFLoader;
+    static ktx2Loader: KTX2Loader;
+    static draco: DRACOLoader;
     constructor(description: RendererDescription);
     render(): void;
     /**
@@ -93,6 +99,6 @@ export declare class Renderer extends Component<{
      * @param parent
      * @returns
      */
-    createCircle(point: Point, parameters?: THREE.PointsMaterialParameters, parent?: THREE.Object3D): THREE.Points<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.PointsMaterial, THREE.Object3DEventMap>;
+    createCircle(point: Point | Point[], parameters?: THREE.PointsMaterialParameters, parent?: THREE.Object3D): THREE.Points<THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>, THREE.PointsMaterial, THREE.Object3DEventMap>;
     destroy(): void;
 }

package/src/utils/DxfSystem/type.d.ts

@@ -61,6 +61,7 @@ export type LineUserData = {
         p: THREE.Vector3;
         width: number;
         full: boolean;
+        rooftopPz?: number;
     }[];
     drawDoorData?: any;
     quadtreeNode?: QuadtreeNode;

package/src/utils/DxfSystem/utils/drawHelper.d.ts

@@ -1,6 +1,6 @@
 import { LineSegment } from '../../Quadtree/LineSegment';
 import { LineBasicMaterialParameters, PointsMaterialParameters } from 'three';
 import { Point } from '../../Quadtree/Point';
-export declare function drawLines(lines: LineSegment[] | LineSegment, parameters?: LineBasicMaterialParameters, offset?: number): any;
-export declare function drawPoint(point: Point, parameters?: PointsMaterialParameters, offset?: number): any;
+export declare function drawLines(lines: LineSegment[] | LineSegment | Point[], parameters?: LineBasicMaterialParameters, offset?: number): any;
+export declare function drawPoint(point: Point | Point[], parameters?: PointsMaterialParameters, offset?: number): any;
 export declare function drawText(text: any, point: Point, style?: any, offset?: number): any;

package/src/utils/DxfSystem/utils/extractClosedPolygons.d.ts

@@ -0,0 +1,11 @@
+import { LineSegment } from '../../Quadtree/LineSegment';
+import { Point } from '../../Quadtree/Point';
+/**
+ * 多边形类型：点数组（闭合，最后一点连接第一点）
+ */
+type Polygon = Point[];
+/**
+ * 从线段集合中提取所有闭合多边形
+ */
+export declare function extractClosedPolygons(segments: LineSegment[]): Polygon[];
+export {};

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

@@ -32,6 +32,7 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * @param point
      */
     remove(point: Point): void;
+    update(point: Point): void;
     /**
      * 获取通过坐标，获取唯一网格索引
      * @param point
@@ -73,7 +74,7 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * 查找相同点
      * @param point
      */
-    queryPoint(point: Point): {
+    queryPoint(point: Point, excludeOneself?: boolean): {
         point: Point;
         userData?: T;
     }[];

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

@@ -199,7 +199,7 @@ export declare class LineSegment<T = Record<string, any>> {
     /** 合并满足平行的线段
      * @param selectLines
      */
-    static autoMergeLines(selectLines: LineSegment[]): {
+    static autoMergeLines(lines: LineSegment[]): {
         lines: LineSegment<Record<string, any>>[];
         newLines: LineSegment<Record<string, any>>[];
         deleteLines: LineSegment<Record<string, any>>[];

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

@@ -48,6 +48,13 @@ export declare class Point<T = Record<string, any>> {
      * @returns
      */
     division(point: Point): this;
+    /**
+     * 减法
+     * @description 将当前点的坐标减去指定点的坐标
+     * @param point
+     * @returns
+     */
+    subtract(point: Point): this;
     /**
      * 加法
      * @description 将当前点的坐标加上指定点的坐标