build-dxf 0.0.21 → 0.0.22

package/package.json

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

package/src/build.js

@@ -679,7 +679,7 @@ class O {
 class L {
   points = [new p(), new p()];
   userData = {};
-  line;
+  // line: any
   get center() {
     return new p(
       this.points[0].x + (this.points[1].x - this.points[0].x) * 0.5,
@@ -1252,7 +1252,7 @@ class X extends q {
       s.AddPaths(r, e, t);
     }), s.Execute(i, this.width / 2 * n), this.wallsGroup = i.map((o) => {
       let r = o.map((a) => p.from(a).divisionScalar(n));
-      return r = this.lineSegmentStraightening(r), t == X.EndType.etOpenSquare && (r = this.squareRemoveBurr(r)), r = this.removeShortLine(r), r;
+      return r = this.lineSegmentStraightening(r), t == X.EndType.etOpenSquare && (r = this.squareRemoveBurr(r)), r;
     }), this.dispatchEvent({
       type: "lineOffset",
       wallsGroup: this.wallsGroup
@@ -1482,6 +1482,7 @@ function V(g) {
 const I = new L();
 class ot extends X {
   static name = "AngleCorrectionDxf";
+  angle = 0;
   onAddFromParent(t) {
     t.findComponentByName("LineAnalysis").addEventListener("analysisCompleted", async () => this.update());
   }
@@ -1521,8 +1522,34 @@ class ot extends X {
     }), await this.set(a, e.width, e.scale), this.lineOffset(), this.doorLineSegment = e.doorLineSegment.map((c) => {
       const h = c.clone();
       return h.start.division(o).rotate(p.zero(), i * (Math.PI / 180)), h.end.division(o).rotate(p.zero(), i * (Math.PI / 180)), h.start.y = -h.start.y, h.end.y = -h.end.y, h;
+    }), this.angle = i, this.dispatchEvent({
+      type: "updateData"
     });
   }
+  // async set(data: OriginalDataItem[], width?: number, scale?: number): Promise<any> {
+  //     await super.set(data, width, scale)
+  //     const quadtree = new Quadtree(this.box)
+  //     this.lineSegments.forEach(line => {
+  //         if(line.userData.isDoor) return
+  //         quadtree.insert({
+  //             line,
+  //             userData: undefined
+  //         })
+  //     })
+  //     this.lineSegments.forEach(line => {
+  //         if(line.userData.isDoor) return
+  //         const lines = quadtree.queryLineSegment(line)
+  //             .filter(l => l.line !== line)
+  //             .map(l => l.line)
+  //         const offset = new ClipperLib.ClipperOffset(20, 0.25)
+  //         offset.AddPaths(lines.map( line => line.points.map(p => p.clone().multiplyScalar(1000)) ), ClipperLib.JoinType.jtMiter, ClipperLib.EndType.etOpenSquare)
+  //         const result = new ClipperLib.Paths()
+  //         offset.Execute(result, this.width / 2 * 1000)
+  //         console.log( result )
+  //         // const cpr = new ClipperLib.Clipper()
+  //         // offset.AddPath(linePaths, joinType, endType)
+  //     })
+  // }
 }
 class _ extends q {
   static name = "Variable";

package/src/index2.js

@@ -3,7 +3,7 @@ import * as d from "three";
 import { Group as q } from "three";
 import "clipper-lib";
 import "dxf-writer";
-import { E as w, R as E, L as Q, D as S, a as A, b as G, S as O } from "./selectLocalFile.js";
+import { E as w, R as E, L as Q, D as O, a as S, b as G, S as A } from "./selectLocalFile.js";
 import { defineComponent as K, createElementBlock as R, openBlock as k, createElementVNode as y, toDisplayString as X, createVNode as x, unref as m, withCtx as D, createTextVNode as M, createApp as Y, ref as L, watch as C, onMounted as ee, onUnmounted as te, createCommentVNode as ie, createStaticVNode as ne } from "vue";
 function oe(p, e, i, t = "#fff", n = 2) {
   const o = document.createElement("canvas"), a = o.getContext("2d");
@@ -276,13 +276,13 @@ class F extends P {
       this.keyList.delete(t.value), this.dispatchEvent({ type: "codeChange", code: t.value, mode: "up" });
     }), i.addEventListener("focus", () => {
       this.keyList.clear(), this.mouseList.clear();
-    }), this.addEventListener("codeChange", this._computedkeyCombination.bind(this)), this.addKeyCombination("save", ["control", "s"]), this.addCancelDefaultBehavior((t) => t.isOnlyKeyDowns(["control", "s"]));
+    }), this.addEventListener("codeChange", this._computedkeyCombination.bind(this)), this.addKeyCombination("save", ["control", "s"]), this.addCancelDefaultBehavior((t) => t.isOnlyKeyDowns(["control", "s"]) || t.isOnlyKeyDown("alt"));
   }
   /** 添加取消浏览器默认行为规则
    * @param callBack 
    */
   addCancelDefaultBehavior(e) {
-    (this.parent?.findComponentByType(S)).addCancelDefaultBehavior(() => e(this));
+    (this.parent?.findComponentByType(O)).addCancelDefaultBehavior(() => e(this));
   }
   /**
    * 计算组合按键
@@ -363,8 +363,8 @@ class F extends P {
 const Ce = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   DetailsPointRender: I,
-  DomContainer: A,
-  DomEventRegister: S,
+  DomContainer: S,
+  DomEventRegister: O,
   EventInput: F,
   ModelDataRender: z,
   OriginalLineRender: j,
@@ -377,7 +377,7 @@ const Ce = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   },
   setup(p) {
     d.Object3D.DEFAULT_UP = new d.Vector3(0, 0, 1);
-    const e = p, i = L(), t = L(!0), n = L(!0), o = L(!0), a = L(!1), s = new W().usePlugin(Z).usePlugin(fe), c = s.findComponentByType(J), u = s.findComponentByType(A), b = s.findComponentByType(H);
+    const e = p, i = L(), t = L(!0), n = L(!0), o = L(!0), a = L(!1), s = new W().usePlugin(Z).usePlugin(fe), c = s.findComponentByType(J), u = s.findComponentByType(S), b = s.findComponentByType(H);
     C(() => e.lines, () => e.lines && h(e.lines)), C(() => e.detailsPoint, () => e.detailsPoint && c?.set(e.detailsPoint));
     function h(r) {
       if (r) {
@@ -390,11 +390,11 @@ const Ce = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
       }
     }
     async function f() {
-      const r = await O.json();
+      const r = await A.json();
       Array.isArray(r) && (localStorage.removeItem("orbitControls"), h(r));
     }
     async function B() {
-      const r = await O.json();
+      const r = await A.json();
       Array.isArray(r) && c?.set(r);
     }
     C(t, () => s.Variable.set("originalLineVisible", t.value)), C(n, () => s.Variable.set("dxfVisible", n.value)), C(o, () => s.Variable.set("whiteModelVisible", o.value)), s.Variable.addEventListener("isLook", (r) => a.value = r.value), s.Variable.addEventListener("originalLineVisible", (r) => t.value = r.value), s.Variable.addEventListener("dxfVisible", (r) => n.value = r.value), s.Variable.addEventListener("whiteModelVisible", (r) => o.value = r.value), localStorage.getItem("lines") ? h(JSON.parse(localStorage.getItem("lines") ?? "{}")) : h(e.lines), e.detailsPoint && c?.set(e.detailsPoint), ee(() => u && i.value?.appendChild(u.domElement)), te(() => s.destroy());
@@ -500,7 +500,7 @@ function T(p, e = {}) {
     detailsPoint: n = !0,
     orbitControls: o = !0,
     camera: a = new d.PerspectiveCamera(45, 1, 0.01, 1e3)
-  } = e, s = new A();
+  } = e, s = new S();
   p.addComponent(s), p.addComponent(new E({
     canvas: s.canvas,
     camera: a,
@@ -514,7 +514,7 @@ function T(p, e = {}) {
       enableDamping: !0,
       dampingFactor: 0.15
     } : void 0
-  })), i && p.addComponent(new j()), t && p.addComponent(new z()), n && p.addComponent(new I()), p.addComponent(new S()), p.addComponent(new F());
+  })), i && p.addComponent(new j()), t && p.addComponent(new z()), n && p.addComponent(new I()), p.addComponent(new O()), p.addComponent(new F());
 }
 const fe = Object.assign(T, {
   create(p = {}) {