build-dxf 0.1.18 → 0.1.19

package/package.json

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

package/src/build.js

@@ -2107,6 +2107,34 @@ class LineSegment {
       return true;
     });
   }
+  static createModifyManager() {
+    const modifyMap = new MapEnhance();
+    function setPoint(line, point2, value) {
+      if (!modifyMap.has(line)) modifyMap.set(line, new ArrayMap());
+      const arrayMap = modifyMap.get(line);
+      arrayMap.append(point2, value);
+    }
+    function modify2() {
+      modifyMap.forEach((arrayMap, line) => {
+        arrayMap.forEach((list, point2) => {
+          const otherPoint = line.getAnotherPoint(point2);
+          list.push(point2);
+          list.sort((p1, p2) => p2.distance(otherPoint, true) - p1.distance(otherPoint, true));
+          if (list[0] === point2) point2.copy(list[1]);
+          else point2.copy(list[0]);
+        });
+      });
+      modifyMap.clear();
+    }
+    return {
+      get setPoint() {
+        return setPoint;
+      },
+      get modify() {
+        return modify2;
+      }
+    };
+  }
 }
 class Point {
   x;
@@ -5618,7 +5646,7 @@ class BoundExt {
     exteriorLines.forEach((line) => correction(line, wallWidth, appendLines, grid, quadtree));
     lines.push(...appendLines.filter((line) => line.length() > 1e-9));
     recomputedWindow(...lines);
-    lines = lines.filter((line) => line.length() > 1e-3);
+    lines = lines.filter((line) => line.length() > 0.01);
     findCallBack && findCallBack(exteriorLines, trajectoryPoints);
     return {
       lines,
@@ -6063,34 +6091,36 @@ class Scenario {
           return false;
         });
         const Mesh = this.drawTheModel(E, 0, Number(i), wallHeight);
-        Mesh.material.envMap = texture;
-        Mesh.material.needsUpdate = true;
-        const doubleLinesWindow = doubleWinDrawLine(a[i]);
-        if (doubleLinesWindow) {
-          let houMesh = null;
-          for (const x in doubleLinesWindow) {
-            if (doubleLinesWindow.length === 1) {
-              const edges = new THREE.EdgesGeometry(this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight).geometry);
-              new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
-              this.installWindows(doubleLinesWindow[x], x);
-              this.group.add(this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight));
-            } else if (houMesh) {
-              if (Number(x) === doubleLinesWindow.length - 1) {
-                const edges = new THREE.EdgesGeometry(this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight).geometry);
+        if (Mesh) {
+          Mesh.material.envMap = texture;
+          Mesh.material.needsUpdate = true;
+          const doubleLinesWindow = doubleWinDrawLine(a[i]);
+          if (doubleLinesWindow && doubleLinesWindow.length != 0) {
+            let houMesh = null;
+            for (const x in doubleLinesWindow) {
+              if (doubleLinesWindow.length === 1) {
+                const edges = new THREE.EdgesGeometry(this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight).geometry);
                 new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
                 this.installWindows(doubleLinesWindow[x], x);
-                this.group.add(this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight));
+                this.group.add(this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight));
+              } else if (houMesh) {
+                if (Number(x) === doubleLinesWindow.length - 1) {
+                  const edges = new THREE.EdgesGeometry(this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight).geometry);
+                  new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
+                  this.installWindows(doubleLinesWindow[x], x);
+                  this.group.add(this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight));
+                } else {
+                  this.installWindows(doubleLinesWindow[x], x);
+                  houMesh = this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight);
+                }
               } else {
                 this.installWindows(doubleLinesWindow[x], x);
-                houMesh = this.windowTreatment(doubleLinesWindow[x], houMesh, wallHeight);
+                houMesh = this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight);
               }
-            } else {
-              this.installWindows(doubleLinesWindow[x], x);
-              houMesh = this.windowTreatment(doubleLinesWindow[x], Mesh, wallHeight);
             }
+          } else {
+            this.group.add(Mesh);
           }
-        } else {
-          this.group.add(Mesh);
         }
       }
     }
@@ -6104,28 +6134,33 @@ class Scenario {
       // 可以不是矩形
       new THREE.Vector3(data[3].x, data[3].y, this.height ? this.height : 0)
     ];
-    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";
+    const spacing = basePoints[0].distanceTo(basePoints[3]);
+    if (spacing < 5e-3) {
+      return null;
     } else {
-      cube.name = `单线墙_${index2}`;
-      cube.userData.category = "wall";
+      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;
     }
-    return cube;
   }
   // 执行偏移
   executionOffset(data, index2, wallHeight) {
@@ -6622,39 +6657,41 @@ class Scenario {
         }
         const wallHeight = listS[x].wallHeight;
         let Mesh = this.executionOffset(a, Number(x) / 2, wallHeight);
-        if (winDraw && winDraw.length > 0) {
-          let houMesh = null;
-          for (const x2 in winDraw) {
-            if (winDraw.length === 1) {
-              const edges = new THREE.EdgesGeometry(this.windowTreatment(winDraw[x2], Mesh, wallHeight).geometry);
-              new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
-              this.installWindows(winDraw[x2], x2);
-              let mesh = this.windowTreatment(winDraw[x2], Mesh, wallHeight);
-              mesh.name = `单线墙_${Number(x2) / 2}`;
-              mesh.userData.category = "wall";
-              this.group.add(mesh);
-            } else if (houMesh) {
-              if (Number(x2) === winDraw.length - 1) {
-                const edges = new THREE.EdgesGeometry(this.windowTreatment(winDraw[x2], houMesh, wallHeight).geometry);
-                this.installWindows(winDraw[x2], x2);
+        if (Mesh) {
+          if (winDraw && winDraw.length > 0) {
+            let houMesh = null;
+            for (const x2 in winDraw) {
+              if (winDraw.length === 1) {
+                const edges = new THREE.EdgesGeometry(this.windowTreatment(winDraw[x2], Mesh, wallHeight).geometry);
                 new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
-                let mesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
+                this.installWindows(winDraw[x2], x2);
+                let mesh = this.windowTreatment(winDraw[x2], Mesh, wallHeight);
                 mesh.name = `单线墙_${Number(x2) / 2}`;
                 mesh.userData.category = "wall";
                 this.group.add(mesh);
+              } else if (houMesh) {
+                if (Number(x2) === winDraw.length - 1) {
+                  const edges = new THREE.EdgesGeometry(this.windowTreatment(winDraw[x2], houMesh, wallHeight).geometry);
+                  this.installWindows(winDraw[x2], x2);
+                  new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
+                  let mesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
+                  mesh.name = `单线墙_${Number(x2) / 2}`;
+                  mesh.userData.category = "wall";
+                  this.group.add(mesh);
+                } else {
+                  this.installWindows(winDraw[x2], x2);
+                  houMesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
+                }
               } else {
                 this.installWindows(winDraw[x2], x2);
-                houMesh = this.windowTreatment(winDraw[x2], houMesh, wallHeight);
+                houMesh = this.windowTreatment(winDraw[x2], Mesh, wallHeight);
               }
-            } else {
-              this.installWindows(winDraw[x2], x2);
-              houMesh = this.windowTreatment(winDraw[x2], Mesh, wallHeight);
             }
+          } else {
+            Mesh.name = `单线墙_${Number(x) / 2}`;
+            Mesh.userData.category = "wall";
+            this.group.add(Mesh);
           }
-        } else {
-          Mesh.name = `单线墙_${Number(x) / 2}`;
-          Mesh.userData.category = "wall";
-          this.group.add(Mesh);
         }
       }
     }
@@ -13807,6 +13844,9 @@ class SceneAutoGenerat {
     await this.buildPlane(this.lines);
     await this.buildWall();
     globalScenario.scene.add(this.scene);
+    globalScenario.scene.traverse((child) => {
+      child.updateWorldMatrix(false, false);
+    });
   }
   buildPlane(lines) {
     lines = lineSegmentClipping(lines, 0);
@@ -13886,6 +13926,7 @@ class SceneAutoGenerat {
     await Promise.all(this.itemList.map(async (item) => await this.getModel(item)));
   }
   static itemParse(item) {
+    if (!Array.isArray(item.contour) || !item.contour.length) return null;
     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();
@@ -14684,7 +14725,6 @@ class WhiteModel extends Component {
   whiteModelGroup = new THREE.Group();
   // dxf数据白模边缘线
   whiteModelLineGroup = new THREE.Group();
-  material = new THREE.MeshStandardMaterial({ color: 16777215, transparent: true, opacity: 0.8, side: THREE.DoubleSide });
   itemList = [];
   promise;
   /** 设置物品列表
@@ -14730,13 +14770,7 @@ class WhiteModel extends Component {
   toOBJ() {
     return new Promise(async (resolve) => {
       await this.promise;
-      this.material.opacity = 1;
-      this.material.needsUpdate = true;
-      setTimeout(() => {
-        resolve(exporter.parse(this.whiteModelGroup));
-        this.material.opacity = 0.8;
-        this.material.transparent = true;
-      }, 20);
+      resolve(exporter.parse(this.whiteModelGroup));
     });
   }
   /**
@@ -14748,19 +14782,13 @@ class WhiteModel extends Component {
     if (!glbExporter) glbExporter = new gltf.GLTFExporter();
     return new Promise(async (resolve) => {
       await this.promise;
-      this.material.opacity = 1;
-      this.material.needsUpdate = true;
-      setTimeout(async () => {
-        glbExporter.parse(this.whiteModelGroup.children, (gltf2) => {
-          resolve(gltf2);
-          this.material.opacity = 0.8;
-          this.material.transparent = true;
-        }, () => {
-          resolve(void 0);
-        }, {
-          binary
-        });
-      }, 20);
+      glbExporter.parse(this.whiteModelGroup.children, (gltf2) => {
+        resolve(gltf2);
+      }, () => {
+        resolve(void 0);
+      }, {
+        binary
+      });
     });
   }
   /**

package/src/index.css

@@ -680,7 +680,7 @@
   inherits: false
 }
 
-[data-v-74cfb8d6] {
+[data-v-adaee1e3] {
     font-family: 宋体;
 }
 

package/src/index3.js

@@ -11772,7 +11772,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onMousedown: dragMoveHelper,
             class: normalizeClass([{ "border-b-[#eee] border-b-1": toolBarExpand.value }, "flex flex-row justify-between header text-[14px] font-bold p-[10px 0px]"])
           }, [
-            _cache[12] || (_cache[12] = createStaticVNode('<div class="flex flex-row" data-v-74cfb8d6><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-74cfb8d6><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-74cfb8d6><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-74cfb8d6></path></svg></div><h5 class="flex text-nowrap text-[12px] items-center pointer-events-none" data-v-74cfb8d6>绘制工具</h5></div>', 1)),
+            _cache[12] || (_cache[12] = createStaticVNode('<div class="flex flex-row" data-v-adaee1e3><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-adaee1e3><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-adaee1e3><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-adaee1e3></path></svg></div><h5 class="flex text-nowrap text-[12px] items-center pointer-events-none" data-v-adaee1e3>绘制工具</h5></div>', 1)),
             createElementVNode("div", {
               onMousedown: _cache[0] || (_cache[0] = (e) => e.stopPropagation()),
               onClick: _cache[1] || (_cache[1] = ($event) => toolBarExpand.value = !toolBarExpand.value),
@@ -11886,7 +11886,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 style: { "padding": "5px", "font-size": "10px" },
                 size: "small",
                 type: "primary",
-                onClick: _cache[4] || (_cache[4] = ($event) => unref(dxfSystem).Dxf.downloadOriginalData("json.json"))
+                onClick: _cache[4] || (_cache[4] = ($event) => unref(dxfSystem).CorrectionDxf.downloadOriginalData("json.json"))
               }, {
                 default: withCtx(() => _cache[17] || (_cache[17] = [
                   createTextVNode(" 下载Json ", -1)
@@ -12011,7 +12011,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-74cfb8d6"]]);
+const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-adaee1e3"]]);
 class Editor extends Component {
   static name = "Editor";
   container = new THREE.Group();

package/src/utils/CloudPoint.d.ts

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

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

@@ -80,9 +80,9 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
      */
     lineDataToOriginalData(lines: LineSegment<LineUserData>[], quadtree?: Quadtree): OriginalDataItem[];
     /**
-   * 下载原始json
-   * @param filename
-   */
+    * 下载原始json
+    * @param filename
+    */
     downloadOriginalData(filename: string): Promise<void>;
     /** 获取绘制数据
      */

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

@@ -12,7 +12,6 @@ export declare class WhiteModel extends Component<{
     Variable: Variable | null;
     whiteModelGroup: THREE.Group<THREE.Object3DEventMap>;
     whiteModelLineGroup: THREE.Group<THREE.Object3DEventMap>;
-    material: THREE.MeshStandardMaterial;
     itemList: any[];
     promise?: Promise<THREE.Group>;
     /** 设置物品列表

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

@@ -35,5 +35,5 @@ export declare class SceneAutoGenerat {
             end: THREE.Vector3;
             length: number;
         }[];
-    };
+    } | null;
 }

package/src/utils/LineSegment.d.ts

@@ -307,4 +307,8 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param clippingLine
      */
     static clippingByLine(target: LineSegment, clippingLine: LineSegment, callBack?: (newLine: LineSegment, line: LineSegment) => void): LineSegment<Record<string, any>>[];
+    static createModifyManager(): {
+        readonly setPoint: (line: LineSegment, point: Point, value: Point) => void;
+        readonly modify: () => void;
+    };
 }

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

@@ -39,8 +39,8 @@ export default class Scenario {
     constructor(scene: THREE.Scene, camera: THREE.PerspectiveCamera, renderer: THREE.WebGLRenderer, controls: OrbitControls);
     drawGraphics(lines: LineSegment[], z: number, trajectoryJson: any): Promise<any>;
     splitProcessData(lines: LineSegment[], texture: THREE.DataTexture): void;
-    drawTheModel(data: any, num: number, index: number, wallHeight: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap>;
-    executionOffset(data: any, index: number, wallHeight: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | undefined;
+    drawTheModel(data: any, num: number, index: number, wallHeight: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
+    executionOffset(data: any, index: number, wallHeight: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null | undefined;
     windowTreatment(dblWin: any, mesh: any, wallHeight: number): Brush;
     TheHandlingOfTheDoor1(data: LineSegment<LineUserData>): THREE.Vector3[];
     TheHandlingOfTheDoor(data: LineSegment<LineUserData>[]): void;