build-dxf 0.1.152 → 0.1.153

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "build-dxf",
-  "version": "0.1.152",
-  "description": "",
-  "main": "./src/index.js",
-  "types": "./src/index.d.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "exports": {
-    ".": {
-      "import": {
-        "types": "./src/build.d.ts",
-        "default": "./src/index.js",
-        "style": "./src/index.css"
-      },
-      "require": {
-        "types": "./src/build.d.ts",
-        "default": "./src/index.js"
-      }
-    },
-    "./RenderPlugin": {
-      "import": {
-        "types": "./src/utils/DxfSystem/plugin/RenderPlugin/index.d.ts",
-        "default": "./src/index2.js"
-      },
-      "require": {
-        "types": "./src/index.d.ts",
-        "default": "./src/index2.js"
-      }
-    },
-    "./index.css": "./src/index.css"
-  },
-  "style": "src/index.css",
-  "dependencies": {
-    "@tweenjs/tween.js": ">=25.0.0",
-    "clipper-lib": ">=6.4.2",
-    "dxf-writer": ">=1.18.4",
-    "vue": ">=3.0.0",
-    "canvas": "3.2.0",
-    "three-mesh-bvh": "^0.6.6",
-    "three-bvh-csg": ">=0.0.17",
-    "three-csg-ts": ">=3.2.0",
-    "three": ">=0.181.0",
-    "node-three-gltf": "2.1.0"
-  },
-  "author": "夏过初秋",
-  "license": "UNLICENSED"
-}
+{
+  "name": "build-dxf",
+  "version": "0.1.153",
+  "description": "",
+  "main": "./src/index.js",
+  "types": "./src/index.d.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./src/build.d.ts",
+        "default": "./src/index.js",
+        "style": "./src/index.css"
+      },
+      "require": {
+        "types": "./src/build.d.ts",
+        "default": "./src/index.js"
+      }
+    },
+    "./RenderPlugin": {
+      "import": {
+        "types": "./src/utils/DxfSystem/plugin/RenderPlugin/index.d.ts",
+        "default": "./src/index2.js"
+      },
+      "require": {
+        "types": "./src/index.d.ts",
+        "default": "./src/index2.js"
+      }
+    },
+    "./index.css": "./src/index.css"
+  },
+  "style": "src/index.css",
+  "dependencies": {
+    "@tweenjs/tween.js": ">=25.0.0",
+    "clipper-lib": ">=6.4.2",
+    "dxf-writer": ">=1.18.4",
+    "vue": ">=3.0.0",
+    "canvas": "3.2.0",
+    "three-mesh-bvh": "^0.6.6",
+    "three-bvh-csg": ">=0.0.17",
+    "three-csg-ts": ">=3.2.0",
+    "three": ">=0.181.0",
+    "node-three-gltf": "2.1.0"
+  },
+  "author": "夏过初秋",
+  "license": "UNLICENSED"
+}

package/src/build.js

@@ -12667,8 +12667,18 @@ class BayWindow {
           }
         }
       }
-      this.bayWindowGroup.name = `飘窗_${i}`;
+      const num = Number(i) + 1;
+      this.bayWindowGroup.name = `飘窗_${num}`;
       this.bayWindowGroup.userData.category = "bayWindow";
+      this.bayWindowGroup.userData.width = data[i].data.windowWidth;
+      this.bayWindowGroup.userData.height = data[i].data.height2;
+      this.bayWindowGroup.userData.groundHeight = data[i].data.height3;
+      this.bayWindowGroup.userData.distanceToTheTop = data[i].data.height1;
+      for (const w in data[i].lines) {
+        if (data[i].lines[w].userData.isWindow) {
+          this.bayWindowGroup.userData.depth = data[i].dottedLine.distanceToSegment(data[i].lines[w]);
+        }
+      }
       Scenario.Instance.group.add(this.bayWindowGroup);
     }
   }
@@ -13455,8 +13465,8 @@ class BayWindow {
     let height2 = Scenario.Instance.height + objData.height3 + objData.height2;
     mesh.position.z = height1;
     mesh2.position.z = height2;
-    Scenario.Instance?.group.add(mesh);
-    Scenario.Instance?.group.add(mesh2);
+    this.bayWindowGroup.add(mesh);
+    this.bayWindowGroup.add(mesh2);
   }
   // 共用线处理
   // sharedLineProcessing(sharedLine: any, data: any) {
@@ -14259,6 +14269,11 @@ class Scenario {
   installBalconys(data, index2) {
     let balconyGroup = new Group$1();
     balconyGroup.name = `阳台${index2}`;
+    balconyGroup.userData.category = "balcony";
+    balconyGroup.userData.height = data.userData.height;
+    balconyGroup.userData.width = data.length;
+    balconyGroup.userData.depth = 0;
+    balconyGroup.userData.groundHeight = 0;
     const point1 = new THREE.Vector3(data.start.x, data.start.y, 0);
     const point2 = new THREE.Vector3(data.end.x, data.end.y, 0);
     new THREE.Vector3(data.center.x, data.center.y, 0);
@@ -14282,7 +14297,7 @@ class Scenario {
         menModel.scale.set(distance2 / size2.x, height / size2.y, wallWidth / size2.z);
         menModel.position.set(data.center.x, data.center.y, this.height);
         menModel.name = `阳台_${index2}`;
-        menModel.userData.category = "balcony";
+        menModel.userData.category = "balcony_";
         balconyGroup.add(menModel);
         this.group.add(balconyGroup);
       }
@@ -14317,7 +14332,7 @@ class Scenario {
         balconyModel.scale.set(spacing / size2.x, height / size2.y, wallWidth / size2.z);
         balconyModel.position.set(center.x, center.y, this.height);
         balconyModel.name = `阳台_${index2}`;
-        balconyModel.userData.category = "balcony";
+        balconyModel.userData.category = "balcony_";
         balconyGroup.add(balconyModel);
       }
       this.group.add(balconyGroup);
@@ -14751,14 +14766,28 @@ class Scenario {
   }
   // 生成梁模型
   generateBeamModel(line) {
-    if (!line.userData.expansionDirction) return null;
-    const directionX = line.userData.expansionDirction.x * line.userData.expansionWidth;
-    const directionY = line.userData.expansionDirction.y * line.userData.expansionWidth;
-    let pointStart = new THREE.Vector3(line.start.x, line.start.y, this.height);
-    let pointEnd = new THREE.Vector3(line.end.x, line.end.y, this.height);
-    let startExpansion = new THREE.Vector3(pointStart.x + directionX, pointStart.y + directionY, this.height);
-    let endExpansion = new THREE.Vector3(pointEnd.x + directionX, pointEnd.y + directionY, this.height);
-    const basePoints = [pointStart, pointEnd, endExpansion, startExpansion];
+    let basePoints;
+    if (!line.userData.expansionWidth) {
+      let wallWidth;
+      if (line.userData.wallWidth) {
+        wallWidth = line.userData.wallWidth;
+      } else {
+        wallWidth = 0.06;
+      }
+      const MobileX = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, wallWidth, true);
+      const MobileY = this.angleToXAxisDegrees(line.start.x, line.start.y, line.end.x, line.end.y, wallWidth, false);
+      let startingPoint = this.xinLine(MobileX, MobileY, line.start, 0);
+      let finishLine = this.xinLine(MobileX, MobileY, line.end, 1);
+      basePoints = [startingPoint[0], startingPoint[1], finishLine[1], finishLine[0]];
+    } else {
+      const directionX = line.userData.expansionDirction.x * line.userData.expansionWidth;
+      const directionY = line.userData.expansionDirction.y * line.userData.expansionWidth;
+      let pointStart = new THREE.Vector3(line.start.x, line.start.y, this.height);
+      let pointEnd = new THREE.Vector3(line.end.x, line.end.y, this.height);
+      let startExpansion = new THREE.Vector3(pointStart.x + directionX, pointStart.y + directionY, this.height);
+      let endExpansion = new THREE.Vector3(pointEnd.x + directionX, pointEnd.y + directionY, this.height);
+      basePoints = [pointStart, pointEnd, endExpansion, startExpansion];
+    }
     const geometry = this.createParallelepipedFromBase(basePoints, line.userData.height);
     const material = new THREE.MeshStandardMaterial({
       // color: 0x4f90d4,

package/src/utils/modelScenario/scenario.d.ts

@@ -74,7 +74,7 @@ export default class Scenario {
     overhangWallOffset(data: any, index: string, height: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
     dashedLineCeilingTreatment(data: any, index: number | string, item: any): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
     overallTreatmentOfSingleLineWalls(data: any): void;
-    generateBeamModel(line: any): Brush | null;
+    generateBeamModel(line: any): Brush;
     generateColumnModel(data: any, lines: any, Height: number): THREE.Mesh<THREE.ExtrudeGeometry, THREE.MeshStandardMaterial, THREE.Object3DEventMap> | null;
     createAPlane(lines: LineSegment<Record<string, any>>[], menList: LineSegment<Record<string, any>>[]): void;
     modelLoader(): Promise<void>;