build-dxf 0.1.19 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -4289,7 +4289,6 @@ class DxfDrawPlugin {
       type: ["door"],
       handler: ({ group: group2, drawArc, drawLine, setColor }) => {
         group2.lines.forEach((lineSegment) => {
-          if (lineSegment.length() < 0.4) return;
           const line = lineSegment.clone();
           const doorThickness = DEFAULT_WALL_WIDTH * 0.2;
           const list = [];
@@ -5538,6 +5537,7 @@ function modify(reference, cell, opt, appendLines, grid) {
   if (hasParallel) {
     const newLine = createNewLine(cell, reference, opt, appendLines, grid);
     if (hasSameDirection) newLine.userData = cloneUserData(cell[opt[1]].userData?.userData ?? {});
+    newLine.userData.rooftopPz = cell[opt[1]]?.userData?.userData.rooftopPz ?? newLine.userData.rooftopPz;
     return;
   }
   if (hasDifferentDirection) {
@@ -13946,6 +13946,7 @@ class SceneAutoGenerat {
     const zStart = new THREE.Vector3().copy(rectangle[0].toJson(z)), zEnd = zStart.clone();
     zEnd.z += height;
     return {
+      geometry,
       box: lineSegments,
       center,
       category: item.category,
@@ -14471,6 +14472,7 @@ class CorrectionDxf extends Dxf {
       const lines = parent.Dxf.getLineSegments(true);
       this.set(lineDataToOriginalData(lines, parent.Dxf.originalZAverage), {
         trajectory: e.options.trajectory,
+        publicInfo: e.options.publicInfo,
         onBoundExt: e.options.onBoundExt
       });
       this.clearPreProcessor();
@@ -14496,6 +14498,7 @@ class CorrectionDxf extends Dxf {
       data = res.data;
       this.lineSegments = res.lineSegments;
       this.originalData = data;
+      this.lineSegments = PRE_PROCESSOR.WallHeightHandle(this.lineSegments, options);
     }
     const zList = [];
     data.forEach(({ start, end }) => zList.push(start.z ?? 0, end.z ?? 0));

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

@@ -15,6 +15,10 @@ 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/SceneAutoGenerat.d.ts

@@ -25,6 +25,7 @@ export declare class SceneAutoGenerat {
      */
     buildItem(): Promise<void>;
     static itemParse(item: any): {
+        geometry: THREE.ExtrudeGeometry;
         box: THREE.LineSegments<THREE.EdgesGeometry<THREE.ExtrudeGeometry>, THREE.LineBasicMaterial, THREE.Object3DEventMap>;
         center: THREE.Vector3;
         category: any;

package/src/utils/PointCloud.d.ts

@@ -0,0 +1,83 @@
+import { Octant, PointData } from 'sparse-octree';
+import { OBB } from 'three/addons/math/OBB.js';
+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;
+    constructor(bound: THREE.Box3);
+    /** 插入点 + 数据
+     * @param point
+     * @param data
+     */
+    insert(point: THREE.Vector3, data: T): void;
+    /** 批量插入（推荐大批量时用）
+     * @param points
+     * @param datas
+     */
+    insertBatch(points: THREE.Vector3[], datas: T[]): void;
+    /** 查找所有在 oBB 内的盒子
+     * @param queryOBB
+     * @returns
+     */
+    findNodeInOBB(queryOBB: OBB): Octant<PointData<T>>[];
+    /** 查找所有在 oBB 内的点（带数据）
+     * @param queryOBB
+     * @returns
+     */
+    findPointsInOBB(queryOBB: OBB): Array<{
+        point: THREE.Vector3;
+        data: T;
+    }>;
+    /** 通过半径查找
+     * @param position
+     * @param radius
+     * @param skipSelf
+     * @returns
+     */
+    findPointsByCircle(position: THREE.Vector3, radius: number, skipSelf?: boolean): import('sparse-octree').PointContainer<T>[];
+    /** 查找最近的点
+     * @param position
+     * @param maxDistance
+     * @param skipSelf
+     * @returns
+     */
+    findNearestPoint(position: THREE.Vector3, maxDistance: number, skipSelf?: boolean): import('sparse-octree').PointContainer<T> | null;
+    /** 批量查询
+     * @param obbList
+     * @returns
+     */
+    findPointsInOBBBatch(obbList: OBBBox[]): {
+        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/PointCloudCode.d.ts

@@ -0,0 +1,7 @@
+import * as THREE from 'three';
+export declare function encode(points: THREE.Vector3[], colors: number[]): ArrayBuffer;
+export declare function decode(buffer: ArrayBuffer | Blob): Promise<{
+    points: Float32Array;
+    colors: Float32Array;
+    pointCount: number;
+}>;

package/src/utils/download.d.ts

@@ -0,0 +1 @@
+export declare function download(path: string, file: any): Promise<void>;

package/src/utils/CloudPoint.d.ts

@@ -1 +0,0 @@
-export {};

package/src/utils/GpuComputed.d.ts

@@ -1,48 +0,0 @@
-type ValueType = "f32" | "vec2" | "vec3" | "vec4" | "mat3x3" | "mat4x4";
-type OptionType = {
-    workgroup_size?: [number, number, number];
-    workgroupCount: [number, number?, number?];
-    globalInvocationIdName?: string;
-    workgroupIndexName?: string;
-    synchronize?: string[];
-};
-type BufferType = {
-    buffer: number[];
-    stride: number;
-    layout: {
-        name: string;
-        type: ValueType;
-        offset: number;
-        size: number;
-    }[];
-    count: number;
-};
-export declare class GpuComputed {
-    constructor();
-    getDevice(): Promise<{
-        adapter: GPUAdapter | null;
-        device: GPUDevice;
-    }>;
-    createPipleline(code: string, buffers: Record<string, BufferType>): Promise<{
-        pipeline: GPUComputePipeline;
-        group: GPUBindGroup;
-        device: GPUDevice;
-        bufferInfoList: {
-            name: string;
-            buffer: GPUBuffer;
-            float32Array: Float32Array<ArrayBuffer>;
-            groupLayoutItem: GPUBindGroupLayoutEntry;
-            groupItem: {
-                binding: number;
-                resource: {
-                    buffer: GPUBuffer;
-                };
-            };
-        }[];
-    }>;
-    private buildBuffer;
-    capitalize(str: string): string;
-    private buildCode;
-    computed(code: string, data: Record<string, any[]>, option: OptionType): Promise<number[][]>;
-}
-export {};