build-dxf 0.1.131 → 0.1.133

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.131",
+  "version": "0.1.133",
   "description": "",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -10545,24 +10545,29 @@ class ThreeVJiaPipeline extends Pipeline {
         console.warn(`第${i}个物品轮廓为空`);
         return;
       }
-      const itemPoly = new Polygon(
+      let itemPoly = new Polygon(
         contour.map((p2) => Point.from(p2).rotate(json.center, json.angle))
-      ), center = itemPoly.getCenter(), index2 = roomPloys.findIndex((poly) => poly.pointWithin(center));
+      );
+      const center = itemPoly.getCenter(), index2 = roomPloys.findIndex((poly) => poly.pointWithin(center));
       if (index2 < 0) return;
       try {
-        const rect = itemPoly.getMinimumBoundingRectangle().map((p2) => p2.toJson2D());
-        json.placeHolders.push({
-          name: placeHoldersMap[item.category],
-          polygon: rect,
-          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,
-          id: i
-        });
+        let newR = itemPoly.getMinimumBoundingRectangle();
+        if (newR) itemPoly = newR;
       } catch (error) {
-        console.warn(`第${i}个物品解析异常`);
-      }
+        console.warn(`第${i}个物品 转四边形错误`);
+      }
+      const direction = Point.from(item.direction).normalize().rotate(Point.zero(), json.angle);
+      if (itemPoly[1].distanceSquared(itemPoly[0]) < itemPoly[2].distanceSquared(itemPoly[1])) itemPoly.reverse();
+      const rect = itemPoly.map((p2) => p2.toJson2D());
+      json.placeHolders.push({
+        name: placeHoldersMap[item.category],
+        polygon: rect,
+        direction: direction.toJson2D(),
+        height: item.box.max.z - item.box.min.z,
+        sillHeight: item.box.min.z - z,
+        roomId: rooms[index2].roomTypeId,
+        id: i
+      });
     });
     return json;
   }
@@ -22966,6 +22971,8 @@ class ThreeVJia extends Component {
     angleCorrectionDxf.addEventListener("cadChange", async () => {
       this.neededUpdate = true;
       this.trajectory = angleCorrectionDxf.options.trajectory;
+      const json = ThreeVJiaPipeline.appendPlaceHolders(this.toJson(), angleCorrectionDxf.options.publicInfo, angleCorrectionDxf.options.originalZ);
+      console.log(json);
     });
   }
   cacheJson;