build-dxf 0.1.151 → 0.1.152

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "build-dxf",
-  "version": "0.1.151",
-  "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.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"
+}

package/src/build.js

@@ -22885,40 +22885,35 @@ function doorToHole(lines, option) {
   });
   return lines;
 }
+function getBeamNearWallVec(line) {
+  const iterator = WallHole.getIterator(line);
+  for (const hole of iterator) {
+    if ("beamNearWallVec" in hole) return Point.from(hole.beamNearWallVec);
+  }
+}
 function beamSupportLine(lines, {}) {
   const lsh = Quadtree.from(lines);
-  const filter = (line, targetLine) => {
-    if (targetLine === line) return false;
-    if (!targetLine.isParallelTo(targetLine, 10)) return false;
-    const len = line.projectLineSegment(targetLine).length;
-    if (len < 1e-3) return false;
-    return true;
-  };
-  const get2 = (line, direct) => {
-    const startRes = lsh.raycast(line.start, direct, 1e-5, 1).filter(({ targetLine }) => filter(line, targetLine));
-    if (!startRes.length) return;
-    const endRes = lsh.raycast(line.end, direct, 1e-5, 1).filter(({ targetLine }) => filter(line, targetLine));
-    if (!endRes.length) return;
-    const start = startRes[0], end = endRes[0], [p1, p2] = start.distance < end.distance ? [line.start, start.intersectPoint] : [line.end, end.intersectPoint], dir = p2.directionFrom(p1), width = p1.distance(p2);
-    return { dir, width };
-  };
   lines.forEach((line) => {
     if (WallHole.isBeam(line)) {
       const findLine = line.clone();
-      findLine.setLength(findLine.length - 2e-4);
-      const result = (() => {
-        const normal = findLine.normal();
-        const n_normal = normal.clone().multiplyScalar(-1);
-        let result1 = get2(findLine, normal);
-        let result2 = get2(findLine, n_normal);
-        if (result1 && result2) return result1.width < result2.width ? result1 : result2;
-        if (result1) return result1;
-        if (result2) return result2;
-      })();
-      if (result) {
-        const { width, dir } = result;
-        line.userData.expansionWidth = width;
-        line.userData.expansionDirction = dir.toJson2D();
+      findLine.setLength(findLine.length - 4e-3);
+      let rectangle = line.toRectangle(2, "butt");
+      const center = findLine.center;
+      const beamNearWallVec = getBeamNearWallVec(line);
+      const list = lsh.queryRect(rectangle).filter((target) => {
+        if (target.line === line) return false;
+        if (!target.line.isParallelTo(findLine, 10)) return false;
+        if (beamNearWallVec) {
+          const dir = target.line.center.directionFrom(center);
+          if (dir.dot(beamNearWallVec) < 0) return false;
+        }
+        return true;
+      }).map((item) => item.line).sort((a2, b4) => a2.distanceToPoint(center) - b4.distanceToPoint(center));
+      if (list.length) {
+        const line2 = list[0];
+        const point2 = line2.projectPoint(center, false);
+        line.userData.expansionWidth = point2.distance(center);
+        line.userData.expansionDirction = point2.directionFrom(center);
       }
     }
   });