build-dxf 0.1.23 → 0.1.24

package/package.json

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

package/src/build.js

@@ -6097,31 +6097,46 @@ class Scenario {
   }
   // 绘制模型
   drawTheModel(data, num, index2, wallHeight) {
-    const basePoints = [
-      new THREE.Vector3(data[0].x, data[0].y, this.height ? this.height : 0),
-      new THREE.Vector3(data[1].x, data[1].y, this.height ? this.height : 0),
-      new THREE.Vector3(data[2].x, data[2].y, this.height ? this.height : 0),
-      // 可以不是矩形
-      new THREE.Vector3(data[3].x, data[3].y, this.height ? this.height : 0)
-    ];
-    const spacing = basePoints[0].distanceTo(basePoints[3]);
-    if (spacing < 5e-3) {
-      return null;
+    let basePoints = [];
+    for (const i in data) {
+      basePoints.push(new THREE.Vector3(data[i].x, data[i].y, this.height ? this.height : 0));
+    }
+    if (basePoints.length === 4) {
+      const spacing = basePoints[0].distanceTo(basePoints[3]);
+      if (spacing < 5e-3) {
+        return null;
+      } else {
+        const geometry = this.createParallelepipedFromBase(basePoints, wallHeight);
+        const material = new THREE.MeshStandardMaterial({
+          color: this.color,
+          side: THREE.DoubleSide
+          // roughness: this.numdu,
+          // metalness: 0.0,
+          // envMapRotation: new THREE.Euler(0, 0, 0),
+          // polygonOffset: true,
+          // polygonOffsetFactor: 10,
+          // polygonOffsetUnits: 10,
+        });
+        const cube = new THREE.Mesh(geometry, material);
+        const edges = new THREE.EdgesGeometry(geometry);
+        new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
+        if (num === 0) {
+          cube.name = `双线墙_${index2}`;
+          cube.userData.category = "doubleWall";
+        } else {
+          cube.name = `单线墙_${index2}`;
+          cube.userData.category = "wall";
+        }
+        return cube;
+      }
     } else {
       const geometry = this.createParallelepipedFromBase(basePoints, wallHeight);
       const material = new THREE.MeshStandardMaterial({
         color: this.color,
         side: THREE.DoubleSide
-        // roughness: this.numdu,
-        // metalness: 0.0,
-        // envMapRotation: new THREE.Euler(0, 0, 0),
-        // polygonOffset: true,
-        // polygonOffsetFactor: 10,
-        // polygonOffsetUnits: 10,
       });
       const cube = new THREE.Mesh(geometry, material);
-      const edges = new THREE.EdgesGeometry(geometry);
-      new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
+      new THREE.EdgesGeometry(geometry);
       if (num === 0) {
         cube.name = `双线墙_${index2}`;
         cube.userData.category = "doubleWall";
@@ -6512,7 +6527,6 @@ class Scenario {
       menModel.name = `门_${index2}`;
       menModel.userData.category = "door";
       menModel.userData.uuid = doorList?.uuid;
-      console.log(doorList);
       menModel.userData.width = distance2;
       menModel.userData.height = Height ? Height : this.doorHeight;
       menModel.userData.groundHeight = groundHeight;
@@ -6555,9 +6569,11 @@ class Scenario {
   createParallelepipedFromBase(points, height) {
     const shape = new THREE.Shape();
     shape.moveTo(points[0].x, points[0].y);
-    shape.lineTo(points[1].x, points[1].y);
-    shape.lineTo(points[2].x, points[2].y);
-    shape.lineTo(points[3].x, points[3].y);
+    for (const i in points) {
+      if (i !== "0") {
+        shape.lineTo(points[i].x, points[i].y);
+      }
+    }
     shape.lineTo(points[0].x, points[0].y);
     const geometry = new THREE.ExtrudeGeometry(shape, {
       depth: height,
@@ -14600,7 +14616,6 @@ class DoorFind {
       dock = { dockLine: endList[0].userData, dockPoint: endList[0].point, point: line.end, pointType: "end" };
     }
     const point2 = this.adsorpt(dock, line);
-    console.log(111);
     line.userData.doorDirectConnection = true;
     if (point2) {
       line.userData.doorAutomaticFind = true;
@@ -14843,6 +14858,9 @@ const PRE_PROCESSOR = {
   Clipping(lines) {
     return lines = lineSegmentClipping(lines, 0);
   },
+  clipDoubleWall(lines) {
+    return lines;
+  },
   RemoveShortLine(lines, option) {
     return lines = lines.filter((line) => line.length() > (option.minWidth ?? 1e-5));
   },
@@ -19040,7 +19058,8 @@ async function getFileAll(dxfSystem = gloabalDxfSystem) {
   const obj = new File([await whiteModel.toOBJBlob()], "model.obj", { type: "application/octet-stream" });
   const glb = new File([await whiteModel.toGltfBlob(true)], "model.glb", { type: "application/octet-stream" });
   const gltf2 = new File([await whiteModel.toGltfBlob(false)], "model.gltf", { type: "application/json" });
-  const json = new File([JSON.stringify(dxfSystem.Dxf.originalData)], "json.json", { type: "application/json" });
+  const originalData = lineDataToOriginalData(dxfSystem.Dxf.getLineSegments());
+  const json = new File([JSON.stringify(originalData)], "json.json", { type: "application/json" });
   return {
     dxf,
     obj,

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, ...arg: any[]) => import('../..').LineSegment[]>;
+    static readonly PRE_PROCESSOR: Record<"DoorFind" | "clipDoubleWall" | "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

@@ -5,7 +5,7 @@ import { Quadtree } from '../../Quadtree';
 import { SetDataOption, DataItem, LineUserData, OriginalDataItem, Unit } from '../type';
 import { CAD } from '../utils/CAD';
 type PreProcessor = (lines: LineSegment[], option: SetDataOption, ...arg: any[]) => LineSegment[];
-export declare const PRE_PROCESSOR: Record<"DoorFind" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", PreProcessor>;
+export declare const PRE_PROCESSOR: Record<"DoorFind" | "clipDoubleWall" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", PreProcessor>;
 /**
  * 将点云结构转换为DXF格式
  */
@@ -22,7 +22,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     };
 } & TEventMap> {
     static name: string;
-    static readonly PRE_PROCESSOR: Record<"DoorFind" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", PreProcessor>;
+    static readonly PRE_PROCESSOR: Record<"DoorFind" | "clipDoubleWall" | "AxisAlignCorr" | "BoundExt" | "AngleCorr" | "ResetGeometricCenter" | "WallHeightHandle" | "Clipping" | "RemoveShortLine", PreProcessor>;
     width: number;
     originalData: OriginalDataItem[];
     data: DataItem[];