build-dxf 0.0.13 → 0.0.15

package/src/index2.js

@@ -7127,7 +7127,7 @@ class ModelDataRender extends Component {
           group.clear();
           dxf.wallsGroup.forEach((path, j) => {
             path.forEach((p, i) => {
-              renderer.createText(`${i}`, p, { color: "#ff00ff", fontSize: "10px" }, group).position.z = dxf.originalZAverage * 0.99;
+              renderer.createText(`${j}-${i}`, p, { color: "#ff00ff", fontSize: "10px" }, group).position.z = dxf.originalZAverage * 0.99;
             });
           });
         }
@@ -7307,7 +7307,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(unref(ElButton), {
               size: "small",
               type: "primary",
-              onClick: _cache[1] || (_cache[1] = ($event) => unref(whiteModel).downloadGlb("test.glb"))
+              onClick: _cache[1] || (_cache[1] = ($event) => unref(whiteModel).downloadGltf("test.glb"))
             }, {
               default: withCtx(() => _cache[7] || (_cache[7] = [
                 createTextVNode(" 下载 白模 ", -1)

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

@@ -23,6 +23,18 @@ export interface OriginalDataItem {
         };
     }[];
     isDoor?: boolean;
+    drawDoorData?: {
+        start: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        n: {
+            x: number;
+            y: number;
+            z: number;
+        };
+    };
 }
 /**
  * [开始点, 结束点, 相交点, 是否是门, 索引]
@@ -61,6 +73,7 @@ export declare class Dxf extends Component<{
     pointsGroups: Point[][][];
     wallsGroup: Point[][];
     doors: DataItem[];
+    doorLineSegment: LineSegment[];
     lineSegments: LineSegment<{
         isDoor: boolean;
     }>[];
@@ -108,18 +121,16 @@ export declare class Dxf extends Component<{
      * @description 处理线路拓扑，使线路有序链接，形成长路径
      * @param lines
      */
-    private lineTopology;
+    lineTopology(lines: Point[][]): Point[][];
+    /** 合并方向相同的线段
+     * @param lines
+     * @param errAngle
+     */
+    private mergeSameDirectionLine;
     /** etOpenRound 去除毛刺
      * @description 检查连续的短线段数量，去除合并后产生的毛刺
      */
     private squareRemoveBurr;
-    epsilon: number;
-    /**
-     * 移除共线点
-     * @param path
-     * @returns
-     */
-    removeCollinearPoints(path: Point[]): Point[];
     /**
      * 线段矫直, 线段中心突刺
      * @description 突变长度小于墙体宽度，该线段可能为突起线段，
@@ -128,6 +139,7 @@ export declare class Dxf extends Component<{
     lineSegmentStraightening(path: Point[]): Point[];
     /**
      * 移除短线段
+     * @todo 根据线段两端线段长度，选取参照物_|▔▔
      * @param path
      */
     removeShortLine(path: Point[], shortLine?: number): Point[];
@@ -139,6 +151,13 @@ export declare class Dxf extends Component<{
      * 将点云结构转换为Float32Array
      */
     to3DArray(scale: number): Float32Array<ArrayBuffer>;
+    /** 获取角度范围
+     * @param center
+     * @param p1
+     * @param p2
+     * @returns
+     */
+    private getArcAngleRange;
     /**
      * 将点云结构转换为string
      */

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

@@ -64,6 +64,7 @@ export declare class LineAnalysis extends Component {
      */
     buildQuadtree(): void;
     resultList: ProjectionAnalysisResult[];
+    mergeWallLines: LineSegment[][];
     /** 线段分析
      * @description 判断两条线段距离是否较短且趋近平行，然后查找两条线段的重合部分的投影线，以此判断两根线是否需要合并
      * @param data
@@ -76,5 +77,12 @@ export declare class LineAnalysis extends Component {
      * @returns
      */
     private projectionAnalysis;
+    doorSearchNearAngle: number;
+    doorSearchDistance: number;
+    doors: LineSegment[];
+    /**
+     * 门的位置判断
+     */
+    doorsAnalysis(): void;
 }
 export {};

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

@@ -17,10 +17,37 @@ export declare class WhiteModel extends Component<{
     material: THREE.MeshBasicMaterial;
     onAddFromParent(parent: ComponentManager): void;
     updateModel(): void;
+    /**
+     * 转为obj
+     * @returns
+     */
     toOBJ(): Promise<string>;
-    toGlb(): Promise<ArrayBuffer | undefined>;
+    /**
+     * 转为 glb
+     * @param binary
+     * @returns
+     */
+    toGltf(binary?: boolean): Promise<string | ArrayBuffer | undefined>;
+    /**
+     * 转为 OBJBlob
+     * @returns
+     */
     toOBJBlob(): Promise<Blob | undefined>;
-    toGlbBlob(): Promise<Blob | undefined>;
-    download(filename: string): Promise<void>;
-    downloadGlb(filename: string): Promise<void>;
+    /**
+     * 转为 GltfBlob
+     * @returns
+     */
+    toGltfBlob(binary?: boolean): Promise<Blob | undefined>;
+    /**
+     * 下载 OBJ
+     * @param filename
+     * @returns
+     */
+    downloadOBJ(filename: string): Promise<void>;
+    /**
+     * 下载 Gltf
+     * @param filename
+     * @returns
+     */
+    downloadGltf(filename: string, binary?: boolean): Promise<void>;
 }

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

@@ -1,4 +1,5 @@
 import { Point } from './Point';
+import { Rectangle } from './Rectangle';
 /**
  * 非轴对称线段
  */
@@ -9,6 +10,33 @@ export declare class LineSegment<T = Record<string, any>> {
     get start(): Point;
     get end(): Point;
     constructor(p1?: Point, p2?: Point);
+    /** 膨胀
+     * @description 向线段的两个端点分别膨胀 width
+     * @param width
+     */
+    expansion(width: number, direction?: "start" | "end" | "all"): this;
+    /** 向前
+     * @description 向前移动 width
+     * @param width
+     */
+    forward(width: number): this;
+    /** 向前
+     * @description 向前移动 width
+     * @param width
+     */
+    backward(width: number): this;
+    /**
+     * 向指定方向平移
+     * @param direct
+     * @param size
+     */
+    directionMove(direct: Point, size: number): this;
+    /** 膨胀为矩形
+     *
+     * @param width
+     * @returns {Rectangle}
+     */
+    expandToRectangle(width?: number): Rectangle;
     /**
      * 计算线段的长度
      * @returns 线段的长度
@@ -19,6 +47,10 @@ export declare class LineSegment<T = Record<string, any>> {
      * @returns
      */
     direction(): Point;
+    /**
+     * 获取发向量
+     */
+    normal(): Point;
     /**
      * 线段长度
      * @returns
@@ -30,6 +62,12 @@ export declare class LineSegment<T = Record<string, any>> {
      * @returns 投影并裁剪后的线段
      */
     projectLineSegment(line: LineSegment): LineSegment;
+    /**
+     * 计算一条线段在另一条直线上的投影，并裁剪超出目标线段的部分
+     * @param line 要投影的线段
+     * @returns 投影并裁剪后的线段
+     */
+    projectPoint(p1: Point): Point | null;
     /**
      * 判断线段是与线段相交
      * @param line

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

@@ -89,13 +89,20 @@ export declare class Point {
      * @returns
      */
     dot(point: Point): number;
+    /** 求两个点叉积
+     * @description 如果叉积大于 0，a 到 b 为逆时针方向。
+     * @description 如果叉积小于 0，a 到 b 为顺时针方向。
+     * @param point
+     * @returns
+     */
+    cross(point: Point): number;
     /** 计算两个向量夹角
      * @description 公式：a · b = |a| × |b| × cosθ
      * @description 结果为0（0度），两个向量方向一致，结果为3.1415926（180度， PI），两个向量方向相反
      * @param point
      * @returns
      */
-    angleBetween(point: Point): number;
+    angleBetween(point: Point, type?: 'radian' | 'cos' | 'angle', angle?: "180" | "360"): number;
     /** 获取向量长度
      */
     length(): number;

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

@@ -50,6 +50,12 @@ export declare class Quadtree<T = any> {
      * @returns 相交的节点数组
      */
     queryRect(rectangle: Rectangle): QuadtreeNode<T>[];
+    /**
+     * 查询与线段相交的线段节点
+     * @param lineSegment 线段
+     * @returns 相交的节点数组
+     */
+    queryLineSegment(lineSegment: LineSegment): QuadtreeNode<T>[];
     /**
      * 包围盒转换为数组
      * @param array

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

@@ -7,6 +7,7 @@ import { Point } from './Point';
 export declare class Rectangle {
     points: Point[];
     get path(): number[];
+    path2D(callback?: (point1: Point, point2: Point) => void): number[];
     constructor(points: Point[]);
     /**
      * 判断线段是否与矩形相交

package/src/utils/include.d.ts

@@ -0,0 +1 @@
+export declare function include(path: string, exportDefault?: boolean): Promise<any>;