build-dxf 0.1.17 → 0.1.18

package/package.json

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

package/src/build.js

@@ -1491,7 +1491,7 @@ class LineSegment {
     const p3 = line.start;
     const p4 = line.end;
     const denom = (p1.x - p2.x) * (p3.y - p4.y) - (p1.y - p2.y) * (p3.x - p4.x);
-    if (Math.abs(denom) < 1e-9) {
+    if (Math.abs(denom) < 1e-10) {
       return null;
     }
     const t = ((p1.x - p3.x) * (p3.y - p4.y) - (p1.y - p3.y) * (p3.x - p4.x)) / denom;
@@ -13886,7 +13886,7 @@ class SceneAutoGenerat {
     await Promise.all(this.itemList.map(async (item) => await this.getModel(item)));
   }
   static itemParse(item) {
-    const contour = Point.fromByList(item.contour), rectangle = new Polygon(Qa(contour.map((p) => [p.x, p.y])).map((p) => Point.from(p)));
+    const contour = Point.fromByList(item.contour ?? []), rectangle = new Polygon(Qa(contour.map((p) => [p.x, p.y])).map((p) => Point.from(p)));
     rectangle.pop();
     const z = item.box.min.z, height = Math.abs(item.box.max.z - z), max = rectangle.getMaxLengthInfo(), min = rectangle.getMinLengthInfo(), direction = max.start.y < max.end.y ? max.start.direction(max.end) : max.end.direction(max.start), shape = new THREE.Shape();
     rectangle.forEach((p, i) => {
@@ -13940,7 +13940,7 @@ class HeightQuery {
     newLine.endShrink(len * 0.2);
     inLinePoints.push([center.x, center.y], [newLine.start.x, newLine.start.y], [newLine.end.x, newLine.end.y]);
     const contoursData = this.whichContourContainsPoint(inLinePoints, rootTopContourInfo);
-    contoursData.sort((a, b) => a.averagePz - b.averagePz);
+    contoursData.sort((a, b) => b.averagePz - a.averagePz);
     const height = contoursData[0]?.averagePz ?? DEFAULT_WALL_HEIGHT;
     return height;
   }
@@ -13958,6 +13958,7 @@ class HeightQuery {
     points.filter((p) => {
       point.set(p[0], p[1]);
       new Array(...new Set(quadtree?.queryCircle(point, 0.4).map((item) => item.line.currentData.contourIndex))).forEach((index2) => {
+        if (index2 === maxContourIndex) return;
         contoursData.push({ i: index2, averagePz: contours[index2].averagePz });
       });
     });
@@ -14198,8 +14199,8 @@ const PRE_PROCESSOR = {
     }
     lineSegments.forEach((line) => {
       if (!("height" in line.userData)) {
-        if (line.userData.rooftopPz) line.userData.height = Math.abs(line.userData.rooftopPz - (option.originalZ ?? 0));
-        else if (option?.publicInfo?.rootTopContourInfo) line.userData.height = HeightQuery.query(line, option.publicInfo.rootTopContourInfo);
+        if (!line.userData.rooftopPz && option?.publicInfo?.rootTopContourInfo) line.userData.rooftopPz = HeightQuery.query(line, option.publicInfo.rootTopContourInfo);
+        if ("rooftopPz" in line.userData) line.userData.height = Math.abs(line.userData.rooftopPz - (option.originalZ ?? 0));
       }
     });
     return lineSegments;
@@ -15391,6 +15392,7 @@ export {
   Box2 as B,
   Component as C,
   Dxf as D,
+  HeightQuery as H,
   LineSegment as L,
   PointVirtualGrid as P,
   Quadtree as Q,

package/src/index3.js

@@ -1,4 +1,4 @@
-import { C as Component, P as PointVirtualGrid, Q as Quadtree, B as Box2, a as Point, c as cloneUserData, L as LineSegment, b as Lines, u as uuid, r as recomputedWindow, A as AxisAlignCorr, W as WhiteModel, T as ThreeVJia, V as Variable, S as SelectLocalFile, d as CommandManager } from "./build.js";
+import { C as Component, P as PointVirtualGrid, Q as Quadtree, B as Box2, a as Point, c as cloneUserData, L as LineSegment, b as Lines, H as HeightQuery, u as uuid, r as recomputedWindow, A as AxisAlignCorr, W as WhiteModel, T as ThreeVJia, V as Variable, S as SelectLocalFile, d as CommandManager } from "./build.js";
 import * as THREE from "three";
 import "clipper-lib";
 import "dxf-writer";
@@ -9607,7 +9607,7 @@ class RenderManager extends Component {
       this.updatedMode = "self";
       const dxf2 = this.dxf;
       const json = this.toJson();
-      dxf2.set(json);
+      dxf2.set(json, dxf2.options);
     });
   }
   get renderer() {
@@ -9971,6 +9971,11 @@ class Default extends CommandFlowComponent {
           } else {
             const rectangle = wiLine.expandToRectangle(0.025, "bothSides");
             object3D.geometry = editor.renderManager.createGeometry({ position: rectangle.createGeometry() }, 6);
+            const center = wiLine.center;
+            let info = "";
+            textObj3D.element.innerText = info + parseInt(wiLine.length() * 1e3 + "") + " mm";
+            textObj3D.position.set(center.x, center.y, 0);
+            textObj3D.visible = true;
           }
           this.container.add(object3D);
         } else {
@@ -10269,6 +10274,12 @@ class DrawLine extends CommandFlowComponent {
     for (let i = 0; i < points.length; i += 2) {
       lines.push(new LineSegment(Point.from(points[i]), Point.from(points[i + 1])));
     }
+    lines.forEach((line2) => {
+      if (this.renderManager.dxf.options.publicInfo?.rootTopContourInfo) {
+        const rooftopPz = HeightQuery.query(line2, this.renderManager.dxf.options.publicInfo?.rootTopContourInfo);
+        line2.userData.rooftopPz = rooftopPz;
+      }
+    });
     next(lines);
   }
   /** 执行完成

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/GpuComputed.d.ts

@@ -1,30 +1,48 @@
-type ValueType = "number" | "boolean" | "vec2" | "vec3" | "vec4" | "mat3x3" | "mat4x4";
+type ValueType = "f32" | "vec2" | "vec3" | "vec4" | "mat3x3" | "mat4x4";
 type OptionType = {
     workgroup_size?: [number, number, number];
-    structName?: string;
-    dataName?: string;
+    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;
-        groupLayout: GPUBindGroupLayout;
     }>;
-    createPipleline(code: string, buffer: Float32Array<ArrayBuffer>): Promise<void>;
-    buildBuffer(data: Record<string, any>[], keys?: string[], types?: ValueType[]): {
-        buffer: number[];
-        stride: number;
-        layout: {
+    createPipleline(code: string, buffers: Record<string, BufferType>): Promise<{
+        pipeline: GPUComputePipeline;
+        group: GPUBindGroup;
+        device: GPUDevice;
+        bufferInfoList: {
             name: string;
-            type: ValueType;
-            offset: number;
-            size: number;
+            buffer: GPUBuffer;
+            float32Array: Float32Array<ArrayBuffer>;
+            groupLayoutItem: GPUBindGroupLayoutEntry;
+            groupItem: {
+                binding: number;
+                resource: {
+                    buffer: GPUBuffer;
+                };
+            };
         }[];
-        count: number;
-    };
+    }>;
+    private buildBuffer;
+    capitalize(str: string): string;
     private buildCode;
-    computed(data: any[], code: string, option?: OptionType): Promise<void>;
+    computed(code: string, data: Record<string, any[]>, option: OptionType): Promise<number[][]>;
 }
 export {};