build-dxf 0.1.54 → 0.1.56

package/package.json

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

package/src/build.d.ts

@@ -1,6 +1,7 @@
 import { DxfSystem } from './utils/DxfSystem';
-import { OriginalDataItem, SetDataOption } from './utils/DxfSystem/type';
+import { LineUserData, OriginalDataItem, SetDataOption } from './utils/DxfSystem/type';
 import { WhiteModel } from './utils/DxfSystem/plugin/ModelDataPlugin/components/WhiteModel';
+import { LineSegment } from './utils';
 import * as THREE from "three";
 export { Dxf } from './utils/DxfSystem/components/Dxf';
 export * from './utils/DxfSystem/DxfSystem';
@@ -83,4 +84,10 @@ export declare function getGlobalDxfSystem(): DxfSystem | null;
  * @param direction
  * @returns
  */
-export declare function hasCircle(lineData: OriginalDataItem[], startIndex: number, direction: any): boolean;
+export declare function hasCircle(lineData: OriginalDataItem[], startIndex: number, direction: any): {
+    readonly originalIndices: number[];
+    readonly indices: number[];
+    circle: LineSegment<Record<string, any>>[];
+    originalLines: LineSegment<LineUserData>[];
+    lines: LineSegment<Record<string, any>>[];
+} | null;

package/src/build.js

@@ -711,9 +711,9 @@ class Quadtree {
    * 插入线段节点
    * @param node 线段节点
    */
-  insert(node) {
+  insert(node, userData) {
     if (node instanceof LineSegment) {
-      this.insert({ line: node, userData: {} });
+      this.insert({ line: node, userData: userData ?? {} });
       return;
     }
     if (!this.isLeaf) {
@@ -5443,8 +5443,9 @@ function createPointVirtualGrid(lines) {
 }
 function createQuadtree(lines) {
   const quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
-  for (const seg of lines) {
-    quadtree.insert(seg);
+  for (let i = 0; i < lines.length; i++) {
+    const seg = lines[i];
+    quadtree.insert(seg, { index: i });
   }
   return quadtree;
 }
@@ -5454,10 +5455,20 @@ function mToMm(value) {
 function mmTom(value) {
   return Number((value / 1e3).toFixed(4));
 }
+function getLineIndexByCenter(targetLines, lines) {
+  const grid = createQuadtree(lines);
+  const indices = targetLines.map((line) => {
+    const res = grid.queryPoint(line.center);
+    if (res.length) return res[0].userData.index;
+    return -1;
+  });
+  return indices;
+}
 const tools = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   createPointVirtualGrid,
   createQuadtree,
+  getLineIndexByCenter,
   mToMm,
   mmTom
 }, Symbol.toStringTag, { value: "Module" }));
@@ -19869,20 +19880,39 @@ function getGlobalDxfSystem() {
 function hasCircle(lineData, startIndex, direction) {
   let lines = originalDataToLineData(lineData).lineSegments;
   const center = lines[startIndex].center;
-  lines = lineSegmentClipping(lines, 1e-9);
-  const list = lines.filter((line2) => line2.userData.isBayWindow && line2.isPointOnSegment(center));
-  if (list.length === 0) return false;
+  let findlines = lineSegmentClipping(lines.map((line2) => line2.clone()), 1e-9);
+  let removeSet = findDiscretePointLine2(findlines, /* @__PURE__ */ new Set(), true);
+  findlines = findlines.filter((line2) => !removeSet.has(line2));
+  const list = findlines.filter((line2) => line2.userData.isBayWindow && line2.isPointOnSegment(center));
+  if (list.length === 0) return null;
   const miniCircles = new MiniCircles(), line = list[0], direct = Point.from(direction), entity = line.center.add(direct.multiplyScalar(1e-8)), path = /* @__PURE__ */ new Set([line]);
   const result = miniCircles.findSameSidePath({
     line,
     currentPoint: line.start,
     exitPoint: line.start,
     entity: entity.clone(),
-    grid: lines,
+    grid: findlines,
     side: Side.IN,
     path
   });
-  return !!result;
+  if (result) {
+    let indices = null;
+    let originalDataIndices = null;
+    return {
+      get originalIndices() {
+        if (!originalDataIndices) originalDataIndices = getLineIndexByCenter(result, lines).filter((i) => i > -1);
+        return originalDataIndices;
+      },
+      get indices() {
+        if (!indices) indices = getLineIndexByCenter(result, findlines).filter((i) => i > -1);
+        return indices;
+      },
+      circle: result,
+      originalLines: lines,
+      lines: findlines
+    };
+  }
+  return null;
 }
 export {
   ArrayMap as A,

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

@@ -2,6 +2,9 @@ import { PointVirtualGrid } from '../../PointVirtualGrid';
 import { LineSegment } from '../../LineSegment';
 import { Quadtree } from '../../Quadtree';
 export declare function createPointVirtualGrid<T = any>(lines: LineSegment<T>[]): PointVirtualGrid<LineSegment<T>>;
-export declare function createQuadtree<T = any>(lines: LineSegment<T>[]): Quadtree<LineSegment<T>>;
+export declare function createQuadtree<T = any>(lines: LineSegment<T>[]): Quadtree<{
+    index: number;
+}>;
 export declare function mToMm(value: number): number;
 export declare function mmTom(value: number): number;
+export declare function getLineIndexByCenter(targetLines: LineSegment[], lines: LineSegment[]): number[];

package/src/utils/Quadtree.d.ts

@@ -22,7 +22,7 @@ export declare class Quadtree<T = any> {
      * 插入线段节点
      * @param node 线段节点
      */
-    insert(node: QuadtreeNode<T> | LineSegment): void;
+    insert(node: QuadtreeNode<T> | LineSegment, userData?: any): void;
     /** 移除
      * @param node
      */