build-dxf 0.1.21 → 0.1.23

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

@@ -7,7 +7,7 @@ import { Dxf } from './Dxf';
  */
 export declare class CorrectionDxf<TEventMap extends {} = {}> extends Dxf<{} & TEventMap> {
     static name: string;
-    static readonly PRE_PROCESSOR: Record<"DoorFind" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", (lines: import('../..').LineSegment[], option: SetDataOption) => import('../..').LineSegment[]>;
+    static readonly PRE_PROCESSOR: Record<"DoorFind" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", (lines: import('../..').LineSegment[], option: SetDataOption, ...arg: any[]) => import('../..').LineSegment[]>;
     rotateCorrCad?: CAD;
     constructor();
     onAddFromParent(parent: DxfSystem): void;

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

@@ -4,7 +4,7 @@ import { LineSegment } from '../../LineSegment';
 import { Quadtree } from '../../Quadtree';
 import { SetDataOption, DataItem, LineUserData, OriginalDataItem, Unit } from '../type';
 import { CAD } from '../utils/CAD';
-type PreProcessor = (lines: LineSegment[], option: SetDataOption) => LineSegment[];
+type PreProcessor = (lines: LineSegment[], option: SetDataOption, ...arg: any[]) => LineSegment[];
 export declare const PRE_PROCESSOR: Record<"DoorFind" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", PreProcessor>;
 /**
  * 将点云结构转换为DXF格式

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

@@ -20,7 +20,7 @@ export declare class Default extends CommandFlowComponent<{
     /** 添加选择的线段
      * @param lineSegment
      */
-    addSelectLine(lineSegment: LineSegment): void;
+    addSelectLine(...lineSegments: LineSegment[]): void;
     /** 移除选择的线段
      * @param lineSegment
      */

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

@@ -0,0 +1,33 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../LineSegment';
+import * as THREE from "three";
+export declare class PropertiesPanel extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    static shortcutKeys: string[];
+    static commandName: string;
+    isOpen: boolean;
+    onAddFromParent(parent: ComponentManager): void;
+    getSelectLines(): {
+        list: LineSegment<import('../../../../type').LineUserData>[];
+        winList: any[];
+    };
+    private constraint;
+    /** 选择开始点
+     * @param next
+     */
+    open(next: any): void;
+    /** 执行完成
+     */
+    completed(): void;
+    /** 回滚操作
+     * @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/DrawDoorLine';
 export * from './CommandFlow/DrawLine';
 export * from './CommandFlow/DrawWindow';
 export * from './CommandFlow/VerticalCorr';
+export * from './CommandFlow/PropertiesPanel';

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

@@ -3,8 +3,5 @@ type __VLS_Props = {
     dxfSystem: DxfSystem;
     permission?: "admin";
 };
-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, {
-    elRef: HTMLDivElement;
-    toolBarRef: HTMLDivElement;
-}, any>;
+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, {}, any>;
 export default _default;

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

@@ -0,0 +1,16 @@
+import { LineUserData } from '../../../type';
+import { LineSegment } from '../../../../LineSegment';
+import { Ref } from 'vue';
+type __VLS_Props = {
+    selectLines: Ref<LineSegment<LineUserData & {
+        isSelectWindow: boolean;
+        groundClearance: number;
+        width: number;
+    }>[]>;
+};
+declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    update: (...args: any[]) => void;
+}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{
+    onUpdate?: ((...args: any[]) => any) | undefined;
+}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
+export default _default;

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

@@ -0,0 +1,13 @@
+type __VLS_PublicProps = {
+    "modelValue"?: number;
+};
+declare const _default: import('vue').DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    blur: (...args: any[]) => void;
+    change: (...args: any[]) => void;
+    "update:modelValue": (value: number) => void;
+}, string, import('vue').PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+    onBlur?: ((...args: any[]) => any) | undefined;
+    onChange?: ((...args: any[]) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: number) => any) | undefined;
+}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLInputElement>;
+export default _default;

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

@@ -42,10 +42,10 @@ export declare class DomEventRegister extends Component<{
      */
     autoBodyCursor(): void;
     /**
-     *
      * @param callBack
      */
     addCancelDefaultBehavior(callBack: (e: KeyboardEvent) => boolean): this;
+    destroy(): void;
     /**
      *
      * @param el
@@ -60,5 +60,4 @@ export declare class DomEventRegister extends Component<{
         x: number;
         y: number;
     }, condition?: () => boolean): () => void;
-    destroy(): void;
 }

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

@@ -7,6 +7,35 @@ export interface GroupItem {
     id: string;
     type?: string;
 }
+export type LineUserData = {
+    doorDirectConnection?: boolean;
+    isDoor?: boolean;
+    isWindow?: boolean;
+    isVerticalReferenceLine?: boolean;
+    wallWidth?: number;
+    rooftopPz?: number;
+    height?: number;
+    groupId?: string;
+    groupType?: string;
+    groups?: GroupItem[];
+    doorAutomaticFind?: boolean;
+    isBayWindow?: boolean;
+    uuid?: string;
+    drawWindow?: {
+        p: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        width: number;
+        full: boolean;
+        rooftopPz?: number;
+        uuid?: string;
+    }[];
+    sillHeight?: number;
+    drawDoorData?: any;
+    quadtreeNode?: QuadtreeNode;
+};
 export interface OriginalDataItem {
     start: {
         x: number;
@@ -48,6 +77,7 @@ export interface OriginalDataItem {
     rooftopPz?: number;
     isVerticalReferenceLine?: boolean;
     groupId?: string;
+    uuid?: string;
     drawWindow?: {
         p: {
             x: number;
@@ -56,35 +86,9 @@ export interface OriginalDataItem {
         };
         width: number;
         full: boolean;
+        uuid?: string;
     }[];
 }
-export type LineUserData = {
-    doorDirectConnection?: boolean;
-    isDoor?: boolean;
-    isWindow?: boolean;
-    isVerticalReferenceLine?: boolean;
-    wallWidth?: number;
-    rooftopPz?: number;
-    height?: number;
-    groupId?: string;
-    groupType?: string;
-    groups?: GroupItem[];
-    doorAutomaticFind?: boolean;
-    isBayWindow?: boolean;
-    drawWindow?: {
-        p: {
-            x: number;
-            y: number;
-            z: number;
-        };
-        width: number;
-        full: boolean;
-        rooftopPz?: number;
-    }[];
-    sillHeight?: number;
-    drawDoorData?: any;
-    quadtreeNode?: QuadtreeNode;
-};
 /**
  * [开始点, 结束点, 相交点, 是否是门, 索引]
  */

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

@@ -15,10 +15,6 @@ interface IByTrajAnOriginData {
     updateDoubleWallGroup?: boolean;
     findCallBack?: (lines: LineSegment[], trajectory: Point[]) => void;
 }
-/** 执行纠正更加全面
- * @param line
- * @param grid
- */
 export declare class BoundExt {
     /** 通过轨迹点查找外墙
      * @param lines

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

@@ -0,0 +1,46 @@
+import { LineSegment } from '../../LineSegment';
+import { Point } from '../../Point';
+import { LineUserData, OriginalDataItem } from '../type';
+interface IByTraj {
+    lines: LineSegment[];
+    trajectory: any;
+    wallWidth: number;
+    updateDoubleWallGroup?: boolean;
+    findCallBack?: (lines: LineSegment[], trajectory: Point[]) => void;
+}
+interface IByTrajAnOriginData {
+    data: OriginalDataItem[];
+    trajectory: any;
+    wallWidth: number;
+    updateDoubleWallGroup?: boolean;
+    findCallBack?: (lines: LineSegment[], trajectory: Point[]) => void;
+}
+export declare class BoundExt {
+    /** 通过轨迹点查找外墙
+     * @param lines
+     * @param trajectoryPoints
+     * @returns
+     */
+    static findExtWallByTraj(lines: LineSegment<LineUserData & {
+        expandDirect?: 'left' | 'right' | 'on';
+    }>[], trajectoryPoints: Point[], minWidth?: number): LineSegment<LineUserData & {
+        expandDirect?: "left" | "right" | "on";
+    }>[];
+    /** 通过轨迹点外扩边线
+     * @param lines
+     * @param trajectoryPoints
+     */
+    static boundExtbyTrajAndOriginalData(opt: IByTrajAnOriginData): OriginalDataItem[];
+    /** 通过轨迹点外扩边线
+     * @param lines
+     * @param trajectory
+     * @param wallWidth
+     * @param findCallBack
+     * @returns
+     */
+    static boundExtbyTraj(opt: IByTraj): {
+        lines: LineSegment<Record<string, any>>[];
+        toOriginalData(originalZAverage: number): OriginalDataItem[];
+    };
+}
+export {};

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

@@ -24,13 +24,14 @@ export declare class DoorFind {
      * @returns
      */
     findOpenDoors(line: LineSegment<LineUserData>): void;
-    /** 对门的两侧进行吸附
-     * @description
+    /**
+     * 对门的两侧进行吸附
      * @param dock
      * @param line
+     * @param maxAngle 找到的门线与原来的之间最大夹角
      * @returns
      */
-    adsorpt(dock: IDockInfo, line: LineSegment): Point<Record<string, any>> | null;
+    adsorpt(dock: IDockInfo, line: LineSegment, maxAngle?: number): Point<Record<string, any>> | null;
     getLines(): LineSegment<Record<string, any>>[];
 }
 export {};

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

@@ -1,5 +1,5 @@
 export * from './AxisAlignCorr';
-export * from './BoundExt';
+export * from './BoundExt02';
 export * from './lineDataToOriginalData';
 export * from './lineSegmentClipping';
 export * from './DoubleWallHelper';

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

@@ -5,4 +5,4 @@ import { LineUserData } from '../type';
  * @param minLen
  * @returns
  */
-export declare function lineSegmentClipping(lines: LineSegment<LineUserData>[], minLen?: number): LineSegment<LineUserData>[];
+export declare function lineSegmentClipping(lines: LineSegment<LineUserData>[], minLen?: number): LineSegment<Record<string, any>>[];

package/src/utils/LineSegment.d.ts

@@ -285,7 +285,7 @@ export declare class LineSegment<T = Record<string, any>> {
         newLines: LineSegment<Record<string, any>>[];
         deleteLines: LineSegment<Record<string, any>>[];
     };
-    /** 合并本属于同一条的线段，切不能被其他线段分割
+    /** 合并本属于同一条的线段，且不能被其他线段分割
      * @param lines
      * @param callBack
      * @returns

package/src/utils/OBB.d.ts

@@ -0,0 +1,30 @@
+import { OBB as OBB_ } from 'three/addons/math/OBB.js';
+import * as THREE from 'three';
+export declare class OBB extends OBB_ {
+    getBoxMesh(): THREE.Mesh<THREE.BoxGeometry, THREE.Material | THREE.Material[], THREE.Object3DEventMap>;
+    getBoxEdge(color?: number): THREE.LineSegments<THREE.EdgesGeometry<THREE.BoxGeometry>, THREE.LineBasicMaterial, THREE.Object3DEventMap>;
+    toJson(): {
+        size: THREE.Vector3Tuple;
+        center: THREE.Vector3Tuple;
+        quaternion: THREE.QuaternionTuple;
+    };
+    /**
+     * @param box
+     * @param position
+     * @param rotation
+     * @param obb
+     * @returns
+     */
+    static from(box: THREE.Vector3, position: THREE.Vector3, rotation: THREE.Euler | THREE.Quaternion, obb?: OBB): OBB;
+    /** 通过2d路径创建
+     * @param path
+     * @param origin
+     * @param height
+     * @param obb_
+     * @returns
+     */
+    static fromByPath2D(path: {
+        x: number;
+        y: number;
+    }[], origin: THREE.Vector3, height: number, obb_?: OBB): OBB;
+}

package/src/utils/{PointCloud.d.ts → PCSparseOctree.d.ts}

@@ -1,26 +1,6 @@
 import { Octant, PointData } from 'sparse-octree';
-import { OBB } from 'three/addons/math/OBB.js';
+import { OBB } from './OBB';
 import * as THREE from 'three';
-/** 查询点是否在obb内，通过gpu计算
- * @param points
- * @param obbs
- * @returns
- */
-export declare function pointInOBBByGpu(points: THREE.Vector3[], obbs: OBBBox[]): Promise<number[]>;
-export declare class OBBBox extends OBB {
-    getBoxMesh(): THREE.Mesh<THREE.BoxGeometry, THREE.Material | THREE.Material[], THREE.Object3DEventMap>;
-    getBoxEdge(color?: number): THREE.LineSegments<THREE.EdgesGeometry<THREE.BoxGeometry>, THREE.LineBasicMaterial, THREE.Object3DEventMap>;
-    toJson(): {
-        size: THREE.Vector3Tuple;
-        center: THREE.Vector3Tuple;
-        quaternion: THREE.QuaternionTuple;
-    };
-    static fromByBox(box: THREE.Vector3, position: THREE.Vector3, rotation: THREE.Euler | THREE.Quaternion, obb?: OBBBox): OBBBox;
-    static fromByPath2D(path: {
-        x: number;
-        y: number;
-    }[], origin: THREE.Vector3, height: number, obb_?: OBBBox): OBBBox;
-}
 export declare class PCSparseOctree<T> {
     private octree;
     bound: THREE.Box3;
@@ -66,17 +46,10 @@ export declare class PCSparseOctree<T> {
      * @param obbList
      * @returns
      */
-    findPointsInOBBBatch(obbList: OBBBox[]): {
+    findPointsInOBBBatch(obbList: OBB[]): {
         point: THREE.Vector3;
         data: T;
     }[][];
-    /**
-     * @param obbList
-     */
-    findPointsByGpu(obbList: OBBBox[]): Promise<{
-        point: THREE.Vector3;
-        data: T;
-    }[][]>;
     static fromPoints(points: THREE.Vector3[]): PCSparseOctree<{
         index: number;
     }>;

package/src/utils/StorageHelper.d.ts

@@ -0,0 +1,6 @@
+export declare class StorageHelper {
+    static get(key: string, defaultValue?: any): any;
+    static getBoolean(key: string, defaultValue?: boolean): boolean;
+    static getNumber(key: string, defaultValue?: number): number;
+    static set(key: string, vaalue: any): void;
+}

package/src/utils/index.d.ts

@@ -19,3 +19,5 @@ export * from './Gltf';
 export * from './DxfSystem/utils/SceneAutoGenerat';
 export * from './MaxiCircles';
 export * from './MiniCircles';
+export * from './OBB';
+export * from './PCSparseOctree';

package/src/utils/isMobile.d.ts

@@ -0,0 +1 @@
+export declare function isMobile(): boolean;

package/src/utils/modelScenario/scenario.d.ts

@@ -34,6 +34,7 @@ export default class Scenario {
     height: any;
     expandedList: any;
     wallHeight: any;
+    box: any;
     private static _instance?;
     static get Instance(): Scenario | undefined;
     constructor(scene: THREE.Scene, camera: THREE.PerspectiveCamera, renderer: THREE.WebGLRenderer, controls: OrbitControls);
@@ -50,7 +51,7 @@ export default class Scenario {
     installTable(): void;
     installchair(): void;
     winHoleOpening(data: any, mesh: any, winGroundHeight?: number, Height?: number): Brush;
-    doorHoleOpening(wallHeight: number, data: any, data1: any, groundHeight?: number, Height?: number, distance?: number, center?: THREE.Vector3, angleRad?: any, index?: string): void;
+    doorHoleOpening(wallHeight: number, data: any, data1: any, groundHeight?: number, Height?: number, distance?: number, center?: THREE.Vector3, angleRad?: any, index?: string, doorList?: LineSegment): void;
     angleToXAxisDegrees(x1: number, y1: number, x2: number, y2: number, wide: number, cd: boolean): number;
     xinLine(x: number, y: number, point: THREE.Vector3 | Point, wallHeight: number): THREE.Vector3[];
     xinLine1(x: number, y: number, pointa: THREE.Vector3, pointb: THREE.Vector3, num: number, wallHeight: number): THREE.Vector3[];