build-dxf 0.1.27 → 0.1.29

package/package.json

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

package/src/build.js

@@ -5081,7 +5081,10 @@ function shortDistanceLink(lines, radius = 0.1) {
     if (line.userData.isDoor) continue;
     line.points.forEach((point2) => {
       if (visited.has(point2)) return false;
-      const list = pointVirtualGrid.queryCircle(point2, radius, true).map((item) => Object.assign({}, item)).sort((a2, b4) => getWeight2(b4, point2, line) - getWeight2(a2, point2, line));
+      const list = pointVirtualGrid.queryCircle(point2, radius, true).map((item) => Object.assign({}, item)).filter((item) => {
+        const targetLine2 = item.userData, targetPoint2 = item.point, direct1 = line.getAnotherPoint(point2).direction(point2), direct2 = targetLine2.getAnotherPoint(targetPoint2).direction(targetPoint2), angle = direct1.angleBetween(direct2, "angle");
+        return angle > 90;
+      }).sort((a2, b4) => getWeight2(b4, point2, line) - getWeight2(a2, point2, line));
       if (list.length === 0) return;
       const { point: targetPoint } = list[0];
       const targetLine = list[0].userData;
@@ -5984,7 +5987,7 @@ class Scenario {
     this.closedArray = lines.filter((item) => {
       return LineGroupType.hasType(item, "doubleWall");
     });
-    let groups = LineSegment.groupByPath(this.closedArray);
+    let groups = LineGroupType.getGroupsByType(this.closedArray, "doubleWall");
     const set2 = new Set(this.closedArray);
     let singleLineWall = lines.filter((line) => !set2.has(line) && !line.userData.isDoor && !line.userData.isBayWindow);
     let menList = lines.filter((line) => line.userData.isDoor);
@@ -14373,7 +14376,6 @@ class SceneAutoGenerat {
     this.angle = -vrLine.direction().angleBetween(new Point(0, 1), "angle", "360") * (Math.PI / 180);
   }
   async init() {
-    await this.buildPlane(this.lines);
     await this.buildWall();
     globalScenario.scene.add(this.scene);
     globalScenario.scene.traverse((child) => {
@@ -14617,8 +14619,8 @@ class DoorFind {
       dock = { dockLine: endList[0].userData, dockPoint: endList[0].point, point: line.end, pointType: "end" };
     }
     const point2 = this.adsorpt(dock, line);
-    line.userData.doorDirectConnection = true;
     if (point2) {
+      line.userData.doorDirectConnection = true;
       line.userData.doorAutomaticFind = true;
       line.getAnotherPoint(dock.point).copy(point2);
     }
@@ -14834,7 +14836,7 @@ class BoundExt2 {
    * @returns 
    */
   static boundExtbyTraj(opt) {
-    let { lines, trajectory, wallWidth = 0.12, updateDoubleWallGroup = false, findCallBack } = opt;
+    let { lines, trajectory, wallWidth = 0.12, updateDoubleWallGroup = true, findCallBack } = opt;
     if (updateDoubleWallGroup) lines = DoubleWallHelper.buildGroup(lines);
     const trajectoryPoints = Object.keys(trajectory).map((key) => Point.from(trajectory[key]));
     const findLines = BoundExt2.findExtWallByTraj(lines, trajectoryPoints);
@@ -15446,6 +15448,7 @@ class WhiteModel extends Component {
     const lines = dxfSystem.CorrectionDxf.getLineSegments(true);
     const sceneAutoGenerat = new SceneAutoGenerat(lines, this.itemList, dxfSystem.Dxf.originalZAverage, dxfSystem.Dxf.options.trajectory);
     await sceneAutoGenerat.init();
+    sceneAutoGenerat.buildPlane(dxfSystem.Dxf.getLineSegments());
     const group2 = sceneAutoGenerat.scene;
     if (group2) {
       this.whiteModelLineGroup.add(group2.clone(true));
@@ -15643,7 +15646,29 @@ class Lines extends THREE.LineSegments {
       const position = new THREE.BufferAttribute(new Float32Array(array), 3);
       this.geometry.setAttribute("position", position);
       this._timer = null;
+      this.dispatchEvent({ type: "updateGeometry" });
+    });
+  }
+}
+class LineDashed extends Lines {
+  constructor(points, color, dashSize = 0.02, gapSize = 0.02) {
+    super(points, color);
+    this.material = new THREE.LineDashedMaterial({
+      color,
+      dashSize,
+      gapSize
     });
+    this.addEventListener("updateGeometry", () => {
+      this.computeLineDistances();
+    });
+  }
+  setDashSize(dashSize) {
+    this.material.dashSize = dashSize;
+    this.computeLineDistances();
+  }
+  setGapSize(gapSize) {
+    this.material.gapSize = gapSize;
+    this.computeLineDistances();
   }
 }
 function selectLocalFileFun() {
@@ -18864,6 +18889,7 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   DxfSystem,
   EventDispatcher,
   GltfInit,
+  LineDashed,
   LineGroupType,
   LineIndexGenerator,
   LineSegment,
@@ -19079,7 +19105,7 @@ export {
   Component as C,
   Dxf as D,
   HeightQuery as H,
-  LineSegment as L,
+  LineDashed as L,
   PointVirtualGrid as P,
   Quadtree as Q,
   SelectLocalFile as S,
@@ -19087,20 +19113,22 @@ export {
   Variable as V,
   WhiteModel as W,
   Point as a,
-  Lines as b,
+  LineSegment as b,
   cloneUserData as c,
-  drawText$1 as d,
-  PRE_PROCESSOR as e,
-  CommandManager as f,
-  createEditor as g,
-  getModels as h,
-  buildJson as i,
-  getFileAll as j,
-  getGlobalDxfSystem as k,
-  index$1 as l,
-  index as m,
-  DxfSystem as n,
-  components as o,
+  Lines as d,
+  drawText$1 as e,
+  PRE_PROCESSOR as f,
+  getDefaultExportFromCjs as g,
+  CommandManager as h,
+  createEditor as i,
+  getModels as j,
+  buildJson as k,
+  getFileAll as l,
+  getGlobalDxfSystem as m,
+  index$1 as n,
+  index as o,
+  DxfSystem as p,
+  components as q,
   recomputedWindow as r,
   uuid as u
 };

package/src/components/DragContainer.vue.d.ts

@@ -8,9 +8,11 @@ type __VLS_Props = {
 };
 declare const __VLS_defaults: {
     showContent: boolean;
+    showTitle: boolean;
 };
 type __VLS_PublicProps = {
     "showContent"?: typeof __VLS_defaults['showContent'];
+    "showTitle"?: typeof __VLS_defaults['showTitle'];
 } & __VLS_Props;
 declare function __VLS_template(): {
     attrs: Partial<{}>;
@@ -28,9 +30,11 @@ type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: import('vue').DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     clickIcon: (...args: any[]) => void;
     "update:showContent": (value: boolean) => void;
+    "update:showTitle": (value: boolean) => void;
 }, string, import('vue').PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
     onClickIcon?: ((...args: any[]) => any) | undefined;
     "onUpdate:showContent"?: ((value: boolean) => any) | undefined;
+    "onUpdate:showTitle"?: ((value: boolean) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     elRef: HTMLDivElement;
     toolBarRef: HTMLDivElement;

package/src/index.css

@@ -105,14 +105,26 @@
   right: 10px;
 }
 
+.bottom-0 {
+  bottom: calc(var(--spacing) * 0);
+}
+
 .bottom-\[20px\] {
   bottom: 20px;
 }
 
+.bottom-\[calc\(100\%\+5px\)\] {
+  bottom: calc(100% + 5px);
+}
+
 .left-0 {
   left: calc(var(--spacing) * 0);
 }
 
+.left-\[0px\] {
+  left: 0;
+}
+
 .left-\[20px\] {
   left: 20px;
 }
@@ -240,6 +252,16 @@
   height: 20px;
 }
 
+.size-\[28px\] {
+  width: 28px;
+  height: 28px;
+}
+
+.size-\[30px\] {
+  width: 30px;
+  height: 30px;
+}
+
 .h-\[20px\] {
   height: 20px;
 }
@@ -475,7 +497,7 @@
   }
 }
 
-.p-\[0px_5px\] {
+.p-\[0_5px\], .p-\[0px_5px\] {
   padding: 0 5px;
 }
 
@@ -745,7 +767,7 @@
     color: #a7a7a7
 }
 
-[data-v-a41b5baa] {
+[data-v-35b58696] {
     font-family: 宋体;
 }
 

package/src/index.js

@@ -1,15 +1,15 @@
 import "three";
-import { D, n, l, i, o, g, j, k, h, m } from "./build.js";
+import { D, p, n, k, q, i, l, m, j, o } from "./build.js";
 import "clipper-lib";
 export {
   D as Dxf,
-  n as DxfSystem,
-  l as ModelDataPlugin,
-  i as buildJson,
-  o as components,
-  g as createEditor,
-  j as getFileAll,
-  k as getGlobalDxfSystem,
-  h as getModels,
-  m as utils
+  p as DxfSystem,
+  n as ModelDataPlugin,
+  k as buildJson,
+  q as components,
+  i as createEditor,
+  l as getFileAll,
+  m as getGlobalDxfSystem,
+  j as getModels,
+  o as utils
 };