build-dxf 0.1.83 → 0.1.84

package/package.json

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

package/src/build.js

@@ -10066,8 +10066,8 @@ class Scenario {
     new THREE.LineBasicMaterial({
       color: 65280
     });
-    const MobileX = this.angleToXAxisDegrees(data.start.x, data.start.y, data.end.x, data.end.y, DEFAULT_WALL_HALF_WIDTH, true);
-    const MobileY = this.angleToXAxisDegrees(data.start.x, data.start.y, data.end.x, data.end.y, DEFAULT_WALL_HALF_WIDTH, false);
+    const MobileX = this.angleToXAxisDegrees(data.start.x, data.start.y, data.end.x, data.end.y, DEFAULT_WALL_HALF_WIDTH + 0.01, true);
+    const MobileY = this.angleToXAxisDegrees(data.start.x, data.start.y, data.end.x, data.end.y, DEFAULT_WALL_HALF_WIDTH + 0.01, false);
     let startingPoint = this.xinLine(MobileX, MobileY, data.start, 0);
     let finishLine = this.xinLine(MobileX, MobileY, data.end, 1);
     const grid = createPointVirtualGrid(this.lines);
@@ -10217,13 +10217,17 @@ class Scenario {
   // 窗的处理
   windowTreatment(dblWin, mesh, wallHeight) {
     const doorList = dblWin;
-    const MobileX = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, doorList.userData.wallWidth ? doorList.userData.wallWidth : 0.5, true);
-    const MobileY = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, doorList.userData.wallWidth ? doorList.userData.wallWidth : 0.5, false);
+    const MobileX = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, doorList.userData.wallWidth ? doorList.userData.wallWidth + 1e-3 : 0.5, true);
+    const MobileY = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, doorList.userData.wallWidth ? doorList.userData.wallWidth + 1e-3 : 0.5, false);
     let startingPoint = this.xinLine(MobileX, MobileY, doorList.start, wallHeight);
     let finishLine = this.xinLine(MobileX, MobileY, doorList.end, wallHeight);
-    startingPoint.push(finishLine[1]);
-    startingPoint.push(finishLine[0]);
-    return this.winHoleOpening(startingPoint, mesh, dblWin.userData.groundClearance, dblWin.userData.height);
+    let x = MobileX > 0 ? 3e-3 : -3e-3;
+    let y = MobileY > 0 ? 3e-3 : -3e-3;
+    let startingPoint1 = this.xinLine1(y, x, startingPoint[0], startingPoint[1], 0, wallHeight);
+    let finishLine1 = this.xinLine1(y, x, finishLine[0], finishLine[1], 1, wallHeight);
+    startingPoint1.push(finishLine1[1]);
+    startingPoint1.push(finishLine1[0]);
+    return this.winHoleOpening(startingPoint1, mesh, dblWin.userData.groundClearance, dblWin.userData.height);
   }
   windowTreatment1(dblWin, mesh, wallHeight) {
     const doorList = dblWin;
@@ -10239,8 +10243,8 @@ class Scenario {
   TheHandlingOfTheDoor1(data) {
     const wallHeightc = data.userData.height ? data.userData.height : this.wallHeight;
     const doorList = data;
-    const MobileX = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, DEFAULT_WALL_HALF_WIDTH, true);
-    const MobileY = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, DEFAULT_WALL_HALF_WIDTH, false);
+    const MobileX = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, DEFAULT_WALL_HALF_WIDTH + 0.01, true);
+    const MobileY = this.angleToXAxisDegrees(doorList.start.x, doorList.start.y, doorList.end.x, doorList.end.y, DEFAULT_WALL_HALF_WIDTH + 0.01, false);
     let startingPoint = this.xinLine(MobileX, MobileY, doorList.start, doorList.userData.height ? doorList.userData.height : this.wallHeight);
     let finishLine = this.xinLine(MobileX, MobileY, doorList.end, doorList.userData.height ? doorList.userData.height : this.wallHeight);
     const quadtree = createQuadtree(this.lines);
@@ -10288,8 +10292,8 @@ class Scenario {
       const dy = point2.y - point1.y;
       const angleRad = Math.atan2(dy, dx);
       const distance2 = point1.distanceTo(point2);
-      const MobileX = this.angleToXAxisDegrees(doorList[i].start.x, doorList[i].start.y, doorList[i].end.x, doorList[i].end.y, DEFAULT_WALL_HALF_WIDTH, true);
-      const MobileY = this.angleToXAxisDegrees(doorList[i].start.x, doorList[i].start.y, doorList[i].end.x, doorList[i].end.y, DEFAULT_WALL_HALF_WIDTH, false);
+      const MobileX = this.angleToXAxisDegrees(doorList[i].start.x, doorList[i].start.y, doorList[i].end.x, doorList[i].end.y, DEFAULT_WALL_HALF_WIDTH + 0.01, true);
+      const MobileY = this.angleToXAxisDegrees(doorList[i].start.x, doorList[i].start.y, doorList[i].end.x, doorList[i].end.y, DEFAULT_WALL_HALF_WIDTH + 0.01, false);
       let startingPoint = this.xinLine(MobileX, MobileY, doorList[i].start, doorList[i].userData.height ? doorList[i].userData.height : this.wallHeight);
       let finishLine = this.xinLine(MobileX, MobileY, doorList[i].end, doorList[i].userData.height ? doorList[i].userData.height : this.wallHeight);
       const quadtree = createQuadtree(this.lines);
@@ -10647,12 +10651,14 @@ class Scenario {
   xinLine1(x, y, pointa, pointb, num, wallHeight) {
     let point1;
     let point2;
+    let xx = x > 0 ? x + -1e-3 : 1e-3;
+    let yy = y > 0 ? y + -1e-3 : 1e-3;
     if (num === 0) {
-      point1 = new THREE.Vector3(pointa.x - x, pointa.y - y, wallHeight);
-      point2 = new THREE.Vector3(pointb.x - x, pointb.y - y, wallHeight);
+      point1 = new THREE.Vector3(pointa.x - xx, pointa.y - yy, wallHeight);
+      point2 = new THREE.Vector3(pointb.x - xx, pointb.y - yy, wallHeight);
     } else {
-      point1 = new THREE.Vector3(pointa.x + x, pointa.y + y, wallHeight);
-      point2 = new THREE.Vector3(pointb.x + x, pointb.y + y, wallHeight);
+      point1 = new THREE.Vector3(pointa.x + xx, pointa.y + yy, wallHeight);
+      point2 = new THREE.Vector3(pointb.x + xx, pointb.y + yy, wallHeight);
     }
     return [point1, point2];
   }

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/axisAlignCorr.d.ts

@@ -1,9 +1,9 @@
 import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
-import { SetDataOption } from '../../../type';
+import { LineUserData, SetDataOption } from '../../../type';
 /** 轴对齐垂直纠正
 * @param lines
 * @param option
 * @param verticalReferenceLine
 * @returns
 */
-export declare function axisAlignCorr(lines: LineSegment[], option: SetDataOption, verticalReferenceLine?: LineSegment): LineSegment<any>[];
+export declare function axisAlignCorr(lines: LineSegment<LineUserData>[], option: SetDataOption, verticalReferenceLine?: LineSegment): LineSegment<any>[];