build-dxf 0.1.116 → 0.1.118

package/package.json

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

package/src/build.js

@@ -7,9 +7,10 @@ import Drawing from "dxf-writer";
 import { Brush, Evaluator, SUBTRACTION } from "three-bvh-csg";
 import { OBJExporter } from "three/examples/jsm/exporters/OBJExporter.js";
 const VITE_OSS_BASEURL = "https://image.cnyang.cn/common-assets/".endsWith("/") ? "https://image.cnyang.cn/common-assets/" : "https://image.cnyang.cn/common-assets//";
-const DEFAULT_WALL_WIDTH = 0.24;
+const DEFAULT_WALL_WIDTH = 0.12;
 const DEFAULT_WALL_HEIGHT = 2.8;
 const DEFAULT_DOOR_HEIGHT = 2.1;
+const DOUBLE_DOOR_WIDTH = 1.5;
 const DOOR_GROUND_CLEARANCE_HEIGHT = 0;
 const DEFAULT_WINDOW_HEIGHT = 0.8;
 const WINDOW_GROUND_CLEARANCE_HEIGHT = 0.7;
@@ -2712,7 +2713,7 @@ class WallHole {
   static getMinWidth(key, type) {
     if (key === "drawWindow") return 0.3;
     if (key === "passageEntrance") {
-      if (type === "door") return 0.3;
+      if (type === "door") return 0.4;
     }
     return 0.05;
   }
@@ -9643,7 +9644,15 @@ function buildBayWindowGroup(lines, clear = true) {
   removeSet.clear();
   bayWindowLines.forEach((bayWindowLine) => {
     let { circles } = MaxiCircles.instance.miniCircle(lines_, { circleEdges: [bayWindowLine] });
-    circles = circles.filter((group) => group.some((line) => line.userData.isWindow && line.userData.pair === bayWindowLine.userData.pair));
+    circles = circles.filter(
+      (group) => group.some((line) => {
+        if (!line.userData.isWindow) return false;
+        for (const data of WallHole.getIterator(line)) {
+          if (data.pair === bayWindowLine.userData.pair) return true;
+        }
+        return false;
+      })
+    );
     if (circles.length) {
       grid.queryPolygon(Polygon.fromByLines(circles[0]), "inside").forEach((res) => removeSet.add(res.userData));
     }
@@ -11432,8 +11441,12 @@ function axisAlignCorr(lines, option, verticalReferenceLine) {
     list.forEach((lines2) => {
       const list2 = lines2.filter((line) => line.userData.isBayWindow || line.userData.isWindow), pair = uuid();
       list2.forEach((line) => {
-        if (line.userData.isWindow) line.userData.isBayWindowWin = true;
-        line.userData.pair = pair;
+        if (line.userData.isWindow) {
+          line.userData.isBayWindowWin = true;
+          for (const data of WallHole.getIterator(line)) {
+            if (data.type === "window") data.pair = pair;
+          }
+        } else line.userData.pair = pair;
       });
     });
     const lineSegments = correction(lines, verticalReferenceLine, option);
@@ -22141,7 +22154,7 @@ class DxfDrawPlugin {
           const doorThickness = DEFAULT_WALL_WIDTH * 0.2;
           const list = [];
           setColor("yellow");
-          if (line.length < 1.2) {
+          if (line.length < DOUBLE_DOOR_WIDTH) {
             line.extendAlongDirection(-doorThickness * 0.5);
             const normal = lineSegment.normal();
             let door = new LineSegment(

package/src/constants.d.ts

@@ -1,9 +1,10 @@
 export declare const API_BASE_URL = "";
 export declare const VITE_OSS_BASEURL: any;
-export declare const DEFAULT_WALL_WIDTH = 0.24;
+export declare const DEFAULT_WALL_WIDTH = 0.12;
 export declare const DEFAULT_WALL_HEIGHT = 2.8;
 export declare const DOUBLE_WALL_FIND_WIDTH = 0.4;
 export declare const DEFAULT_DOOR_HEIGHT = 2.1;
+export declare const DOUBLE_DOOR_WIDTH = 1.5;
 export declare const DOOR_GROUND_CLEARANCE_HEIGHT = 0;
 export declare const DEFAULT_WINDOW_HEIGHT = 0.8;
 export declare const WINDOW_GROUND_CLEARANCE_HEIGHT = 0.7;

package/src/dxf-system/plugins/editor/Command/DrawHole.d.ts

@@ -13,6 +13,7 @@ export interface DrawHoleData {
 export declare class DrawHole extends Command<{
     pointerMove: {
         point: THREE.Vector3;
+        line?: LineSegment | null;
     };
 }> {
     static name: string;

package/src/dxf-system/type.d.ts

@@ -26,6 +26,7 @@ export interface HoleData {
     nearId?: number;
     doorId?: number;
     nearDoorId?: number;
+    pair?: string | number;
 }
 export type EntityType = "beams" | "door";
 export type Shape = "line" | "arc" | "polygon";

package/src/dxf-system/utils/WallHole.d.ts

@@ -73,7 +73,7 @@ export declare class WallHole {
      * @param line
      * @returns
      */
-    static getMinWidth(key: HoleKeyType, type?: 'door' | "window"): 0.3 | 0.05;
+    static getMinWidth(key: HoleKeyType, type?: 'door' | "window"): 0.4 | 0.3 | 0.05;
     /** 清理孔洞
      * @param target
      * @param key

package/src/index.css

@@ -1268,10 +1268,10 @@ button[data-v-7a78abcb]:active {
     color: #a7a7a7
 }
 
-[data-v-835cd80b] {
+[data-v-6beef164] {
     font-family: 宋体;
 }
-.button[data-v-835cd80b] {
+.button[data-v-6beef164] {
     padding: 5px 10px;
     border: none;
     background: var(--primary-color);

package/src/index3.js

@@ -13049,6 +13049,7 @@ class LineAlignmentGuide extends Lines {
   constructor() {
     super();
     this.continuous = false;
+    this.addEventListener("removed", () => this.clear());
   }
   set(line2, points = []) {
     this.clear();
@@ -13365,7 +13366,10 @@ class DrawHole extends Command {
     wall.position.z = 0.01;
     const {
       pageDestroy
-    } = createPage$2(this.domElement, this.editWidth.bind(this));
+    } = createPage$2(this.domElement, async () => {
+      await this.editWidth();
+      holeLine.setLength(this.defaultWidth);
+    });
     const lineSelector = new LineSelector(this.editor).setType("wall");
     lineSelector.onPointerMove = (line3, result) => {
       this.domElement.style.cursor = line3 ? "move" : "no-drop";
@@ -13392,7 +13396,8 @@ class DrawHole extends Command {
       wall.visible = true;
       this.dispatchEvent({
         type: "pointerMove",
-        point: result.point
+        point: result.point,
+        line: line3
       });
     };
     this.addCommandEndHandle().add(() => {
@@ -13408,6 +13413,7 @@ class DrawHole extends Command {
       if (lineSelector.paused) return;
       lineSelector.pause();
       await this.editWidth();
+      holeLine.setLength(this.defaultWidth);
       lineSelector.resume();
     });
     const line2 = await lineSelector.getLines();
@@ -15360,7 +15366,7 @@ class VerticalCorrContinue extends Command {
     return data;
   }
 }
-function buildDashedHelperLine$1(start, end, offset = 0.5) {
+function buildDashedHelperLine(start, end, offset = 0.5) {
   const offsetDistance = end.leftNormal(start).multiplyScalar(offset);
   const startOffPoint = start.clone().add(offsetDistance);
   const endOffPoint = end.clone().add(offsetDistance);
@@ -15407,7 +15413,7 @@ class RayDistance extends Command {
       points.sort((a, b) => point.distance(a) - point.distance(b)).forEach((p, i) => {
         const distance = point.distance(p) * 1e3;
         if (distance < 1e-3) return;
-        const points2 = buildDashedHelperLine$1(point, p, i * 0.3);
+        const points2 = buildDashedHelperLine(point, p, i * 0.3);
         const auxiliaryLine = new Lines();
         auxiliaryLine.position.z = 6e-3;
         auxiliaryLine.material = new THREE.LineDashedMaterial({
@@ -15439,17 +15445,6 @@ class RayDistance extends Command {
     next();
   }
 }
-function buildDashedHelperLine(start, end, offset = 0.5) {
-  const offsetDistance = end.leftNormal(start).multiplyScalar(offset);
-  const startOffPoint = start.clone().add(offsetDistance);
-  const endOffPoint = end.clone().add(offsetDistance);
-  return [
-    start,
-    startOffPoint,
-    endOffPoint,
-    end
-  ];
-}
 class ManualDistance extends Command {
   static name = "ManualDistance";
   container = new THREE.Group();
@@ -15487,28 +15482,12 @@ class ManualDistance extends Command {
    * @param points 
    */
   async ray(next, { point1, point2 }) {
+    const lineAlignmentGuide = new LineAlignmentGuide();
+    this.container.add(lineAlignmentGuide);
+    lineAlignmentGuide.set(new LineSegment(point1, point2));
     this.renderer.createLineSegments([new LineSegment(point1, point2)], 0, { color: 65280 }, this.container);
-    const distance = point1.distance(point2) * 1e3;
-    const points = buildDashedHelperLine(point1, point2, 0.3);
-    const auxiliaryLine = new Lines();
-    auxiliaryLine.position.z = 6e-3;
-    auxiliaryLine.material = new THREE.LineDashedMaterial({
-      color: 16777215,
-      dashSize: 0.02,
-      gapSize: 0.02
-    });
-    auxiliaryLine.setPoint(...points.map((p) => new THREE.Vector3(p.x, p.y, 0)));
-    this.container.add(auxiliaryLine);
-    setTimeout(() => auxiliaryLine.computeLineDistances());
-    const text = this.renderer.createText(Number(distance.toFixed(0)) + "mm", points[1].clone().add(points[2]).multiplyScalar(0.5), {
-      background: "#333333",
-      padding: "0px",
-      borderRadius: "0px",
-      color: "#fff"
-    }, this.container);
-    this.addEventRecord("clear", () => {
-      auxiliaryLine.removeFromParent();
-      text.removeFromParent();
+    this.addCommandEndHandle(() => {
+      lineAlignmentGuide.removeFromParent();
     });
     await this.awaitOnlyKeys(["enter"]);
     next();
@@ -17217,18 +17196,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         shortcut: ClippingLine.shortcutKeys.join(" + ")
       },
       {
-        command: RayDistance.commandName,
-        name: "射线测距",
+        command: ManualDistance.commandName,
+        name: "手动测距",
         show: true,
         src: images["../assets/images/激光测距.svg"].default,
-        shortcut: RayDistance.shortcutKeys.join(" + ")
+        shortcut: ManualDistance.shortcutKeys.join(" + ")
       },
       {
-        command: ManualDistance.commandName,
-        name: "手动测距",
+        command: RayDistance.commandName,
+        name: "射线测距",
         show: true,
         src: images["../assets/images/激光测距.svg"].default,
-        shortcut: ManualDistance.shortcutKeys.join(" + ")
+        shortcut: RayDistance.shortcutKeys.join(" + ")
       }
     ], otherCommandList = [
       {
@@ -17797,7 +17776,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-835cd80b"]]);
+const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-6beef164"]]);
 class StorageHelper {
   static get(key, defaultValue = void 0) {
     const value = localStorage.getItem(key);