build-dxf 0.0.19-9 → 0.0.20-1

package/package.json

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

package/src/build.d.ts

@@ -7,25 +7,27 @@ export * from './utils/DxfSystem/plugin/ModelDataPlugin';
  * @param camera
  * @returns
  */
-export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera, orbitControls?: boolean): Promise<{
+export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera, orbitControls?: boolean, viewPermission?: 'admin'): Promise<{
     dxfSystem: DxfSystem;
-    getFileAll: () => {
+    getFileAll: () => Promise<{
         dxf: File;
         obj: File;
         glb: File;
         gltf: File;
-    };
+        json: File;
+    }>;
 }>;
 /**
  * 获取所有文件数据
  * @param dxfSystem
  */
-export declare function getFileAll(dxfSystem?: DxfSystem): {
+export declare function getFileAll(dxfSystem?: DxfSystem): Promise<{
     dxf: File;
     obj: File;
     glb: File;
     gltf: File;
-};
+    json: File;
+}>;
 /** 获取全局DxfSystem
  * @returns
  */

package/src/build.js

@@ -44,6 +44,7 @@ class EventDispatcher extends EventDispatcher$1 {
 }
 class Component extends EventDispatcher {
   parent;
+  destroyed = false;
   constructor(...arg) {
     super();
     this.addEventListener("addFromParent", (e) => {
@@ -60,6 +61,7 @@ class Component extends EventDispatcher {
   onRemoveFromParent(parent) {
   }
   destroy() {
+    this.destroyed = true;
   }
 }
 class ComponentManager extends EventDispatcher {
@@ -1025,7 +1027,7 @@ class LineSegment {
     return projP1;
   }
   /**
-   * 判断线段是与线段相交
+   * 判断线段是否与另一条线段相交（包含共用端点或部分重合的情况）
    * @param line 
    */
   intersectLineSegment(line) {
@@ -1033,14 +1035,32 @@ class LineSegment {
     const p2 = this.end;
     const p3 = line.start;
     const p4 = line.end;
-    function crossProduct(p12, p22, p32) {
-      return (p22.x - p12.x) * (p32.y - p12.y) - (p22.y - p12.y) * (p32.x - p12.x);
+    function crossProduct(a, b, c) {
+      return (b.x - a.x) * (c.y - a.y) - (b.y - a.y) * (c.x - a.x);
+    }
+    function isPointOnSegment(pt, segStart, segEnd) {
+      return Math.min(segStart.x, segEnd.x) - 1e-10 <= pt.x && pt.x <= Math.max(segStart.x, segEnd.x) + 1e-10 && Math.min(segStart.y, segEnd.y) - 1e-10 <= pt.y && pt.y <= Math.max(segStart.y, segEnd.y) + 1e-10;
     }
     const d1 = crossProduct(p1, p2, p3);
     const d2 = crossProduct(p1, p2, p4);
     const d3 = crossProduct(p3, p4, p1);
     const d4 = crossProduct(p3, p4, p2);
-    return d1 * d2 < 0 && d3 * d4 < 0;
+    if (d1 * d2 < 0 && d3 * d4 < 0) {
+      return true;
+    }
+    if (Math.abs(d1) < 1e-10 && isPointOnSegment(p3, p1, p2)) {
+      return true;
+    }
+    if (Math.abs(d2) < 1e-10 && isPointOnSegment(p4, p1, p2)) {
+      return true;
+    }
+    if (Math.abs(d3) < 1e-10 && isPointOnSegment(p1, p3, p4)) {
+      return true;
+    }
+    if (Math.abs(d4) < 1e-10 && isPointOnSegment(p2, p3, p4)) {
+      return true;
+    }
+    return false;
   }
   /**
    * 获取交点
@@ -1455,7 +1475,7 @@ class Dxf extends Component {
         filterLines.push(line2);
       } else filterLines.push(line);
     }
-    return filterLines.length > 3 ? linesToPath(this.mergeSameDirectionLine(filterLines)) : [];
+    return filterLines.length > 2 ? linesToPath(this.mergeSameDirectionLine(filterLines)) : [];
   }
   /**
    * 移除短线段
@@ -1478,26 +1498,25 @@ class Dxf extends Component {
           nextline = lines[++i];
         } else break;
       }
-      if (nextline) {
-        const intersectPoint = preLine.getIntersection(nextline);
-        if (intersectPoint) {
-          const p0 = preLine.points[1].clone(), p1 = nextline.points[0].clone();
-          preLine.points[1].copy(intersectPoint);
-          nextline.points[0].copy(intersectPoint);
-          if (preLine.length() < this.width) {
-            preLine.points[1].copy(p0);
-            nextline.points[0].copy(p0);
-          } else if (nextline.length() < this.width) {
-            preLine.points[1].copy(p1);
-            nextline.points[0].copy(p1);
-          }
-        } else {
-          preLine.points[1].copy(nextline.points[0]);
+      if (!nextline) continue;
+      const intersectPoint = preLine.getIntersection(nextline);
+      if (intersectPoint) {
+        const p0 = preLine.points[1].clone(), p1 = nextline.points[0].clone();
+        preLine.points[1].copy(intersectPoint);
+        nextline.points[0].copy(intersectPoint);
+        if (preLine.length() < this.width) {
+          preLine.points[1].copy(p0);
+          nextline.points[0].copy(p0);
+        } else if (nextline.length() < this.width) {
+          preLine.points[1].copy(p1);
+          nextline.points[0].copy(p1);
         }
-        filterLines.push(nextline);
+      } else {
+        preLine.points[1].copy(nextline.points[0]);
       }
+      filterLines.push(nextline);
     }
-    return filterLines.length > 3 ? linesToPath(filterLines) : [];
+    return filterLines.length > 2 ? linesToPath(filterLines) : [];
   }
   /** 线偏移
    * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
@@ -2704,10 +2723,12 @@ class DxfSystem extends ComponentManager {
     return this;
   }
   destroy() {
-    this.components.forEach((com) => {
-      this.removeComponent(com);
+    [...this.components].forEach((com) => {
       com.destroy();
     });
+    [...this.components].forEach((com) => {
+      this.removeComponent(com);
+    });
   }
 }
 const exporter = new OBJExporter();
@@ -3077,7 +3098,7 @@ function loadEditorPlugin() {
   return import("./index3.js");
 }
 let gloabalDxfSystem = null;
-async function createEditor(dom, camera, orbitControls = false) {
+async function createEditor(dom, camera, orbitControls = false, viewPermission) {
   const mp = await Promise.resolve().then(() => index);
   const rp = await loadRenderPlugin();
   const editor = await loadEditorPlugin();
@@ -3090,7 +3111,7 @@ async function createEditor(dom, camera, orbitControls = false) {
     detailsPoint: false,
     orbitControls,
     camera
-  })).usePlugin(editor.Editor);
+  })).usePlugin(editor.Editor.create({ viewPermission }));
   const domContainer = dxfSystem.findComponentByType(rp.components.DomContainer);
   domContainer && dom.appendChild(domContainer.domElement);
   gloabalDxfSystem = dxfSystem;
@@ -3099,17 +3120,19 @@ async function createEditor(dom, camera, orbitControls = false) {
     getFileAll: () => getFileAll(dxfSystem)
   };
 }
-function getFileAll(dxfSystem = gloabalDxfSystem) {
+async function getFileAll(dxfSystem = gloabalDxfSystem) {
   const whiteModel = dxfSystem.findComponentByName("WhiteModel");
   const dxf = new File([dxfSystem.Dxf.toDxfBlob()], "dxf.dxf", { type: "application/dxf" });
-  const obj = new File([whiteModel.toOBJBlob()], "model.obj", { type: "application/octet-stream" });
-  const glb = new File([whiteModel.toGltfBlob(true)], "model.glb", { type: "application/octet-stream" });
-  const gltf = new File([whiteModel.toGltfBlob(false)], "model.gltf", { type: "application/json" });
+  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 gltf = 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" });
   return {
     dxf,
     obj,
     glb,
-    gltf
+    gltf,
+    json
   };
 }
 function getGlobalDxfSystem() {