build-dxf 0.0.66 → 0.0.67

package/package.json

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

package/src/build.d.ts

@@ -27,7 +27,7 @@ export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera,
  * @param originData
  * @param trajectory
  */
-export declare function getModels(originData: OriginalDataItem[], trajectory: any): Promise<{
+export declare function getModels(originData: OriginalDataItem[], trajectory: any, itemList: any): Promise<{
     obj: File;
     glb: File;
     gltf: File;
@@ -36,6 +36,7 @@ type HandleJsonOption = {
     /** json数据或路径 */
     json: string | OriginalDataItem[];
     trajectory?: string | Record<string, any>;
+    itemInfo?: string | Record<string, any>;
     axisAlignCorrOption?: SetDataOption;
     download?: {
         json?: string;

package/src/build.js

@@ -5441,7 +5441,7 @@ class BoundExt {
     lines = lines.filter((line) => {
       if (LineGroupType.hasType(line, "doubleWall")) return;
       if (line.userData.isDoor) {
-        if (!(vrLine.vertical(line, 5) || vrLine.parallel(line, 5))) return;
+        if (!(vrLine.vertical(line, 0.1) || vrLine.parallel(line, 0.1))) return;
       }
       const center = line.center;
       const set2 = /* @__PURE__ */ new Set();
@@ -13048,7 +13048,13 @@ class Scenario {
     const cube = new THREE.Mesh(geometry, material);
     const edges = new THREE.EdgesGeometry(geometry);
     new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
-    cube.name = num === 0 ? `双线墙${index2}` : `单线墙${index2}`;
+    if (num === 0) {
+      cube.name = `双线墙_${index2}`;
+      cube.userData.category = "doubleWall";
+    } else {
+      cube.name = `单线墙_${index2}`;
+      cube.userData.category = "wall";
+    }
     return cube;
   }
   // 执行偏移
@@ -13241,7 +13247,8 @@ class Scenario {
       menModel.rotation.y = angleRad;
       menModel.scale.set(distance / size.x, height / size.y, wallWidth / size.z);
       menModel.position.set(data.center.x, data.center.y, groundClearance);
-      menModel.name = `窗${index2}`;
+      menModel.name = `窗_${index2}`;
+      menModel.userData.category = "window";
       this.group.add(menModel);
     }
   }
@@ -13382,10 +13389,12 @@ class Scenario {
       menModel.rotation.x = Math.PI / 2;
       menModel.rotation.y = angleRad;
       menModel.scale.set(distance / size.x, (Height ? Height : this.doorHeight) / size.y, DEFAULT_WALL_WIDTH / size.z);
-      menModel.name = `门${index2}`;
+      menModel.name = `门_${index2}`;
+      menModel.userData.category = "door";
       this.group.add(menModel);
     }
-    result.name = `额墙${index2}`;
+    result.name = `额墙_${index2}`;
+    result.userData.category = "partitionWall";
     this.group.add(result);
   }
   // 确定偏移角度
@@ -13519,7 +13528,8 @@ class Scenario {
               new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
               this.installWindows(winDraw[x2], x2);
               let mesh = this.windowTreatment(winDraw[x2], Mesh2);
-              mesh.name = `单线墙${Number(x2) / 2}`;
+              mesh.name = `单线墙_${Number(x2) / 2}`;
+              mesh.userData.category = "wall";
               this.group.add(mesh);
             } else if (houMesh) {
               if (Number(x2) === winDraw.length - 1) {
@@ -13527,7 +13537,8 @@ class Scenario {
                 this.installWindows(winDraw[x2], x2);
                 new THREE.LineSegments(edges, new THREE.LineBasicMaterial({ color: 0 }));
                 let mesh = this.windowTreatment(winDraw[x2], houMesh);
-                mesh.name = `单线墙${Number(x2) / 2}`;
+                mesh.name = `单线墙_${Number(x2) / 2}`;
+                mesh.userData.category = "wall";
                 this.group.add(mesh);
               } else {
                 this.installWindows(winDraw[x2], x2);
@@ -13539,7 +13550,8 @@ class Scenario {
             }
           }
         } else {
-          Mesh2.name = `单线墙${Number(x) / 2}`;
+          Mesh2.name = `单线墙_${Number(x) / 2}`;
+          Mesh2.userData.category = "wall";
           this.group.add(Mesh2);
         }
       }
@@ -13668,13 +13680,22 @@ class LoadModel {
     return promise;
   }
 }
-LoadModel.addNameMap("water cooler", "饮水机");
+LoadModel.addNameMap("water cooler", "饮水机1");
 LoadModel.addNameMap("table", "桌子");
 LoadModel.addNameMap("chair", "椅子");
 LoadModel.addNameMap("switch", "开关");
 LoadModel.addNameMap("cabinet", "柜子");
 LoadModel.addNameMap("tv", "电视");
 LoadModel.addNameMap("socket", "插座");
+LoadModel.addNameMap("refrigerator", "冰箱");
+LoadModel.addNameMap("kitchen hood", "抽油烟机");
+LoadModel.addNameMap("toilet", "马桶");
+LoadModel.addNameMap("sofa", "沙发");
+LoadModel.addNameMap("the bed", "床");
+LoadModel.addNameMap("door", "门");
+LoadModel.addNameMap("window", "窗户");
+LoadModel.addNameMap("wall", "单线墙");
+LoadModel.addNameMap("doubleWall", "双线墙");
 let globalScenario;
 class SceneAutoGenerat {
   lines;
@@ -13704,23 +13725,61 @@ class SceneAutoGenerat {
   async init() {
     await this.buildWall();
     await this.buildItem();
-    this.buildPlane();
   }
   wallGroup = null;
   async buildWall() {
     this.wallGroup = await globalScenario.drawGraphics(this.lines, this.z, this.trajectory);
     this.scene.add(this.wallGroup);
   }
-  // 辅助函数：检测是否在距离阈值内
-  isCloseEnough(box3, wallBox, threshold) {
-    let dx = Math.max(0, Math.max(wallBox.min.x - box3.max.x, box3.min.x - wallBox.max.x));
-    let dy = Math.max(0, Math.max(wallBox.min.y - box3.max.y, box3.min.y - wallBox.max.y));
-    return dx <= threshold && dy <= threshold;
-  }
-  adsorption(walls, box3, proximityThreshold = 0.1) {
+  directs = [
+    [new THREE.Vector3(1, 0, 0), "x"],
+    [new THREE.Vector3(-1, 0, 0), "x"],
+    [new THREE.Vector3(0, 1, 0), "y"],
+    [new THREE.Vector3(0, -1, 0), "y"]
+    // [new THREE.Vector3(0, 0, 1), "z"],
+    // [new THREE.Vector3(0, 0, -1), "z"]
+  ];
+  adsorption(walls, box3, proximityThreshold = 0.05) {
+    let newPosition = new THREE.Vector3();
+    const center = box3.getCenter(new THREE.Vector3()), size = box3.getSize(new THREE.Vector3()), raycaster = new THREE.Raycaster(), keyMap = /* @__PURE__ */ new Map(), results = this.directs.map((item) => {
+      raycaster.set(center, item[0]);
+      raycaster.near = 1e-4;
+      raycaster.far = size[item[1]] * 0.5 + proximityThreshold;
+      const intersects = raycaster.intersectObjects(walls, true);
+      if (intersects.length) {
+        keyMap.set(intersects[0], item);
+        return intersects[0];
+      }
+      return;
+    }).filter((i) => !!i);
+    if (results.length) {
+      let closestIntersection = results[0];
+      results.forEach((result) => {
+        if (result.distance <= closestIntersection.distance) {
+          closestIntersection = result;
+        }
+      });
+      const info = keyMap.get(closestIntersection), key = info[1];
+      if (closestIntersection.face?.normal) {
+        const normal = new THREE.Vector3().copy(closestIntersection.face.normal).applyMatrix3(new THREE.Matrix3().getNormalMatrix(closestIntersection.object.matrixWorld));
+        newPosition.copy(closestIntersection.point).add(normal.clone().multiplyScalar(size[key] * 0.5));
+        box3.min.set(
+          newPosition.x - size.x * 0.5,
+          newPosition.y - size.y * 0.5,
+          newPosition.z - size.z * 0.5
+        );
+        box3.max.set(
+          newPosition.x + size.x * 0.5,
+          newPosition.y + size.y * 0.5,
+          newPosition.z + size.z * 0.5
+        );
+      }
+    }
   }
   async buildItem() {
+    const walls = [];
     this.wallGroup?.traverse((object) => {
+      if (object instanceof THREE.Mesh) walls.push(object);
     });
     this.itemList.forEach(async (item) => {
       let model = await LoadModel.loadGlb(item.category);
@@ -13729,8 +13788,13 @@ class SceneAutoGenerat {
           new THREE.Vector3().copy(item.box.min),
           new THREE.Vector3().copy(item.box.max)
         );
+        let angle = 0;
+        if (["socket", "switch"].includes(item.category)) {
+          angle = this.adsorption(walls, containerBox3) ?? 0;
+        }
+        model.name = `${item.category}_${THREE.MathUtils.randFloat(0, 16777215).toString(16)}`;
+        model.userData.category = item.category;
         const containerSize = containerBox3.getSize(new THREE.Vector3());
-        this.scene.add(new THREE.Box3Helper(containerBox3));
         const box3 = new THREE.Box3();
         model = model.clone(true);
         model.rotateX(Math.PI * 0.5);
@@ -13745,9 +13809,9 @@ class SceneAutoGenerat {
         });
         model.scale.set(containerSize.x / size.x, containerSize.z / size.z, containerSize.y / size.y);
         const group2 = new THREE.Group();
-        group2.position.copy(item.position);
+        containerBox3.getCenter(group2.position);
+        group2.rotation.z = angle;
         group2.add(model);
-        group2.add(new THREE.Mesh(new THREE.SphereGeometry(0.01), new THREE.MeshBasicMaterial({ color: 16711680 })));
         box3.setFromObject(group2);
         box3.getSize(size);
         group2.position.z -= size.z * 0.5;
@@ -13789,6 +13853,13 @@ class WhiteModel extends Component {
   originalWhiteMode = new THREE.Group();
   material = new THREE.MeshStandardMaterial({ color: 16777215, transparent: true, opacity: 0.8, side: THREE.DoubleSide });
   itemList = [];
+  /** 设置物品列表
+   * @param itemList 
+   */
+  setItemList(itemList) {
+    if (Array.isArray(itemList)) this.itemList = itemList;
+    else if ("itemInfo" in itemList) this.itemList = itemList.itemInfo;
+  }
   onAddFromParent(parent) {
     this.Dxf = parent.findComponentByName("Dxf");
     this.Variable = parent.findComponentByName("Variable");
@@ -14174,7 +14245,11 @@ async function createEditor(dom, camera, orbitControls = false, viewPermission)
     getFileAll: () => getFileAll(dxfSystem)
   };
 }
-async function getModels(originData, trajectory) {
+async function getModels(originData, trajectory, itemList) {
+  if ("itemInfo" in itemList) itemList = itemList.itemInfo;
+  if (!Array.isArray(itemList)) {
+    itemList = [];
+  }
   const { lineSegments, originalZAverage } = originalDataToLineData(originData);
   const lines = BoundExt.boundExtbyTraj({
     lines: lineSegments,
@@ -14182,8 +14257,9 @@ async function getModels(originData, trajectory) {
     updateDoubleWallGroup: true,
     wallWidth: DEFAULT_WALL_WIDTH
   }).lines;
-  const scenario0 = new Scenario(new THREE.Scene(), {}, {}, {});
-  const model = await scenario0.drawGraphics(lines, originalZAverage, trajectory);
+  const sceneAutoGenerat = new SceneAutoGenerat(lines, itemList, originalZAverage, trajectory);
+  await sceneAutoGenerat.init();
+  const model = sceneAutoGenerat.scene;
   const whiteModel = new WhiteModel();
   whiteModel.whiteModelGroup.add(model);
   const obj = new File([await whiteModel.toOBJBlob() || ""], "model.obj", { type: "application/octet-stream" });
@@ -14198,7 +14274,7 @@ async function getModels(originData, trajectory) {
 async function buildJson(opt) {
   const mp = await Promise.resolve().then(() => index);
   const dxfSystem = new DxfSystem();
-  let { json, trajectory, axisAlignCorrOption, download } = opt;
+  let { json, trajectory, axisAlignCorrOption, download, itemInfo } = opt;
   dxfSystem.usePlugin(mp.ModelDataPlugin);
   const whiteModel = dxfSystem.findComponentByType(mp.components.WhiteModel);
   const threeVJia = dxfSystem.findComponentByName("ThreeVJia");
@@ -14217,6 +14293,20 @@ async function buildJson(opt) {
     }
     dxfSystem.CorrectionDxf.setTrajectory(trajectory);
   }
+  if (itemInfo) {
+    if (typeof itemInfo === "string") {
+      if (typeof global !== "undefined") {
+        const packageName = "fs";
+        const { default: fs } = await import(
+          /* @vite-ignore */
+          packageName
+        );
+        const buffer = fs.readFileSync(itemInfo);
+        itemInfo = JSON.parse(buffer.toString("utf-8"));
+      } else throw new Error("非node环境不允许使用路径");
+    }
+    whiteModel?.setItemList(itemInfo);
+  }
   await dxfSystem.Dxf.axisAlignCorr({
     groupMethod: "cross",
     fittingMethod: "max",

package/src/index.js

@@ -1,6 +1,7 @@
 import "three";
 import { l, D, m, i, o, g, j, k, h, n } from "./build.js";
 import "clipper-lib";
+import "three-bvh-csg";
 export {
   l as Dxf,
   D as DxfSystem,

package/src/utils/DxfSystem/plugin/ModelDataPlugin/components/WhiteModel.d.ts

@@ -16,6 +16,10 @@ export declare class WhiteModel extends Component<{
     originalWhiteMode: THREE.Group<THREE.Object3DEventMap>;
     material: THREE.MeshStandardMaterial;
     itemList: any[];
+    /** 设置物品列表
+     * @param itemList
+     */
+    setItemList(itemList: any): void;
     onAddFromParent(parent: ComponentManager): void;
     updateModel(): Promise<void>;
     /**

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

@@ -12,7 +12,7 @@ export declare class SceneAutoGenerat {
     init(): Promise<void>;
     wallGroup: Group | null;
     buildWall(): Promise<void>;
-    isCloseEnough(box3: THREE.Box3, wallBox: THREE.Box3, threshold: number): boolean;
+    directs: [THREE.Vector3, string][];
     adsorption(walls: THREE.Mesh[], box3: THREE.Box3, proximityThreshold?: number): void;
     buildItem(): Promise<void>;
 }

package/src/utils/fff.d.ts

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