build-dxf 0.1.34 → 0.1.36

package/package.json

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

package/src/DomEventRegister.js

@@ -7,21 +7,46 @@ import { CSS3DObject, CSS3DSprite, CSS3DRenderer } from "three/addons/renderers/
 import { CSS2DObject, CSS2DRenderer } from "three/addons/renderers/CSS2DRenderer.js";
 import { OrbitControls } from "three/addons/controls/OrbitControls.js";
 import * as TWEEN from "@tweenjs/tween.js";
-import { C as Component, a as Point, j as getDefaultExportFromCjs, A as ArrayMap, V as Variable } from "./build.js";
+import { C as Component, a as Point, k as getDefaultExportFromCjs, A as ArrayMap, V as Variable } from "./build.js";
 import { ref } from "vue";
+const css = `
+.overlay {
+  pointer-events: none;
+}
+
+.overlay > * {
+  pointer-events: auto;
+}
+`;
 class DomContainer extends Component {
   static name = "DomContainer";
+  container = document.createElement("div");
   domElement = document.createElement("div");
   canvas = document.createElement("canvas");
   html2DRenderer = document.createElement("div");
   html3DRenderer = document.createElement("div");
+  dialogLayer = document.createElement("div");
+  style = document.createElement("style");
   rect;
   constructor() {
     super();
+    this.dialogLayer.classList.add("dialog-layer");
     this.domElement.id = "build-dxf-container";
+    this.container.appendChild(this.domElement);
+    this.container.appendChild(this.style);
+    this.container.appendChild(this.dialogLayer);
     this.domElement.appendChild(this.canvas);
     this.domElement.appendChild(this.html3DRenderer);
     this.domElement.appendChild(this.html2DRenderer);
+    this.style.innerHTML = css;
+    this.dialogLayer.classList.add("overlay");
+    this.html3DRenderer.classList.add("overlay");
+    this.html2DRenderer.classList.add("overlay");
+    Object.assign(this.container.style, {
+      width: "100%",
+      height: "100%",
+      position: "relative"
+    });
     Object.assign(this.domElement.style, {
       width: "100%",
       height: "100%",
@@ -44,6 +69,14 @@ class DomContainer extends Component {
       width: "100%",
       height: "100%"
     });
+    Object.assign(this.dialogLayer.style, {
+      left: "0px",
+      top: "0px",
+      width: "100%",
+      height: "100%",
+      position: "absolute",
+      zIndex: "20"
+    });
     this.rect = this.domElement.getBoundingClientRect();
     new ResizeObserver(() => {
       this.rect = this.domElement.getBoundingClientRect();
@@ -84,17 +117,20 @@ const _Renderer = class _Renderer extends Component {
       canvas: this.description.canvas,
       antialias: true
     });
+    this.renderer.domElement.classList.add("overlay");
     this.renderer.setPixelRatio(window.devicePixelRatio);
     if (description.htmlRenderer) {
       if (description.htmlRenderer["2d"]) {
         this.html2DRenderer = new CSS2DRenderer();
-        Object.assign(this.html2DRenderer.domElement.style, { position: "absolute", left: "0px", top: "0px" });
+        Object.assign(this.html2DRenderer.domElement.style, { position: "absolute", left: "0px", top: "0px", pointerEvents: "none" });
         description.htmlRenderer["2d"].appendChild(this.html2DRenderer.domElement);
+        this.html2DRenderer.domElement.classList.add("overlay");
       }
       if (description.htmlRenderer["3d"]) {
         this.html3DRenderer = new CSS3DRenderer();
-        Object.assign(this.html3DRenderer.domElement.style, { position: "absolute", left: "0px", top: "0px" });
+        Object.assign(this.html3DRenderer.domElement.style, { position: "absolute", left: "0px", top: "0px", pointerEvents: "none" });
         description.htmlRenderer["3d"].appendChild(this.html3DRenderer.domElement);
+        this.html3DRenderer.domElement.classList.add("overlay");
       }
     }
     if (description.orbitControls) {
@@ -1170,6 +1206,21 @@ class DomEventRegister extends Component {
       offsetY
     };
   }
+  /** 更新鼠标
+   * @param e 
+   */
+  updatePointer(e) {
+    const domContainer = this.parent?.findComponentByType(DomContainer);
+    const { offsetX, offsetY } = this.computedPosition(e instanceof TouchEvent ? e.touches[0] : e, domContainer.rect);
+    this.pointer.set(offsetX, offsetY);
+    this.dispatchEvent({
+      type: "pointerdown",
+      x: offsetX,
+      y: offsetY,
+      pointerId: 0,
+      pointerCount: 0
+    });
+  }
   /**
    * 初始化基础事件代理
    */
@@ -1222,7 +1273,6 @@ class DomEventRegister extends Component {
       this.pointer.set(offsetX, offsetY);
       map.append(e.pointerId, new Vector2(offsetX, offsetY));
       const movement = getMovement(e.pointerId);
-      console.log(offsetX, offsetY);
       this.dispatchEvent({
         type: "pointermove",
         x: offsetX,
@@ -1356,7 +1406,7 @@ class DomEventRegister extends Component {
    * 根据domElement的cursor自动设置body的cursor
    */
   autoBodyCursor() {
-    const domContainer = this.parent?.findComponentByType(DomContainer), domElement = domContainer.domElement;
+    const domContainer = this.parent?.findComponentByType(DomContainer), domElement = domContainer.dialogLayer;
     let bodyCursor = null;
     this.addEventListener("update", () => {
       if (this._mouseMoveEventProxylock) return;
@@ -1365,6 +1415,8 @@ class DomEventRegister extends Component {
           bodyCursor = document.body.style.cursor;
         }
         document.body.style.cursor = domElement.style.cursor;
+        domContainer.container.style.cursor = domElement.style.cursor;
+        domContainer.domElement.style.cursor = domElement.style.cursor;
       } else {
         if (bodyCursor !== null) {
           document.body.style.cursor = bodyCursor;

package/src/build.js

@@ -1,5 +1,5 @@
 import * as THREE from "three";
-import { EventDispatcher as EventDispatcher$1, Group as Group$1, Vector3, Matrix3, MathUtils, Box3, Matrix4, Ray } from "three";
+import { EventDispatcher as EventDispatcher$1, Vector3, Group as Group$1, Matrix3, MathUtils, Box3, Matrix4, Ray } from "three";
 import ClipperLib from "clipper-lib";
 import Drawing from "dxf-writer";
 import { Brush, Evaluator, SUBTRACTION } from "three-bvh-csg";
@@ -2159,6 +2159,24 @@ class LineSegment {
       return true;
     });
   }
+  static constrainLine(line, base) {
+    const center = line.center, width = line.length();
+    if (base.length() < width) {
+      line.start.copy(base.start);
+      line.end.copy(base.end);
+      return line;
+    }
+    const hw = width * 0.5, start = base.start.clone().add(base.end.direction(base.start).multiplyScalar(width * 0.5)), end = base.end.clone().add(base.start.direction(base.end).multiplyScalar(width * 0.5)), dir = base.direction();
+    const pl = new LineSegment(start, end);
+    center.copy(pl.projectPoint(center, false));
+    if (!pl.projectPoint(center, true)) {
+      if (center.distance(start) < center.distance(end)) center.copy(start);
+      else center.copy(end);
+      line.start.copy(center).add(dir.clone().multiplyScalar(-hw));
+      line.end.copy(center).add(dir.clone().multiplyScalar(hw));
+    }
+    return line;
+  }
   static createModifyManager() {
     const modifyMap = new MapEnhance();
     function setPoint(line, point2, value) {
@@ -2243,12 +2261,6 @@ class Point {
     this.y = arr[1];
     return this;
   }
-  /**
-   * 
-   */
-  toArray() {
-    return [this.x, this.y];
-  }
   /**
    * multiplyScalar
    * @param scalar 
@@ -2484,6 +2496,12 @@ class Point {
     this.y = p2.y ?? 0;
     return this;
   }
+  /**
+   * 
+   */
+  toArray() {
+    return [this.x, this.y];
+  }
   toJson(z = 0) {
     return {
       x: this.x,
@@ -2491,6 +2509,9 @@ class Point {
       z
     };
   }
+  toVector3(z = 0) {
+    return new Vector3(this.x, this.y, z);
+  }
   static adsorb(points, tolerance = 15e-5) {
     const grid = new PointVirtualGrid();
     points.forEach((p2) => grid.insert(p2));
@@ -3542,10 +3563,18 @@ function createQuadtree(lines) {
   }
   return quadtree;
 }
+function mToMm(value) {
+  return Number((value * 1e3).toFixed(0));
+}
+function mmTom(value) {
+  return Number((value / 1e3).toFixed(4));
+}
 const tools = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   createPointVirtualGrid,
-  createQuadtree
+  createQuadtree,
+  mToMm,
+  mmTom
 }, Symbol.toStringTag, { value: "Module" }));
 function findDiscretePointLine(lines, grid0, lineSet, deep = true) {
   lineSet = lineSet ?? /* @__PURE__ */ new Set();
@@ -5209,8 +5238,7 @@ function correction$1(targettLine, lines, intersectMap, errAngle = 15) {
     const center = line.center;
     line.start.rotate(center, diff);
     line.end.rotate(center, diff);
-    if (line.userData.isDoor) doorLines.push(line);
-    else parallelLines.push(line);
+    parallelLines.push(line);
     return line;
   }
   function vertical(line) {
@@ -14928,7 +14956,7 @@ const PRE_PROCESSOR = {
     return doorFind.getLines();
   },
   AxisAlignCorr(lines, option, verticalReferenceLine) {
-    verticalReferenceLine = verticalReferenceLine ?? findVerticalReference(lines);
+    verticalReferenceLine = verticalReferenceLine ?? findVerticalReference(lines.filter((line) => !line.userData.isDoor));
     if (verticalReferenceLine) {
       const t2 = performance.now();
       const lineSegments = AxisAlignCorr.correction(lines, verticalReferenceLine, option);
@@ -15669,6 +15697,7 @@ class Lines extends THREE.LineSegments {
   geometry = new THREE.BufferGeometry();
   points = [];
   pointsObject3D;
+  continuous = true;
   constructor(points = [], color = 16777215) {
     super();
     this.geometry = this.geometry;
@@ -15718,13 +15747,20 @@ class Lines extends THREE.LineSegments {
   updateGeometry() {
     if (this._timer) clearTimeout(this._timer);
     this._timer = setTimeout(() => {
-      const array = this.points.flatMap((p2, i) => {
-        if (i === 0) return [];
-        else {
+      const array = [];
+      if (this.continuous) {
+        this.points.forEach((p2, i) => {
+          if (i === 0) return;
           const p0 = this.points[i - 1];
-          return [p0.x, p0.y, p0.z, p2.x, p2.y, p2.z];
+          array.push(p0.x, p0.y, p0.z, p2.x, p2.y, p2.z);
+        });
+      } else {
+        for (let i = 0; i < this.points.length; i += 2) {
+          const p0 = this.points[i];
+          const p2 = this.points[i + 1];
+          if (p0 && p2) array.push(p0.x, p0.y, p0.z, p2.x, p2.y, p2.z);
         }
-      });
+      }
       const position = new THREE.BufferAttribute(new Float32Array(array), 3);
       this.geometry.setAttribute("position", position);
       this._timer = null;
@@ -15801,7 +15837,7 @@ class CommandFlow extends EventDispatcher {
   rollbacklist = [];
   revokeRollbacklist = [];
   // 是否写入操作记录
-  writeOperationList = true;
+  writeOperationRecord = true;
   loop = false;
   currentIndex = 0;
   setLoop(loop) {
@@ -15813,9 +15849,9 @@ class CommandFlow extends EventDispatcher {
    * @param operation 
    * @returns 
    */
-  add(operation, data = {}) {
+  add(operation, data) {
     this.list.push(operation);
-    this.dataList.push(data);
+    this.dataList.push(data ?? {});
     return this;
   }
   /** 添加回滚回调列表
@@ -15859,13 +15895,26 @@ class CommandManager extends EventDispatcher {
   constructor() {
     super();
   }
+  /** 写入记录
+   * @param name 
+   * @param data 
+   */
+  addOperation(name, data) {
+    const commandFlow = this.getCommandFlow(name);
+    if (!commandFlow) throw new Error(`${name} 命令不存在`);
+    if (commandFlow.writeOperationRecord) {
+      this.operationList.push({ name, data });
+      this.rollbackList.length = 0;
+    }
+  }
   /** 添加命令流
    * @param name 
+   * @param custom 自定义命令流类
    * @returns 
    */
-  addCommandFlow(name) {
+  addCommandFlow(name, custom) {
     if (this.commandFlowMap.has(name)) throw new Error(`${name} 命令已经存在`);
-    const commandFlow = new CommandFlow();
+    const commandFlow = custom ? custom() : new CommandFlow();
     this.commandFlowMap.set(name, commandFlow);
     return commandFlow;
   }
@@ -15932,7 +15981,7 @@ class CommandManager extends EventDispatcher {
       if (this.abortController && !this.abortController.signal.aborted) {
         commandFlow.dispatchEvent({ type: "completed", data });
         this.dispatchEvent({ type: "completed", name, data });
-        if (commandFlow.writeOperationList) {
+        if (commandFlow.writeOperationRecord) {
           this.operationList.push({ name, data });
           this.rollbackList.length = 0;
         }
@@ -19069,7 +19118,7 @@ async function createEditor(dom, camera, orbitControls = false, viewPermission)
     camera
   })).usePlugin(editor.EditorPlugin.create({ viewPermission }));
   const domContainer = dxfSystem.findComponentByType(rp.components.DomContainer);
-  domContainer && dom.appendChild(domContainer.domElement);
+  domContainer && dom.appendChild(domContainer.container);
   gloabalDxfSystem = dxfSystem;
   return {
     dxfSystem,
@@ -19203,18 +19252,20 @@ export {
   Lines as e,
   recomputedWindow as f,
   drawText$1 as g,
-  PRE_PROCESSOR as h,
-  CommandManager as i,
-  getDefaultExportFromCjs as j,
-  createEditor as k,
-  getModels as l,
-  buildJson as m,
-  getFileAll as n,
-  getGlobalDxfSystem as o,
-  index$1 as p,
-  index as q,
+  mmTom as h,
+  PRE_PROCESSOR as i,
+  CommandManager as j,
+  getDefaultExportFromCjs as k,
+  createEditor as l,
+  mToMm as m,
+  getModels as n,
+  buildJson as o,
+  getFileAll as p,
+  getGlobalDxfSystem as q,
   recomputedWindowCenter as r,
-  DxfSystem as s,
-  components as t,
-  uuid as u
+  index$1 as s,
+  index as t,
+  uuid as u,
+  DxfSystem as v,
+  components as w
 };

package/src/components/NumberEditor.vue.d.ts

@@ -2,6 +2,7 @@ type __VLS_Props = {
     showCancel?: boolean;
     showMax?: boolean;
     showMin?: boolean;
+    showConfirm?: boolean;
 };
 declare const __VLS_defaults: {
     modelValue: string;
@@ -25,5 +26,6 @@ declare const _default: import('vue').DefineComponent<__VLS_PublicProps, {}, {},
     showCancel: boolean;
     showMax: boolean;
     showMin: boolean;
+    showConfirm: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
 export default _default;