build-dxf 0.1.107 → 0.1.108

package/package.json

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

package/src/build.js

@@ -9572,6 +9572,10 @@ const holeTypeMap = {
   passageEntrance: "WALL_HOLE",
   bay_window: "BAY_WINDOW"
 };
+const placeHoldersMap = {
+  switch: "开关",
+  socket: "插座"
+};
 const WALL_HEIGHT_KEY = /* @__PURE__ */ Symbol("height");
 class ThreeVJiaPipeline extends Pipeline {
   manager;
@@ -9604,17 +9608,10 @@ class ThreeVJiaPipeline extends Pipeline {
       if (lines2.length < 4) return lines2;
       let newLine = null;
       let wallWidth = 0;
-      const poly = Polygon.fromByLinePath(lines2).getMinimumBoundingRectangle();
-      if (poly) {
-        const len1 = poly[0].distance(poly[1]), len2 = poly[1].distance(poly[2]), direct = len1 > len2 ? poly[0].directionFrom(poly[1]) : poly[1].directionFrom(poly[2]), center = poly.getCenter(), len = Math.max(len1, len2);
-        newLine = center.expandAsLine(direct, len).translate(-len * 0.5, direct);
-        wallWidth = Math.min(len1, len2);
-      } else {
-        lines2 = [...lines2].sort((a2, b4) => a2.length() - b4.length());
-        const line1 = lines2[0], line2 = lines2[1];
-        newLine = new LineSegment(line1.center.clone(), line2.center.clone());
-        wallWidth = line1.length();
-      }
+      lines2 = [...lines2].sort((a2, b4) => a2.length() - b4.length());
+      const line1 = lines2[0], line2 = lines2[1];
+      newLine = new LineSegment(line1.center.clone(), line2.center.clone());
+      wallWidth = line1.length();
       mergeLineUserData(newLine, lines2);
       newLine.userData.wallWidth = wallWidth;
       return [newLine];
@@ -9795,13 +9792,13 @@ class ThreeVJiaPipeline extends Pipeline {
     const rooms = json.rooms, roomPloys = rooms.map((room) => new Polygon(room.polygon.map((p2) => Point.from(p2))));
     if (roomPloys.length === 0) return json;
     publicInfo.itemInfo.forEach((item, i) => {
-      if (item.category !== "switch" && item.category !== "socket") return;
+      if (!placeHoldersMap[item.category]) return;
       const itemPoly = new Polygon(item.contour.map((p2) => Point.from(p2).rotate(json.center, json.angle))), center = itemPoly.getCenter(), index2 = roomPloys.findIndex((poly) => poly.pointWithin(center));
       if (index2 < 0) return;
       json.placeHolders.push({
-        name: item.category,
-        polygon: item.contour,
-        direction: item.direction,
+        name: placeHoldersMap[item.category],
+        polygon: itemPoly.getMinimumBoundingRectangle().map((p2) => p2.toJson2D()),
+        direction: Point.from(item.direction).rotate(Point.zero(), json.angle),
         height: item.box.max.z - item.box.min.z,
         sillHeight: item.box.min.z - z,
         roomId: rooms[index2].roomTypeId,
@@ -11335,7 +11332,22 @@ function axisAlignCorr(lines, option, verticalReferenceLine) {
   }
   return lines;
 }
+function sparse(trajectory2, size2 = 0.4) {
+  const idSet = /* @__PURE__ */ new Set();
+  Object.keys(trajectory2 ?? {}).forEach((key) => {
+    const p2 = trajectory2[key], i = Math.round(p2.x / size2), j = Math.round(p2.y / size2), id = BigInt(i) << 32n | BigInt(j) & 0xffffffffn;
+    if (idSet.has(id)) {
+      delete trajectory2[key];
+      return;
+    }
+    idSet.add(id);
+  });
+}
 function init(lines, option) {
+  if (option.trajectory) {
+    sparse(option.trajectory, 0.2);
+    sparse(option.trajectory, 0.5);
+  }
   BuildGroup.doubleWall.setTrajectory(option.trajectory);
   lines = lines.map((line) => line.clone());
   return lines;

package/src/dxfSystem/plugins/index.d.ts

@@ -0,0 +1 @@
+export {};