build-dxf 0.1.130 → 0.1.133

package/package.json

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

@@ -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;
   }
@@ -22148,7 +22153,7 @@ class SceneAutoGenerat {
     await Promise.all(this.itemList.map(async (item) => await this.getModel(item)));
   }
   static itemParse(item) {
-    const contourData = item.contour ?? item.quadContour;
+    const contourData = item.quadContour ?? item.contour;
     if (!Array.isArray(contourData) || !contourData.length) return null;
     const contour = Point.fromByList(contourData ?? []), rectangle = new Polygon(Qa(contour.map((p2) => [p2.x, p2.y])).map((p2) => Point.from(p2)));
     rectangle.pop();
@@ -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;