build-dxf 0.1.106 → 0.1.107

package/package.json

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

package/src/build.js

@@ -5487,13 +5487,49 @@ class Polygon extends Array {
     this.length = 0;
     this.push(...points);
   }
-  getCenter() {
-    let countX = 0, countY = 0;
-    this.forEach((p2) => {
-      countX += p2.x;
-      countY += p2.y;
-    });
-    return new Point(countX / this.length, countY / this.length);
+  /**
+   * 获取多边形几何中心（面积质心）
+   * @description 使用多边形面积质心公式计算
+   * @description 适用于闭合简单多边形（顺时针或逆时针均可）
+   * @description 如果面积为 0，则退化为顶点平均中心
+   * @param out 输出对象，用于减少 GC
+   * @returns
+   */
+  getCenter(out = new Point()) {
+    const len = this.length;
+    if (len === 0) {
+      return out.set(0, 0);
+    }
+    let area2 = 0;
+    let centerX = 0;
+    let centerY = 0;
+    for (let i = 0; i < len; i++) {
+      const p1 = this[i];
+      const p2 = this[(i + 1) % len];
+      const cross = p1.x * p2.y - p2.x * p1.y;
+      area2 += cross;
+      centerX += (p1.x + p2.x) * cross;
+      centerY += (p1.y + p2.y) * cross;
+    }
+    area2 *= 0.5;
+    if (Math.abs(area2) < 1e-9) {
+      let sumX = 0;
+      let sumY = 0;
+      for (let i = 0; i < len; i++) {
+        sumX += this[i].x;
+        sumY += this[i].y;
+      }
+      const inv = 1 / len;
+      return out.set(
+        sumX * inv,
+        sumY * inv
+      );
+    }
+    const factor = 1 / (6 * area2);
+    return out.set(
+      centerX * factor,
+      centerY * factor
+    );
   }
   /** 计算二维包围盒
    * @returns 
@@ -9570,8 +9606,8 @@ class ThreeVJiaPipeline extends Pipeline {
       let wallWidth = 0;
       const poly = Polygon.fromByLinePath(lines2).getMinimumBoundingRectangle();
       if (poly) {
-        const len1 = poly[0].distance(poly[1]), len2 = poly[1].distance(poly[2]), direct = len1 > len2 ? poly[0].directionFrom(poly[1]) : poly[1].directionFrom(poly[2]), center = poly.getCenter();
-        newLine = center.expandAsLine(direct, 1).setLength(Math.max(len1, len2));
+        const len1 = poly[0].distance(poly[1]), len2 = poly[1].distance(poly[2]), direct = len1 > len2 ? poly[0].directionFrom(poly[1]) : poly[1].directionFrom(poly[2]), center = poly.getCenter(), len = Math.max(len1, len2);
+        newLine = center.expandAsLine(direct, len).translate(-len * 0.5, direct);
         wallWidth = Math.min(len1, len2);
       } else {
         lines2 = [...lines2].sort((a2, b4) => a2.length() - b4.length());
@@ -9727,7 +9763,6 @@ class ThreeVJiaPipeline extends Pipeline {
         type: "LINE",
         isDoor: false,
         loadBearingWall: false,
-        // height: line.userData.height ?? DEFAULT_WALL_HEIGHT
         height: precision4(line.currentData[WALL_HEIGHT_KEY] ?? this.maxHeight)
       });
     });
@@ -9760,6 +9795,7 @@ class ThreeVJiaPipeline extends Pipeline {
     const rooms = json.rooms, roomPloys = rooms.map((room) => new Polygon(room.polygon.map((p2) => Point.from(p2))));
     if (roomPloys.length === 0) return json;
     publicInfo.itemInfo.forEach((item, i) => {
+      if (item.category !== "switch" && item.category !== "socket") return;
       const itemPoly = new Polygon(item.contour.map((p2) => Point.from(p2).rotate(json.center, json.angle))), center = itemPoly.getCenter(), index2 = roomPloys.findIndex((poly) => poly.pointWithin(center));
       if (index2 < 0) return;
       json.placeHolders.push({
@@ -9782,7 +9818,6 @@ class ThreeVJiaPipeline extends Pipeline {
    * @returns 
    */
   static toThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
-    angle = precision4(angle);
     let centerVec2 = null;
     lineSegments = LineSegmentUndirectedGraph.rotate(lineSegments.map((line) => line.clone()), angle, (line, center, angle2) => {
       if (!centerVec2) centerVec2 = { x: center.x, y: center.y };
@@ -10679,13 +10714,19 @@ class DoubleWallHelper {
       const newLine1 = new LineSegment(project0.start.clone(), project1.start.clone());
       const newLine2 = new LineSegment(project0.end.clone(), project1.end.clone());
       newLine1.userData.height = line0.userData.height;
+      newLine1.userData.rooftopPz = line0.userData.rooftopPz;
       newLine2.userData.height = line1.userData.height;
+      newLine2.userData.rooftopPz = line1.userData.rooftopPz;
       appendLines.push(newLine1, newLine2);
       addClipingMap(line0, project0);
       addClipingMap(line1, project1);
     });
     clipingMap.forEach((list, line) => {
       const newLines = LineSegmentUtils.clippingByPoints(line, list);
+      newLines.forEach((newLine) => {
+        newLine.userData.height = line.userData.height;
+        newLine.userData.rooftopPz = line.userData.rooftopPz;
+      });
       lines.push(...newLines);
     });
     lines = lines.filter((line) => !removeLines.has(line));
@@ -10696,9 +10737,11 @@ class DoubleWallHelper {
       const queryLines = quadtree.queryRect(line.toRectangle(1e-3, "butt")).filter((item) => item.line.isParallelTo(line)).map((item) => item.line);
       if (queryLines.length) {
         const newLines = LineSegmentUtils.clippingByLines(line, queryLines);
-        if (newLines) return newLines.forEach((line2) => {
-          quadtree.insert(line2);
-          lines.push(line2);
+        if (newLines) return newLines.forEach((newLine) => {
+          newLine.userData.height = line.userData.height;
+          newLine.userData.rooftopPz = line.userData.rooftopPz;
+          quadtree.insert(newLine);
+          lines.push(newLine);
         });
       }
       quadtree.insert(line);
@@ -11031,7 +11074,7 @@ class AlignToParallelSegments {
    * @param esp 垂直投影值分组距离
    * @param gap 平行轴投影区间间隙
    */
-  static group(lines, parallelAxis, verticalAxis, esp = 0.05, gap = 0.01) {
+  static group(lines, parallelAxis, verticalAxis, esp = 0.05, gap = 0.01, onGroup) {
     esp = esp / verticalAxis.len;
     gap = gap / parallelAxis.len;
     const vls = lines.map((line) => [
@@ -11039,16 +11082,29 @@ class AlignToParallelSegments {
       line,
       [parallelAxis.projectPointValue(line.start), parallelAxis.projectPointValue(line.end)].sort((a2, b4) => a2 - b4)
     ]).sort((a2, b4) => a2[0] - b4[0]), unionFindSet = new UnionFindSet(vls.length);
-    for (let i = 0; i < vls.length; i++) {
-      const [ipv, _iline, [istart, iend]] = vls[i];
-      for (let j = i + 1; j < vls.length; j++) {
+    for (let i2 = 0; i2 < vls.length; i2++) {
+      const [ipv, _iline, [istart, iend]] = vls[i2];
+      for (let j = i2 + 1; j < vls.length; j++) {
         const [jpv, _jline, [jstart, jend]] = vls[j];
         if (jpv - ipv > esp) break;
         const overlap = Math.min(iend, jend) - Math.max(istart, jstart);
-        if (overlap > -gap) unionFindSet.union(i, j);
-      }
-    }
-    const groups = unionFindSet.getAllSets().map((v2) => v2.map((v22) => vls[v22][1]));
+        if (overlap > -gap) unionFindSet.union(i2, j);
+      }
+    }
+    const map = unionFindSet.getAllSets();
+    const groups = new Array(map.size);
+    let i = 0;
+    map.forEach((list) => {
+      const group = new Array(list.length);
+      const pvList = new Array(list.length);
+      groups[i++] = group;
+      for (let i2 = 0; i2 < list.length; i2++) {
+        const [pv, line] = vls[list[i2]];
+        group[i2] = line;
+        pvList[i2] = pv;
+      }
+      onGroup?.(group, pvList, verticalAxis);
+    });
     return groups;
   }
   /** 拟合并对齐线段
@@ -11088,13 +11144,13 @@ class AlignToParallelSegments {
    * @returns 
    */
   static align(lines, opt = {}) {
-    const { esp = 0.06, gap = 0.05 } = opt;
+    const { esp = 0.08, gap = 0.05 } = opt;
     const axisLine = lines[LineSegmentUtils.maxLengthLineIndex(lines)].clone().setLength(100), axisLineV = axisLine.clone().rotate(Math.PI * 0.5, axisLine.center);
     let [pllLines, verticalLines] = LineSegmentUtils.groupByParallelToAxis(lines, axisLine);
-    const groups = this.group(pllLines, axisLine, axisLineV, esp, gap);
+    const groups = this.group(pllLines, axisLine, axisLineV, esp, gap, opt.onGroup);
     pllLines = this.fittingAlignment(groups, verticalLines, opt);
     verticalLines = verticalLines.filter((line) => line.length() > 1e-6);
-    const groups2 = this.group(verticalLines, axisLineV, axisLine, esp, gap);
+    const groups2 = this.group(verticalLines, axisLineV, axisLine, esp, gap, opt.onGroup);
     verticalLines = this.fittingAlignment(groups2, pllLines, opt);
     pllLines = pllLines.filter((line) => line.length() > 1e-6);
     return [
@@ -11230,7 +11286,17 @@ function correction(lines, targettLine, option) {
   lines = AxisAlignCorr.start(lines, targettLine);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = AlignToParallelSegments.align(lines, {
-    onMergeLine: mergeLineUserData
+    onMergeLine: mergeLineUserData,
+    onGroup(group, projValues, axis) {
+      if (group.length <= 1) return;
+      const max = Math.max(...projValues);
+      const min = Math.min(...projValues);
+      const dist = precision4((max - min) * axis.len);
+      if (dist < DEFAULT_WALL_WIDTH) return;
+      group.forEach((line) => {
+        line.userData.wallWidth = dist;
+      });
+    }
     // esp: 0.4
   });
   lines = adsorption(lines, option);
@@ -11767,9 +11833,17 @@ function wallHeightHandle(lineSegments, option) {
       Object.defineProperty(option.publicInfo.rootTopContourInfo, "quadtree", { value: quadtree });
     }
   }
+  const psh = PointSpatialHash.fromByLines(lineSegments);
   lineSegments.forEach((line) => {
     if (!("height" in line.userData)) {
-      if (!line.userData.rooftopPz && option?.publicInfo?.rootTopContourInfo) line.userData.rooftopPz = HeightQuery.query(line, option.publicInfo.rootTopContourInfo);
+      if (!line.userData.rooftopPz && option?.publicInfo?.rootTopContourInfo) {
+        const list = psh.queryPoints(line.points, true).map((item) => item.userData?.userData.rooftopPz ?? 0);
+        if (list.length) {
+          line.userData.rooftopPz = Math.max(...list);
+        } else {
+          line.userData.rooftopPz = HeightQuery.query(line, option.publicInfo.rootTopContourInfo);
+        }
+      }
       if ("rooftopPz" in line.userData) line.userData.height = Math.abs(line.userData.rooftopPz - (option.originalZ ?? 0));
     }
   });

package/src/utils/algorithms/AlignToParallelSegments.d.ts

@@ -1,8 +1,10 @@
 import { LineSegment } from './LineSegment';
+type OnGroupFun = (group: LineSegment[], projValues: number[], axis: LineSegment) => void;
 export interface AlignDescriptor {
     esp?: number;
     gap?: number;
     onMergeLine?: (target: LineSegment, source: LineSegment) => void;
+    onGroup?: OnGroupFun;
 }
 /** 通过平行轴和垂直轴分组对齐线段，搭配垂直纠正使用
  */
@@ -14,7 +16,7 @@ export declare class AlignToParallelSegments {
      * @param esp 垂直投影值分组距离
      * @param gap 平行轴投影区间间隙
      */
-    static group(lines: LineSegment[], parallelAxis: LineSegment, verticalAxis: LineSegment, esp?: number, gap?: number): LineSegment<Record<string, any>>[][];
+    static group(lines: LineSegment[], parallelAxis: LineSegment, verticalAxis: LineSegment, esp?: number, gap?: number, onGroup?: OnGroupFun): LineSegment<Record<string, any>>[][];
     /** 拟合并对齐线段
      * @param groups
      * @param verticalLines
@@ -26,3 +28,4 @@ export declare class AlignToParallelSegments {
      */
     static align(lines: LineSegment[], opt?: AlignDescriptor): LineSegment<Record<string, any>>[];
 }
+export {};

package/src/utils/algorithms/Polygon.d.ts

@@ -13,7 +13,15 @@ export declare class Polygon<T = any> extends Array<Point<T>> {
     [Symbol.iterator](): ArrayIterator<Point<T>>;
     constructor(points?: Point<T>[]);
     set(points?: Point<T>[]): void;
-    getCenter(): Point<Record<string, any>>;
+    /**
+     * 获取多边形几何中心（面积质心）
+     * @description 使用多边形面积质心公式计算
+     * @description 适用于闭合简单多边形（顺时针或逆时针均可）
+     * @description 如果面积为 0，则退化为顶点平均中心
+     * @param out 输出对象，用于减少 GC
+     * @returns
+     */
+    getCenter(out?: Point<Record<string, any>>): Point<Record<string, any>>;
     /** 计算二维包围盒
      * @returns
      */