build-dxf 0.0.20-21 → 0.0.20-22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.0.20-21",
+  "version": "0.0.20-22",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -33,12 +33,13 @@
   },
   "style": "src/index.css",
   "dependencies": {
+    "@tweenjs/tween.js": ">=25.0.0",
+    "build-dxf": "^0.0.20-21",
     "clipper-lib": ">=6.4.2",
     "dxf-writer": ">=1.18.4",
-    "@tweenjs/tween.js": ">=25.0.0",
-    "vue": ">=3.0.0",
-    "obj2gltf": ">=3.1.6"
+    "obj2gltf": ">=3.1.6",
+    "vue": ">=3.0.0"
   },
   "author": "夏过初秋",
   "license": "ISC"
-}
+}

package/src/build.d.ts

@@ -15,6 +15,7 @@ export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera,
         glb: File;
         gltf: File;
         json: File;
+        image: File;
     }>;
 }>;
 /**
@@ -27,6 +28,7 @@ export declare function getFileAll(dxfSystem?: DxfSystem): Promise<{
     glb: File;
     gltf: File;
     json: File;
+    image: File;
 }>;
 /** 获取全局DxfSystem
  * @returns

package/src/build.js

@@ -685,7 +685,7 @@ class N {
     ]);
   }
 }
-class b {
+class L {
   points = [new p(), new p()];
   userData = {};
   line;
@@ -819,8 +819,8 @@ class b {
     if (s.x === 0 && s.y === 0)
       throw new Error("投影目标线段的两个点不能重合");
     const r = (m) => {
-      const g = new p(m.x - i.x, m.y - i.y), u = s.x * s.x + s.y * s.y, w = (g.x * s.x + g.y * s.y) / u, S = i.x + w * s.x, L = i.y + w * s.y;
-      return new p(S, L);
+      const g = new p(m.x - i.x, m.y - i.y), u = s.x * s.x + s.y * s.y, w = (g.x * s.x + g.y * s.y) / u, S = i.x + w * s.x, b = i.y + w * s.y;
+      return new p(S, b);
     };
     let c = r(e), a = r(n);
     const h = (m) => {
@@ -832,7 +832,7 @@ class b {
       const g = Math.max(0, Math.min(1, m)), u = i.x + g * s.x, x = i.y + g * s.y;
       return new p(u, x);
     };
-    return (l < 0 || l > 1) && (c = f(l)), (d < 0 || d > 1) && (a = f(d)), c.x === a.x && c.y === a.y ? new b(c, c) : new b(c, a);
+    return (l < 0 || l > 1) && (c = f(l)), (d < 0 || d > 1) && (a = f(d)), c.x === a.x && c.y === a.y ? new L(c, c) : new L(c, a);
   }
   /**
    * 计算一条线段在另一条直线上的投影
@@ -922,7 +922,7 @@ class b {
     return !isFinite(s) && !isFinite(c) ? e.x === i.x && n.x === i.x : Math.abs(s - c) < 1e-3 && Math.abs(r - a) < 1e-3;
   }
   clone() {
-    const t = new b(
+    const t = new L(
       this.points[0].clone(),
       this.points[1].clone()
     );
@@ -987,7 +987,7 @@ const st = {
 function k(y) {
   const t = [];
   for (let e = 0; e < y.length; e++)
-    t.push(new b(
+    t.push(new L(
       y[e].clone(),
       y[(e + 1) % y.length].clone()
     ));
@@ -1056,7 +1056,7 @@ class X extends j {
     const i = [];
     this.data = t.map(({ start: o, end: s, insetionArr: r, isDoor: c = !1, ...a }, h) => {
       i.push(o.z ?? 0, s.z ?? 0);
-      const l = new b(
+      const l = new L(
         p.from(o).mutiplyScalar(n),
         p.from(s).mutiplyScalar(n)
       );
@@ -1321,20 +1321,20 @@ class X extends j {
       if (i = "cyan", h.length() < 1.2) {
         h.expansion(-r * 0.5);
         const l = a.normal();
-        let d = new b(
+        let d = new L(
           h.start.clone(),
           h.start.clone().add(l.clone().multiplyScalar(h.length()))
         );
         const f = d.clone().directionMove(d.normal(), h.length() * -0.5).expandToRectangle(h.length(), "bothSides");
-        for (let L = 0; L < c.length; L++)
-          if (c[L].intersectRectangle(f)) {
-            d = new b(
+        for (let b = 0; b < c.length; b++)
+          if (c[b].intersectRectangle(f)) {
+            d = new L(
               h.start.clone(),
               h.start.clone().add(l.clone().multiplyScalar(-h.length()))
             );
             break;
           }
-        d.expansion(-r * 0.5).expandToRectangle(this.width * 0.2, "bothSides").path2D((L, P) => o(L, P));
+        d.expansion(-r * 0.5).expandToRectangle(this.width * 0.2, "bothSides").path2D((b, P) => o(b, P));
         const m = h.length(), g = d.length(), u = (m ** 2 + g ** 2) / (2 * g), x = d.end.clone().add(d.direction().multiplyScalar(-u)), [w, S] = this.getArcAngleRange(x, h.end, d.end);
         s(x, u, Math.min(w, S), Math.max(w, S)), c.push(f);
       } else
@@ -1342,7 +1342,7 @@ class X extends j {
     }), i = "yellow", this.lineSegments.forEach((a) => {
       if (!a.userData.isWindow) return !1;
       Array.isArray(a.userData.drawWindow) && a.userData.drawWindow.forEach((h) => {
-        const { p: l, width: d } = h, f = p.from(l), m = f.clone().add(a.direction().multiplyScalar(d * 0.5)), g = f.clone().add(a.direction().multiplyScalar(-d * 0.5)), u = new b(m, g);
+        const { p: l, width: d } = h, f = p.from(l), m = f.clone().add(a.direction().multiplyScalar(d * 0.5)), g = f.clone().add(a.direction().multiplyScalar(-d * 0.5)), u = new L(m, g);
         o(u.start, u.end), u.expandToRectangle(this.width, "bothSides").path2D((x, w) => o(x, w));
       });
     }), n;
@@ -1380,11 +1380,7 @@ class X extends j {
       i.toBlob((a) => {
         c(a);
       }, e, 1);
-    }) : new Promise((c) => {
-      i.toBuffer((a, h) => {
-        console.error(a), c(h);
-      }, e);
-    });
+    }) : i.toBuffer(e, { quality: 1 });
   }
   /**
    * 将点json结构转换为Dxf string
@@ -1422,7 +1418,7 @@ class X extends j {
    * 下载
    * @param filename 
    */
-  async downloadImage(t, e = "Centimeters", n = "image/jpg") {
+  async downloadImage(t, e = "Centimeters", n = "image/jpeg") {
     const i = await this.toDxfImageBlob(e, n);
     if (!i) return !1;
     if (typeof window < "u") {
@@ -1464,7 +1460,7 @@ class X extends j {
     });
   }
 }
-const I = new b();
+const I = new L();
 class ot extends X {
   static name = "AngleCorrectionDxf";
   onAddFromParent(t) {
@@ -1475,7 +1471,7 @@ class ot extends X {
         const h = e.originalData[a];
         if (I.start.copy(h.start), I.end.copy(h.end), h.isVerticalReferenceLine) {
           const [l, d] = h.start.y < h.end.y ? [I.start, I.end] : [I.end, I.start];
-          i = -new b(l, d).direction().angleBetween(new p(0, 1), "angle", "360"), o = null;
+          i = -new L(l, d).direction().angleBetween(new p(0, 1), "angle", "360"), o = null;
           break;
         }
         (!o || I.length() > o.length()) && (o = I.clone(), o.userData.index = a);
@@ -1483,7 +1479,7 @@ class ot extends X {
       if (o) {
         e.originalData[o.userData.index].isVerticalReferenceLine = !0;
         const [a, h] = o.start.y < o.end.y ? [o.start, o.end] : [o.end, o.start];
-        i = -new b(a, h).direction().angleBetween(new p(0, 1), "angle", "360");
+        i = -new L(a, h).direction().angleBetween(new p(0, 1), "angle", "360");
       }
       const s = e.originalBox.center, r = p.zero(), c = e.originalData.map((a) => {
         const h = r.copy(a.start).division(s).rotate(p.zero(), i * (Math.PI / 180)).toJson(a.start.z), l = r.copy(a.end).division(s).rotate(p.zero(), i * (Math.PI / 180)).toJson(a.end.z), d = Object.assign(O(a), { start: h, end: l });
@@ -1874,11 +1870,11 @@ class rt {
     );
     const c = [];
     return r.forEach((a) => {
-      const h = new b(a?.start, a?.end), l = h.length();
+      const h = new L(a?.start, a?.end), l = h.length();
       if (l < n) return;
       const d = h.normal(), f = h.direction(), m = (l - s.width * 2) / 2;
       for (let g = 0; g < 3; g++) {
-        const u = h.start.clone().add(f.clone().multiplyScalar(s.width + m * g)), x = new b(
+        const u = h.start.clone().add(f.clone().multiplyScalar(s.width + m * g)), x = new L(
           u,
           u.clone().add(d.clone().multiplyScalar(1))
         );
@@ -1928,7 +1924,7 @@ class rt {
         });
       } else if (s.doorDirectConnection) {
         this.continueFind = !1;
-        const r = new b(p.from(s.start), p.from(s.end));
+        const r = new L(p.from(s.start), p.from(s.end));
         r.userData = {
           doorDirectConnection: !0,
           isDoor: !0
@@ -1959,15 +1955,15 @@ class rt {
   searchNearby(t, e = [], n = this.doorSearchDistance, i = this.doorSearchNearAngle) {
     const o = this.findPointVirtualGrid, s = this.quadtree;
     function r({ point: u, line: x }, w, S) {
-      const L = x.direction();
-      x.start === u && L.multiplyScalar(-1);
+      const b = x.direction();
+      x.start === u && b.multiplyScalar(-1);
       const P = o.queryCircle(u, n).filter((D) => D.userData !== x).sort((D, E) => D.point.distance(u) - E.point.distance(u)), A = [];
       for (let D = 0; D < P.length; D++) {
         const E = e.findIndex((T) => T.point === P[D].point), B = t[w].uuid, Y = e[E].uuid;
         if (S.has(`${B}.${Y}`)) continue;
         S.add(`${B}.${Y}`), S.add(`${Y}.${B}`);
-        const Q = P[D].point, C = new b(u.clone(), Q.clone());
-        if (C.direction().angleBetween(L, "angle") < i) {
+        const Q = P[D].point, C = new L(u.clone(), Q.clone());
+        if (C.direction().angleBetween(b, "angle") < i) {
           const T = t[E].line.direction();
           P[D].userData.start.equal(P[D].point) && T.multiplyScalar(-1), C.direction().multiplyScalar(-1).angleBetween(T, "angle") < i && (s.queryLineSegment(C).length || A.push({
             findData: P[D],
@@ -1979,10 +1975,10 @@ class rt {
       }
       return A;
     }
-    function c(u, x, w, S, L) {
+    function c(u, x, w, S, b) {
       S.add(u);
       const P = [];
-      L && P.push(L);
+      b && P.push(b);
       for (let A = 0; A < w.length; A++) {
         const D = w[A];
         if (x.has(D.findUuid)) {
@@ -1990,7 +1986,7 @@ class rt {
           c(D.findUuid, x, E, S, D) && P.push(D);
         } else P.push(D);
       }
-      return P.sort((A, D) => A.doorLine.length() - D.doorLine.length()), L && P[0] === L ? (w.splice(0), !0) : (w.splice(1), !1);
+      return P.sort((A, D) => A.doorLine.length() - D.doorLine.length()), b && P[0] === b ? (w.splice(0), !0) : (w.splice(1), !1);
     }
     const a = /* @__PURE__ */ new Set(), h = /* @__PURE__ */ new Map();
     t.map((u, x) => {
@@ -2020,21 +2016,21 @@ class rt {
     });
     const g = [];
     return f.forEach((u) => {
-      const x = t.findIndex((E) => E.uuid === u.doorUuid), w = e.findIndex((E) => E.uuid === u.findUuid), S = t[x].point.clone(), L = e[w].point.clone(), P = this.findLongLineSegment(t[x].line), A = this.findLongLineSegment(e[w].line), D = P.projectPoint(L);
+      const x = t.findIndex((E) => E.uuid === u.doorUuid), w = e.findIndex((E) => E.uuid === u.findUuid), S = t[x].point.clone(), b = e[w].point.clone(), P = this.findLongLineSegment(t[x].line), A = this.findLongLineSegment(e[w].line), D = P.projectPoint(b);
       if (D) {
         S.copy(D);
-        const E = new b(S, L), B = A.includedAngle(E);
+        const E = new L(S, b), B = A.includedAngle(E);
         (B < 10 || B > 170 || Math.abs(90 - B) < 10) && g.push({
           start: S,
-          end: L
+          end: b
         });
       } else {
         const E = A.projectPoint(S);
-        E && L.copy(E);
-        const B = new b(S, L), Y = P.includedAngle(B);
+        E && b.copy(E);
+        const B = new L(S, b), Y = P.includedAngle(B);
         (Y < 10 || Y > 170 || Math.abs(90 - Y) < 10) && g.push({
           start: S,
-          end: L
+          end: b
         });
       }
     }), e.splice(
@@ -2055,7 +2051,7 @@ class rt {
   searchAlongDirection({ point: t, line: e }, n = this.doorSearchDistance) {
     const i = this.quadtree, o = e.direction();
     e.start === t && o.multiplyScalar(-1);
-    const s = t.clone().add(o.clone().multiplyScalar(n)), r = new b(t.clone(), s), c = i.queryLineSegment(r).map((a) => ({
+    const s = t.clone().add(o.clone().multiplyScalar(n)), r = new L(t.clone(), s), c = i.queryLineSegment(r).map((a) => ({
       point: a.line.getIntersection(r),
       line: a.line
     })).filter((a) => a.point).sort((a, h) => t.distance(a.point) - t.distance(h.point));
@@ -2082,7 +2078,7 @@ class rt {
         break;
       }
     }
-    const h = new b(t.clone(), t.clone().add(r.multiplyScalar(n))), l = o.queryLineSegment(h).map((d) => ({
+    const h = new L(t.clone(), t.clone().add(r.multiplyScalar(n))), l = o.queryLineSegment(h).map((d) => ({
       point: d.line.getIntersection(h),
       line: d.line
     })).filter((d) => d.point).sort((d, f) => t.distance(d.point) - t.distance(f.point));
@@ -2162,7 +2158,7 @@ class at extends j {
    */
   addData(t, e) {
     const n = this.Dxf;
-    n.data.push([t.clone(), e.clone(), [], !1, n.data.length]), this.appendLineSegmentList.push(new b(t.clone(), e.clone()));
+    n.data.push([t.clone(), e.clone(), [], !1, n.data.length]), this.appendLineSegmentList.push(new L(t.clone(), e.clone()));
   }
   /** 结果分析创建矩形
    * @param result 
@@ -2176,7 +2172,7 @@ class at extends j {
     if (!(x.x > 0 && w.x < 0 || x.x < 0 && w.x > 0 || x.y > 0 && w.y < 0 || x.y < 0 && w.y > 0)) {
       d.set(g.x, g.y), f.set(u.x, u.y);
       for (let S = 1; S < r; S++) {
-        const L = h.clone().multiplyScalar(c * S), P = l.clone().multiplyScalar(a * S), A = d.clone().add(L), D = f.clone().add(P);
+        const b = h.clone().multiplyScalar(c * S), P = l.clone().multiplyScalar(a * S), A = d.clone().add(b), D = f.clone().add(P);
         this.addData(A, D);
       }
     }
@@ -2587,13 +2583,14 @@ async function Et(y, t, e = !1, n) {
   };
 }
 async function yt(y = V) {
-  const t = y.findComponentByName("WhiteModel"), e = new File([y.Dxf.toDxfBlob()], "dxf.dxf", { type: "application/dxf" }), n = new File([await t.toOBJBlob()], "model.obj", { type: "application/octet-stream" }), i = new File([await t.toGltfBlob(!0)], "model.glb", { type: "application/octet-stream" }), o = new File([await t.toGltfBlob(!1)], "model.gltf", { type: "application/json" }), s = new File([JSON.stringify(y.Dxf.originalData)], "json.json", { type: "application/json" });
+  const t = y.findComponentByName("WhiteModel"), e = new File([await y.AngleCorrectionDxf.toDxfImageBlob()], "img.jpg", { type: "image/jpeg" }), n = new File([y.Dxf.toDxfBlob()], "dxf.dxf", { type: "application/dxf" }), i = new File([await t.toOBJBlob()], "model.obj", { type: "application/octet-stream" }), o = new File([await t.toGltfBlob(!0)], "model.glb", { type: "application/octet-stream" }), s = new File([await t.toGltfBlob(!1)], "model.gltf", { type: "application/json" }), r = new File([JSON.stringify(y.Dxf.originalData)], "json.json", { type: "application/json" });
   return {
-    dxf: e,
-    obj: n,
-    glb: i,
-    gltf: o,
-    json: s
+    dxf: n,
+    obj: i,
+    glb: o,
+    gltf: s,
+    json: r,
+    image: e
   };
 }
 function At() {
@@ -2604,7 +2601,7 @@ export {
   j as C,
   ct as D,
   $ as E,
-  b as L,
+  L,
   ft as M,
   p as P,
   q as Q,