build-dxf 0.1.10 → 0.1.12

package/package.json

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

package/src/build.js

@@ -2992,7 +2992,8 @@ class LineGroupType {
    */
   static getGroupsByType(lines, type) {
     return lines.reduce((map, line) => {
-      map.append(LineGroupType.getIdByType(line, type), line);
+      const id = LineGroupType.getIdByType(line, type);
+      if (id) map.append(id, line);
       return map;
     }, new ArrayMap()).valueArray;
   }
@@ -3143,23 +3144,43 @@ class LineGroupType {
    * @returns 
    */
   static removeByType(line, type) {
-    if (typeof line.userData.groupType !== "undefined") {
-      if (line.userData.groupType === type) {
-        delete line.userData.groupId;
-        delete line.userData.groupType;
-        return true;
-      }
-    }
-    if (line.userData?.groups) {
-      for (let i = 0; i < line.userData.groups.length; i++) {
-        const element = line.userData.groups[i];
+    let is2 = false;
+    if (line.userData?.groupType === type) {
+      delete line.userData.groupId;
+      delete line.userData.groupType;
+      is2 = true;
+    }
+    const groups = line.userData?.groups;
+    if (groups) {
+      for (let i = 0; i < groups.length; i++) {
+        const element = groups[i];
         if (element.type === type) {
-          line.userData.groups.splice(i, 1);
-          return true;
+          groups.splice(i, 1);
+          is2 = true;
         }
       }
     }
-    return false;
+    return is2;
+  }
+  /**
+   * 通过类型移除
+   * @param line 
+   * @param id 
+   * @returns 
+   */
+  static removeByTypes(line, types) {
+    if (!line.userData) return;
+    const typeSet = new Set(types);
+    if (line.userData.groupType && typeSet.has(line.userData.groupType)) {
+      delete line.userData.groupType;
+      delete line.userData.groupId;
+    }
+    const groups = line.userData.groups;
+    if (Array.isArray(groups) && groups.length > 0) {
+      line.userData.groups = groups.filter(
+        (element) => !element?.type || !typeSet.has(element.type)
+      );
+    }
   }
   /**
    * 清空线段的所有分组信息
@@ -3562,8 +3583,11 @@ function doubleWinDrawLine(lines) {
     const point = Point.from(p), direct = newLine.direction();
     if (full) width = newLine.length();
     const winLine2 = point.expandAsLine(direct, width).directionMove(direct, -width * 0.5);
-    winLine2.start.copy(newLine.projectPoint(winLine2.start, true));
-    winLine2.end.copy(newLine.projectPoint(winLine2.end, true));
+    try {
+      winLine2.start.copy(newLine.projectPoint(winLine2.start, false));
+      winLine2.end.copy(newLine.projectPoint(winLine2.end, false));
+    } catch (error) {
+    }
     winLine2.userData = { wallWidth, height, groundClearance };
     return winLine2;
   }) ?? []).filter((line) => line.length() > defaultWallWidth$1);
@@ -3857,9 +3881,10 @@ class CAD {
   /**
    * 转为绘制数据
    */
-  _cachedDrawData = null;
-  toDrawData(unit = "Millimeters") {
-    if (!this.needUpdate && this._cachedDrawData) return this._cachedDrawData;
+  _cachedDrawDataMap = /* @__PURE__ */ new Map();
+  toDrawData(unit = "Centimeters") {
+    if (!this.needUpdate && this._cachedDrawDataMap.has(unit)) return this._cachedDrawDataMap.get(unit);
+    this._cachedDrawDataMap.clear();
     this.needUpdate = false;
     const lines = this.groups.flatMap((group2) => group2.lines), s = units[unit], expansionWidth = 2, box = Box2.fromByLineSegment(...lines).expansion(expansionWidth), center = box.center, data = {
       unit,
@@ -3926,7 +3951,7 @@ class CAD {
       drawDottedLine(p2C, p2, 0.04, 0.05, "line2");
       drawLine2(p1C, p2C);
       color = "white";
-      drawText2((length / 10).toFixed(2) + "cm", line.center);
+      drawText2((length * 10).toFixed(2) + "cm", line.center);
     }
     function drawArc(pos, radius, startAngle, endAngle) {
       data.arcs.push([
@@ -3946,7 +3971,7 @@ class CAD {
       } };
       set2.forEach((fun) => fun.handler(option));
     });
-    this._cachedDrawData = data;
+    this._cachedDrawDataMap.set(unit, data);
     return data;
   }
   /** 转为图片
@@ -3954,16 +3979,16 @@ class CAD {
    */
   async toDxfImageBlob(unit = "Centimeters", type = "image/jpeg", background = "#000") {
     const data = this.toDrawData(unit);
+    const margin = 0 * data.scale;
     let canvas;
     if (typeof window !== "undefined") {
       canvas = document.createElement("canvas");
     } else if (typeof global !== "undefined") {
       const { createCanvas } = await include("canvas");
-      canvas = createCanvas();
+      canvas = createCanvas(data.width + margin * 2, data.height + margin * 2);
     } else {
       throw new Error("创建画布失败");
     }
-    const margin = 0 * data.scale;
     const colors = {
       cyan: "cyan",
       yellow: "yellow",
@@ -4058,7 +4083,7 @@ class CAD {
     d.addLayer("layer", Drawing.ACI.LAYER, "DOTTED");
     d.addLayer("magenta", Drawing.ACI.MAGENTA, "DOTTED");
     d.addLayer("red", Drawing.ACI.RED, "DOTTED");
-    const data = this.toDrawData();
+    const data = this.toDrawData(unit);
     data.lines.forEach((item) => {
       let [p1x, p1y, p2x, p2y, color] = item;
       d.setActiveLayer(color);
@@ -4646,10 +4671,7 @@ function buildDoubleWallGroup(lines, doorLines = [], grouped = true, clearIntern
   let { newLines, rings } = findLargestCircle(lines), ringsSet = new Set(rings.flat());
   if (grouped) {
     const grid = new PointVirtualGrid(), internalEdges = /* @__PURE__ */ new Set();
-    lines.forEach((line) => {
-      LineGroupType.removeByType(line, "doubleWall");
-      LineGroupType.removeByType(line, "wall");
-    });
+    newLines.forEach((line) => LineGroupType.removeByTypes(line, ["doubleWall", "wall"]));
     newLines.forEach((line) => !ringsSet.has(line) && grid.insert(line.center, line));
     doorLines.forEach((line) => grid.insert(line.center, line));
     const id = uuid();
@@ -6308,7 +6330,7 @@ class CorrectionDxf extends Dxf {
     lines = lines.filter((line) => !line.userData.isDoor);
     lines = buildDoubleWallGroup(lines, doors);
     lines.push(...doors);
-    this.cad = new CAD().usePlugin(new DxfDataPlugin(this.getLineSegments(true))).usePlugin(new DxfDrawPlugin());
+    this.cad = new CAD().usePlugin(new DxfDataPlugin(lines)).usePlugin(new DxfDrawPlugin());
     const { angle, referenceLine } = CAD.obliquity(this.cad);
     this.cad.rotateAndResetOrigin(angle);
     this.cad.addGroup([referenceLine], "ruler");
@@ -15016,25 +15038,6 @@ class SceneAutoGenerat {
 }
 const exporter = new OBJExporter();
 let glbExporter;
-function lineSqueezing(p1, p2, width = 0.1) {
-  const normal = p2.normal(p1);
-  const pDirect = p2.direction(p1).mutiplyScalar(width * 0.5);
-  const nDirect = p1.direction(p2).mutiplyScalar(width * 0.5);
-  const offsetX = normal.x * width * 0.5;
-  const offsetY = normal.y * width * 0.5;
-  return {
-    points: [
-      // 第一条线
-      new Point(p1.x + offsetX, p1.y + offsetY).add(nDirect),
-      new Point(p2.x + offsetX, p2.y + offsetY).add(pDirect),
-      // 第二条线
-      new Point(p1.x - offsetX, p1.y - offsetY).add(nDirect),
-      new Point(p2.x - offsetX, p2.y - offsetY).add(pDirect)
-    ],
-    indices: [0, 1, 1, 3, 3, 2, 2, 0],
-    rectIndices: [0, 1, 3, 2, 0]
-  };
-}
 class WhiteModel extends Component {
   static name = "WhiteModel";
   Dxf = null;
@@ -15075,28 +15078,6 @@ class WhiteModel extends Component {
     if (group2) {
       this.whiteModelLineGroup.add(group2.clone(true));
     }
-    const walls = dxf.originalData.map(({ start, end, insetionArr }) => {
-      const startVec3 = new Point(start.x, start.y), endVec3 = new Point(end.x, end.y), { points, indices, rectIndices } = lineSqueezing(startVec3, endVec3, dxf.width);
-      return {
-        points,
-        indices,
-        rectIndices,
-        insetions: (insetionArr ?? []).map((insetion) => insetion.index)
-      };
-    });
-    walls.forEach((wall) => {
-      const shape = new THREE.Shape();
-      wall.rectIndices.forEach((index2, i) => {
-        const p = wall.points[index2];
-        if (i === 0) shape.moveTo(p.x, p.y);
-        else shape.lineTo(p.x, p.y);
-      });
-      const geometry = new THREE.ExtrudeGeometry(shape, {
-        depth: 2.8,
-        bevelSize: 0
-      });
-      if (geometry.attributes.position.array.filter((num) => Number.isNaN(num)).length) return;
-    });
     this.dispatchEvent({
       type: "updateModel",
       whiteModelGroup: this.whiteModelGroup

package/src/index.css

@@ -574,6 +574,10 @@
   filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
 }
 
+.filter {
+  filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+}
+
 .transition {
   transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, visibility, content-visibility, overlay, pointer-events;
   transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -806,7 +810,7 @@
   inherits: false
 }
 
-[data-v-8028c98c] {
+[data-v-18ae0c97] {
     font-family: 宋体;
 }
 

package/src/index3.js

@@ -7688,7 +7688,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         localStorage.setItem("lines", JSON.stringify(lines));
         try {
           dxfSystem.Dxf.set(lines);
-          dxfSystem.Dxf.lineOffset();
         } catch (error) {
           console.log(error);
         }
@@ -7908,7 +7907,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     drawLine.addEventListener("start", () => drawLineCount.value = 0);
     drawLine.addEventListener("appendLine", (e) => drawLineCount.value = e.points.length);
     drawLine.addEventListener("revoke", (e) => drawLineCount.value = e.points.length);
-    dxfSystem.Dxf.addEventListener("setDta", () => {
+    dxfSystem.Dxf.addEventListener("dataChange", () => {
       z.value = dxfSystem.Dxf.originalZAverage;
     });
     const startedEventCancel = editor.commandManager.addEventListener("started", (e) => {
@@ -7989,7 +7988,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onMousedown: dragMoveHelper,
             class: normalizeClass([{ "border-b-[#eee] border-b-1": toolBarExpand.value }, "flex flex-row justify-between header text-[14px] font-bold p-[10px 0px]"])
           }, [
-            _cache[13] || (_cache[13] = createStaticVNode('<div class="flex flex-row" data-v-8028c98c><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-8028c98c><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-8028c98c><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-8028c98c></path></svg></div><h5 class="flex text-nowrap text-[12px] items-center pointer-events-none" data-v-8028c98c>绘制工具</h5></div>', 1)),
+            _cache[13] || (_cache[13] = createStaticVNode('<div class="flex flex-row" data-v-18ae0c97><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-18ae0c97><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-18ae0c97><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-18ae0c97></path></svg></div><h5 class="flex text-nowrap text-[12px] items-center pointer-events-none" data-v-18ae0c97>绘制工具</h5></div>', 1)),
             createElementVNode("div", {
               onMousedown: _cache[0] || (_cache[0] = (e) => e.stopPropagation()),
               onClick: _cache[1] || (_cache[1] = ($event) => toolBarExpand.value = !toolBarExpand.value),
@@ -8229,7 +8228,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8028c98c"]]);
+const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-18ae0c97"]]);
 class Editor extends Component {
   static name = "Editor";
   container = new THREE.Group();

package/src/utils/DxfSystem/utils/CAD.d.ts

@@ -94,7 +94,7 @@ export declare class CAD {
     /**
      * 转为绘制数据
      */
-    private _cachedDrawData;
+    private _cachedDrawDataMap;
     toDrawData(unit?: Unit): DrawData;
     /** 转为图片
      * @param type

package/src/utils/DxfSystem/utils/LineGroupType.d.ts

@@ -95,6 +95,13 @@ export declare class LineGroupType {
      * @returns
      */
     static removeByType(line: LineSegment<LineUserData>, type: string): boolean;
+    /**
+     * 通过类型移除
+     * @param line
+     * @param id
+     * @returns
+     */
+    static removeByTypes(line: LineSegment<LineUserData>, types: string[]): void;
     /**
      * 清空线段的所有分组信息
      * @param line

package/src/utils/DxfSystem/components/DxfOld.d.ts

@@ -1,183 +0,0 @@
-import { Component } from '../../ComponentManager';
-import { Point } from '../../Point';
-import { Box2 } from '../../Box2';
-import { LineSegment } from '../../LineSegment';
-import { Quadtree } from '../../Quadtree';
-import { SetDataOption, DataItem, DrawData, LineUserData, OriginalDataItem, Unit } from '../type';
-/**
- * 将点云结构转换为DXF格式
- */
-export declare class Dxf<TEventMap extends {} = {}> extends Component<{
-    setDta: {
-        originalData: OriginalDataItem[];
-        data: DataItem[];
-    };
-    lineOffset: {
-        wallsGroup: Point[][];
-    };
-    createGroup: {
-        groups: Point[][][];
-    };
-    preprocessing: {
-        data: OriginalDataItem[];
-        setData(data: OriginalDataItem[]): void;
-    };
-} & TEventMap> {
-    static name: string;
-    shortLine: number;
-    width: number;
-    scale: number;
-    originalData: OriginalDataItem[];
-    data: DataItem[];
-    originalBox: Box2;
-    box: Box2;
-    pointsGroups: Point[][][];
-    wallsGroup: Point[][];
-    doors: DataItem[];
-    doorLineSegment: LineSegment[];
-    verticalReferenceLine?: LineSegment<LineUserData>;
-    lineSegments: LineSegment<LineUserData>[];
-    originalZAverage: number;
-    static EndType: {
-        etOpenSquare: number;
-        etOpenRound: number;
-        etOpenButt: number;
-    };
-    static JoinType: {
-        jtSquare: number;
-        jtRound: number;
-        jtMiter: number;
-    };
-    /** 原始数据组
-     */
-    get lines(): LineSegment<LineUserData>[];
-    /**初始化
-     * @param width 墙体宽度
-     * @param scale 缩放比例
-     */
-    constructor(width?: number, scale?: number);
-    /** 预处理数据
-     * @param data
-     */
-    preprocessing(data: OriginalDataItem[]): {
-        lineSegments: LineSegment<LineUserData>[];
-        data: OriginalDataItem[];
-    };
-    /** 设置
-     * @param data 房屋结构数据，node环境可以为路径
-     * @param width 墙体宽度
-     * @param scale 缩放比例
-     * @param axisAlignmentCorrection 需要执行轴对称垂直纠正
-     * @param option
-     * @returns
-     */
-    set(data: OriginalDataItem[] | string, width?: number, scale?: number): Promise<any>;
-    /** 创建分组
-     * @description 根据相交数组insetionArr, 把相交的线段，划分到一组内，方便后续路径查找合并使用
-     * @returns
-     */
-    private createGroups;
-    /** 计算当前墙体数据的边界框
-     * @description 根据分组数据pointsGroups，计算包围盒， pointsGroups数据为缩放后数据。
-     * @description 可通过box属性查看计算结果。
-     * @returns
-     */
-    computedSize(): Box2;
-    /** 线路拓扑
-     * @description 处理线路拓扑，使线路有序链接，形成长路径
-     * @param lines
-     */
-    lineTopology(lines: Point[][]): Point<Record<string, any>>[][];
-    /** 合并方向相同的线段
-     * @param lines
-     * @param errAngle
-     */
-    private mergeSameDirectionLine;
-    /** etOpenRound 去除毛刺
-     * @description 检查连续的短线段数量，去除合并后产生的毛刺
-     */
-    private squareRemoveBurr;
-    /**
-     * 线段矫直, 线段中心突刺
-     * @description 突变长度小于墙体宽度，该线段可能为突起线段，
-     * @description 判断后续第2线段与上一条线段是否方向相同，相同就为突刺
-     */
-    lineSegmentStraightening(path: Point[]): Point<Record<string, any>>[];
-    /**
-     * 移除短线段
-     * @todo 根据线段两端线段长度，选取参照物_|▔▔
-     * @param path
-     */
-    removeShortLine(path: Point[], shortLine?: number): Point<Record<string, any>>[];
-    /** 线偏移
-     * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
-     */
-    lineOffset(endType?: number, joinType?: number, scale?: number): Point<Record<string, any>>[][];
-    /** 垂直纠正
-     * @param option
-     */
-    axisAlignCorr(option?: SetDataOption): Promise<void>;
-    /** 完整线段数据
-     * @returns
-     */
-    getLineSegments(clone?: boolean): LineSegment<LineUserData>[];
-    /**
-     * 将点云结构转换为Float32Array
-     */
-    to3DArray(scale: number, z?: number): Float32Array<ArrayBuffer>;
-    /** 获取角度范围
-     * @param center
-     * @param p1
-     * @param p2
-     * @returns
-     */
-    private getArcAngleRange;
-    /**
-     * 线段数据转为原始json数据
-     */
-    lineDataToOriginalData(lines: LineSegment<LineUserData>[], quadtree?: Quadtree): OriginalDataItem[];
-    /**
-     * 转为绘制数据
-     */
-    toDrawDataJson(unit?: Unit): DrawData;
-    /**
-     * @param type
-     */
-    toDxfImageBlob(unit?: Unit, type?: string, background?: string): Promise<any>;
-    /**
-     * 将点json结构转换为Dxf string
-     */
-    toDxfString(unit?: Unit): string;
-    /**
-     * 将点云结构转换为DXF格式
-     * @returns
-     */
-    toDxfBlob(unit?: Unit): Blob;
-    /**
-    * 下载原始json
-    * @param filename
-    */
-    downloadOriginalData(filename: string): Promise<void>;
-    /**
-     * 下载
-     * @param filename
-     */
-    download(filename: string, unit?: Unit): Promise<void>;
-    /**
-     * 下载
-     * @param filename
-     */
-    downloadImage(filename: string, unit?: Unit, type?: string): Promise<boolean>;
-    /**
-     * 计算原始数据的边界框
-     * @description 计算所有线段的起点和终点的最小最大值，形成一个边界框
-     * @returns
-     */
-    private computedOriginalSize;
-    /**
-     * 创建数据
-     * @param pointsGroups
-     * @returns
-     */
-    static createData(pointsGroups: Point[][], sealed?: boolean): OriginalDataItem[];
-}