build-dxf 0.0.62 → 0.0.63

package/package.json

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

package/src/build.js

@@ -13228,7 +13228,7 @@ class Scenario {
     const distance = point1.distanceTo(point2);
     const height = data.userData.height ? data.userData.height : this.WindowHeight;
     const wallWidth = data.userData.wallWidth ? data.userData.wallWidth : 0.18;
-    const groundClearance = data.userData.groundClearance ? data.userData.groundClearance : this.WindowGroundHeight;
+    const groundClearance = (data.userData.groundClearance ?? this.WindowGroundHeight) + this.height;
     let menModel = this.windowModely.clone();
     if (data.center && distance) {
       menModel.position.set(data.center.x, data.center.y, 0);
@@ -13283,12 +13283,13 @@ class Scenario {
   }
   // 窗扣洞
   winHoleOpening(data, mesh, winGroundHeight, Height) {
+    winGroundHeight = (winGroundHeight ?? this.WindowGroundHeight) + this.height;
     const basePoints = [
-      new THREE.Vector3(data[0].x, data[0].y, winGroundHeight ? winGroundHeight : this.WindowGroundHeight),
-      new THREE.Vector3(data[1].x, data[1].y, winGroundHeight ? winGroundHeight : this.WindowGroundHeight),
-      new THREE.Vector3(data[2].x, data[2].y, winGroundHeight ? winGroundHeight : this.WindowGroundHeight),
+      new THREE.Vector3(data[0].x, data[0].y, winGroundHeight),
+      new THREE.Vector3(data[1].x, data[1].y, winGroundHeight),
+      new THREE.Vector3(data[2].x, data[2].y, winGroundHeight),
       // 可以不是矩形
-      new THREE.Vector3(data[3].x, data[3].y, winGroundHeight ? winGroundHeight : this.WindowGroundHeight)
+      new THREE.Vector3(data[3].x, data[3].y, winGroundHeight)
     ];
     const geometry = this.createParallelepipedFromBase(basePoints, Height ? Height : this.WindowHeight);
     const material = new THREE.MeshStandardMaterial({
@@ -13313,26 +13314,27 @@ class Scenario {
   }
   // 门扣洞
   doorHoleOpening(data, data1, groundHeight, Height, distance, center, angleRad, index2) {
+    groundHeight = (groundHeight ?? this.doorGroundHeight) + this.height;
     const basePoints = [
-      new THREE.Vector3(data[0].x, data[0].y, groundHeight ? groundHeight : this.doorGroundHeight),
-      new THREE.Vector3(data[1].x, data[1].y, groundHeight ? groundHeight : this.doorGroundHeight),
-      new THREE.Vector3(data[2].x, data[2].y, groundHeight ? groundHeight : this.doorGroundHeight),
+      new THREE.Vector3(data[0].x, data[0].y, groundHeight),
+      new THREE.Vector3(data[1].x, data[1].y, groundHeight),
+      new THREE.Vector3(data[2].x, data[2].y, groundHeight),
       // 可以不是矩形
-      new THREE.Vector3(data[3].x, data[3].y, groundHeight ? groundHeight : this.doorGroundHeight)
+      new THREE.Vector3(data[3].x, data[3].y, groundHeight)
     ];
     const basePoints1 = [
-      new THREE.Vector3(data1[0].x, data1[0].y, groundHeight ? groundHeight : this.doorGroundHeight),
-      new THREE.Vector3(data1[1].x, data1[1].y, groundHeight ? groundHeight : this.doorGroundHeight),
-      new THREE.Vector3(data1[2].x, data1[2].y, groundHeight ? groundHeight : this.doorGroundHeight),
+      new THREE.Vector3(data1[0].x, data1[0].y, groundHeight),
+      new THREE.Vector3(data1[1].x, data1[1].y, groundHeight),
+      new THREE.Vector3(data1[2].x, data1[2].y, groundHeight),
       // 可以不是矩形
-      new THREE.Vector3(data1[3].x, data1[3].y, groundHeight ? groundHeight : this.doorGroundHeight)
+      new THREE.Vector3(data1[3].x, data1[3].y, groundHeight)
     ];
     const basePoints2 = [
-      new THREE.Vector3(data[0].x, data1[0].y, groundHeight ? groundHeight : this.doorGroundHeight),
-      new THREE.Vector3(data[1].x, data1[1].y, groundHeight ? groundHeight : this.doorGroundHeight),
-      new THREE.Vector3(data[2].x, data1[2].y, groundHeight ? groundHeight : this.doorGroundHeight),
+      new THREE.Vector3(data[0].x, data1[0].y, groundHeight),
+      new THREE.Vector3(data[1].x, data1[1].y, groundHeight),
+      new THREE.Vector3(data[2].x, data1[2].y, groundHeight),
       // 可以不是矩形
-      new THREE.Vector3(data[3].x, data1[3].y, groundHeight ? groundHeight : this.doorGroundHeight)
+      new THREE.Vector3(data[3].x, data1[3].y, groundHeight)
     ];
     const geometry = this.createParallelepipedFromBase(basePoints, 2.8);
     const geometry1 = this.createParallelepipedFromBase(basePoints1, Height ? Height : this.doorHeight);