build-dxf 0.0.19 → 0.0.20-10

package/README.md

@@ -40,6 +40,36 @@ detailsPoint.set("./json/dp8.json")
 
 ```
 
+# 浏览器编辑功能使用示例
+```html
+
+<template>
+    <div class="w-[100vw] h-[100vh]" ref="dom"> </div>
+</template>
+
+<style scoped></style>
+
+<script setup lang="ts">
+import data from "../data/d9.json"
+import { createEditor } from "build-dxf"
+import { onMounted, ref } from "vue"
+import * as THREE from "three"
+import  "build-dxf/index.css"
+
+const dom = ref<HTMLDivElement>()
+
+onMounted(async ()=>{
+    if(dom.value) {
+        const camera = new THREE.OrthographicCamera( -100, 100, 100, -100, 0.1, 1000 )
+        const { dxfSystem } = await createEditor( dom.value, camera )
+        dxfSystem.Dxf.set( (data as any) )
+        dxfSystem.Dxf.lineOffset()
+    }
+})
+</script>
+```
+
+
 
 # 浏览器 使用示例
 ```html

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.0.19",
+  "version": "0.0.20-10",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -35,8 +35,6 @@
   "dependencies": {
     "clipper-lib": ">=6.4.2",
     "dxf-writer": ">=1.18.4",
-    "three-bvh-csg": ">=0.0.17",
-    "three-csg-ts": ">=3.2.0",
     "@tweenjs/tween.js": ">=25.0.0",
     "vue": ">=3.0.0",
     "obj2gltf": ">=3.1.6"

package/src/build.d.ts

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

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 {
@@ -120,7 +122,7 @@ class ComponentManager extends EventDispatcher {
    * @param callBack 
    */
   findComponents(predicate) {
-    return this.components.find(predicate);
+    return this.components.filter(predicate);
   }
   /**
    * 
@@ -363,10 +365,11 @@ class Point {
     this.x = p.x ?? 0;
     this.y = p.y ?? 0;
   }
-  toJson() {
+  toJson(z = 0) {
     return {
       x: this.x,
-      y: this.y
+      y: this.y,
+      z
     };
   }
   static from(arr) {
@@ -850,6 +853,10 @@ class LineSegment {
   constructor(p1 = new Point(), p2 = new Point()) {
     this.points = [p1, p2];
   }
+  set(p1, p2) {
+    this.start.copy(p1);
+    this.end.copy(p2);
+  }
   /** 膨胀
    * @description 向线段的两个端点分别膨胀 width
    * @param width 
@@ -1025,7 +1032,7 @@ class LineSegment {
     return projP1;
   }
   /**
-   * 判断线段是与线段相交
+   * 判断线段是否与另一条线段相交（包含共用端点或部分重合的情况）
    * @param line 
    */
   intersectLineSegment(line) {
@@ -1033,14 +1040,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;
   }
   /**
    * 获取交点
@@ -1465,7 +1490,7 @@ class Dxf extends Component {
   removeShortLine(path, shortLine = this.shortLine) {
     const lines = pathToLines(path), filterLines = [], PI_1 = Math.PI / 180;
     for (let i = 0; i < lines.length; i++) {
-      const line = lines[i], len = line.length();
+      const line = lines[i], len = line.length(), currentIndex = i;
       if (len > shortLine || filterLines.length === 0) {
         filterLines.push(line);
         continue;
@@ -1478,7 +1503,9 @@ class Dxf extends Component {
           nextline = lines[++i];
         } else break;
       }
-      if (nextline) {
+      if (!nextline) continue;
+      const targetLine = lines[i - 1];
+      if (preLine.length() > targetLine.length()) {
         const intersectPoint = preLine.getIntersection(nextline);
         if (intersectPoint) {
           const p0 = preLine.points[1].clone(), p1 = nextline.points[0].clone();
@@ -1495,6 +1522,8 @@ class Dxf extends Component {
           preLine.points[1].copy(nextline.points[0]);
         }
         filterLines.push(nextline);
+      } else {
+        i = currentIndex;
       }
     }
     return filterLines.length > 3 ? linesToPath(filterLines) : [];
@@ -2265,7 +2294,6 @@ class DoorsAnalysis {
         console.warn(`门的线段顺序${item[4]} 没有drawDoorData属性`);
       }
     });
-    console.log("门点位数量：", doorPoints.length);
     return doorPoints;
   }
   /**
@@ -2704,10 +2732,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();
@@ -3076,25 +3106,47 @@ function loadRenderPlugin() {
 function loadEditorPlugin() {
   return import("./index3.js");
 }
-async function createEditor(dom, camera) {
+let gloabalDxfSystem = null;
+async function createEditor(dom, camera, orbitControls = false, viewPermission) {
   const mp = await Promise.resolve().then(() => index);
   const rp = await loadRenderPlugin();
   const editor = await loadEditorPlugin();
   const dxfSystem = new DxfSystem().usePlugin(mp.ModelDataPlugin.create({
     detailsPoint: false,
-    whiteModel: false
+    whiteModel: true
   })).usePlugin(rp.RenderPlugin.create({
     originalLine: false,
     modelData: 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;
   return {
-    dxfSystem
+    dxfSystem,
+    getFileAll: () => getFileAll(dxfSystem)
   };
 }
+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([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,
+    json
+  };
+}
+function getGlobalDxfSystem() {
+  return gloabalDxfSystem;
+}
 export {
   Box2 as B,
   Component as C,
@@ -3109,5 +3161,7 @@ export {
   DetailsPoint as a,
   PointVirtualGrid as b,
   createEditor as c,
+  getGlobalDxfSystem as d,
+  getFileAll as g,
   index$1 as i
 };