build-dxf 0.1.125 → 0.1.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.125",
+  "version": "0.1.127",
   "description": "",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -684,54 +684,71 @@ class PointSpatialHash {
     }
     return null;
   }
-  /** 通过点，从近到远辐射查找，同一格子，不保证远近
-   * 返回第一个满足条件的目标
+  /** 通过点，从近到远按圈层搜索
+   * 同一圈内不保证距离顺序
+   * 返回第一个满足条件的圈层
    */
-  nearestSearch(point2, fn2, maxRing = 1e3) {
+  searchByRing(point2, fn2, maxRing = 1e3) {
+    let gridCount = this.map.size;
     const centerI = Math.floor(point2.x / this.gridSize);
     const centerJ = Math.floor(point2.y / this.gridSize);
-    const set2 = this.map.get(this.getGridId(centerI, centerJ));
-    if (set2) {
+    const currentCircle = [];
+    const appendGrid = (i, j) => {
+      const set2 = this.map.get(this.getGridId(i, j));
+      if (!set2) return;
+      gridCount--;
       for (const target of set2) {
-        if (fn2(target)) return target;
+        currentCircle.push({
+          point: target.point,
+          userData: target.userData,
+          distanceSq: point2.distanceSquared(target.point)
+        });
       }
+    };
+    appendGrid(centerI, centerJ);
+    if (fn2(currentCircle, 0)) {
+      return currentCircle;
     }
+    if (gridCount === 0) return null;
     for (let r2 = 1; r2 <= maxRing; r2++) {
+      currentCircle.length = 0;
       const minI = centerI - r2;
       const maxI = centerI + r2;
       const minJ = centerJ - r2;
       const maxJ = centerJ + r2;
       for (let i = minI; i <= maxI; i++) {
-        let set22 = this.map.get(this.getGridId(i, minJ));
-        if (set22) {
-          for (const target of set22) {
-            if (fn2(target)) return target;
-          }
-        }
-        set22 = this.map.get(this.getGridId(i, maxJ));
-        if (set22) {
-          for (const target of set22) {
-            if (fn2(target)) return target;
-          }
-        }
+        appendGrid(i, minJ);
+        appendGrid(i, maxJ);
       }
       for (let j = minJ + 1; j < maxJ; j++) {
-        let set22 = this.map.get(this.getGridId(minI, j));
-        if (set22) {
-          for (const target of set22) {
-            if (fn2(target)) return target;
-          }
-        }
-        set22 = this.map.get(this.getGridId(maxI, j));
-        if (set22) {
-          for (const target of set22) {
-            if (fn2(target)) return target;
-          }
-        }
+        appendGrid(minI, j);
+        appendGrid(maxI, j);
+      }
+      if (fn2(currentCircle, r2)) {
+        return currentCircle;
       }
+      if (gridCount === 0) return null;
     }
     return null;
   }
+  /** 
+   * @param point 
+   * @param excludeSelf 
+   * @returns 
+   */
+  findNearest(point2, excludeSelf = true) {
+    let nearest = null;
+    this.searchByRing(point2, (circle) => {
+      for (const item of circle) {
+        if (excludeSelf && item.point === point2) continue;
+        if (!nearest || item.distanceSq < nearest.distanceSq) {
+          nearest = item;
+        }
+      }
+      return nearest !== null;
+    });
+    return nearest;
+  }
   /** 
    * @param point 
    */
@@ -11080,7 +11097,7 @@ function innerWallLine(lines, trajectory2) {
   lud.forEachPathLine((start, end, line, index2, endType, indxeList) => {
     temLine.start.copy(start);
     temLine.end.copy(end);
-    const wallWidth = line.userData.wallWidth ?? DEFAULT_WALL_WIDTH;
+    const wallWidth = DEFAULT_WALL_WIDTH;
     wallWidths[index2] = wallWidth;
     const hw = indxeList.length ? Math.max(...indxeList.map((i) => wallWidths[i])) * 0.5 : wallWidth * 0.5;
     if (index2 !== 0) {

package/src/index.css

@@ -1248,17 +1248,17 @@ button[data-v-7a78abcb]:active {
 }
 }
 
-[data-v-0befccd3] {
+[data-v-48eb568f] {
     font-family: 微软雅黑;
 }
-.number[data-v-0befccd3] {
+.number[data-v-48eb568f] {
     color: #a7a7a7
 }
 
-[data-v-d637775c] {
+[data-v-f7550a15] {
     font-family: 宋体;
 }
-.button[data-v-d637775c] {
+.button[data-v-f7550a15] {
     padding: 5px 10px;
     border: none;
     background: var(--primary-color);

package/src/index3.js

@@ -18385,7 +18385,12 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         if (!map.has(line2.uuid)) map.set(line2.uuid, reactive(line2.userData));
         return map.get(line2.uuid);
       });
-    });
+    }), holeName = {
+      door: "门",
+      window: "窗",
+      beam: "梁",
+      hole: "垭口"
+    };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$7, {
         title: "属性",
@@ -18407,7 +18412,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   ])) : createCommentVNode("", true),
                   createElementVNode("div", _hoisted_5$1, [
                     createElementVNode("div", null, [
-                      createElementVNode("h5", _hoisted_6$1, toDisplayString(line2.userData.isDoor ? "门线" : line2.userData.isSelectWindow ? "孔洞线段" : line2.userData.isBayWindow ? "飘窗线" : "墙体线"), 1)
+                      createElementVNode("h5", _hoisted_6$1, toDisplayString(line2.userData.isDoor ? "门线" : line2.userData.isSelectWindow ? `孔洞线（ ${holeName[line2.userData.type ?? "hole"]} ）` : line2.userData.isBayWindow ? "飘窗线" : "墙体线"), 1)
                     ]),
                     createElementVNode("div", _hoisted_7$1, [
                       (openBlock(true), createElementBlock(Fragment, null, renderList(line2.points, (point, index) => {
@@ -18425,7 +18430,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                     ]),
                     createElementVNode("div", _hoisted_14$1, [
                       userDataList.value[i].isSelectWindow ? (openBlock(), createElementBlock("p", _hoisted_15$1, [
-                        _cache[9] || (_cache[9] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "窗户宽度", -1)),
+                        _cache[9] || (_cache[9] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "孔洞宽度", -1)),
                         createVNode(_sfc_main$3, {
                           onBlur: _cache[0] || (_cache[0] = ($event) => emits("update")),
                           modelValue: userDataList.value[i].width,
@@ -18435,7 +18440,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue", "onUpdate:modelValue"])
                       ])) : createCommentVNode("", true),
                       createElementVNode("p", _hoisted_16$1, [
-                        createElementVNode("span", _hoisted_17$1, toDisplayString(line2.userData.isSelectWindow ? "窗户" : "墙体") + "高度", 1),
+                        createElementVNode("span", _hoisted_17$1, toDisplayString(line2.userData.isSelectWindow ? "孔洞" : "墙体") + "高度", 1),
                         createVNode(_sfc_main$3, {
                           onBlur: _cache[1] || (_cache[1] = ($event) => emits("update")),
                           modelValue: userDataList.value[i].height,
@@ -18453,7 +18458,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue", "onUpdate:modelValue"])
                       ])) : createCommentVNode("", true),
                       userDataList.value[i].isSelectWindow ? (openBlock(), createElementBlock("p", _hoisted_19$1, [
-                        _cache[11] || (_cache[11] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "离地高度", -1)),
+                        _cache[11] || (_cache[11] = createElementVNode("span", { class: "mr-[5px] w-[50px]" }, "孔洞高度", -1)),
                         createVNode(_sfc_main$3, {
                           onBlur: _cache[3] || (_cache[3] = ($event) => emits("update")),
                           modelValue: userDataList.value[i].groundClearance,
@@ -18474,7 +18479,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const PropertiesPanelView = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-0befccd3"]]);
+const PropertiesPanelView = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-48eb568f"]]);
 class PropertiesPanel extends Command {
   static name = "PropertiesPanel";
   container = new THREE.Group();
@@ -18734,7 +18739,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       },
       {
         command: DrawHole.commandName,
-        name: "绘制孔洞",
+        name: "绘制垭口",
         show: true,
         src: images["../assets/images/垭口.svg"].default,
         shortcut: DrawHole.shortcutKeys.join(" + ")
@@ -19326,7 +19331,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-d637775c"]]);
+const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-f7550a15"]]);
 class StorageHelper {
   static get(key, defaultValue = void 0) {
     const value = localStorage.getItem(key);

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

@@ -10,6 +10,11 @@ type Target<T> = {
 type NodeSet<T> = Set<Target<T>>;
 export type PvgTarget<T> = Target<T>;
 export type ResultList<T = any> = Array<Target<T>>;
+export type CircleResult<T = any> = {
+    point: Point;
+    distanceSq: number;
+    userData?: T;
+};
 export declare class PointSpatialHash<T = Record<string, any>> {
     map: Map<string, NodeSet<T>>;
     gridSize: number;
@@ -109,10 +114,17 @@ export declare class PointSpatialHash<T = Record<string, any>> {
         point: Point;
         userData: T;
     } | null;
-    /** 通过点，从近到远辐射查找，同一格子，不保证远近
-     * 返回第一个满足条件的目标
+    /** 通过点，从近到远按圈层搜索
+     * 同一圈内不保证距离顺序
+     * 返回第一个满足条件的圈层
+     */
+    searchByRing(point: Point, fn: (circle: CircleResult<T>[], circleNum: number) => boolean, maxRing?: number): CircleResult<T>[] | null;
+    /**
+     * @param point
+     * @param excludeSelf
+     * @returns
      */
-    nearestSearch(point: Point, fn: (target: Target<T>) => boolean, maxRing?: number): Target<T> | null;
+    findNearest(point: Point, excludeSelf?: boolean): CircleResult<T> | null;
     /**
      * @param point
      */