build-dxf 0.0.13 → 0.0.14

package/README.md

@@ -27,7 +27,9 @@ detailsPoint.addEventListener("handleSuccess", () => {
     // 下载dxf文件
     dxfSystem.Dxf.download("01.dxf")
     // 下载白模，obj格式
-    whiteModel.download("001.obj")
+    whiteModel.downloadOBJ("001.obj")
+    // 下载白模，gltf或glb格式, 第二个参数为true时是glb，默认为true
+    whiteModel.downloadGltf("001.obj", true)
 
     // desPoints 为射线点集合，根据需要使用
     console.log("handleSuccess", detailsPoint.desPoints)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -38,7 +38,8 @@
     "three-bvh-csg": ">=0.0.17",
     "three-csg-ts": ">=3.2.0",
     "@tweenjs/tween.js": ">=25.0.0",
-    "vue": ">=3.0.0"
+    "vue": ">=3.0.0",
+    "obj2gltf": ">=3.1.6"
   },
   "author": "夏过初秋",
   "license": "ISC"

package/src/build.js

@@ -757,6 +757,18 @@ class LineSegment {
     );
   }
 }
+async function include(path, exportDefault = true) {
+  if (typeof global !== "undefined" && typeof require !== "undefined") {
+    return require(path);
+  } else {
+    let pack = await import(
+      /* @vite-ignore */
+      path
+    );
+    if (exportDefault) pack = pack.default;
+    return pack;
+  }
+}
 const units = {
   Unitless: 1,
   // 无单位，1米 = 1（无单位）
@@ -1204,11 +1216,7 @@ class Dxf extends Component {
       a.download = filename + ".dxf";
       a.click();
     } else if (typeof global !== "undefined") {
-      const packageName = "fs";
-      const { default: fs } = await import(
-        /* @vite-ignore */
-        packageName
-      );
+      const fs = await include("fs", false);
       fs.writeFileSync(filename, this.toDxfString(unit));
     }
   }
@@ -2012,11 +2020,10 @@ class WhiteModel extends Component {
         depth: 2.8,
         bevelSize: 0
       });
-      const mesh = new THREE.Mesh(geometry);
-      mesh.material = this.material;
+      const mesh = new THREE.Mesh(geometry, this.material);
       this.whiteModelGroup.add(mesh);
       this.whiteModelLineGroup.add(
-        new THREE.LineSegments(new THREE.EdgesGeometry(geometry), new THREE.LineBasicMaterial({ color: 6710886 }))
+        new THREE.LineSegments(new THREE.EdgesGeometry(geometry), new THREE.LineBasicMaterial({ color: 0 }))
       );
     });
     const walls = dxf.originalData.map(({ start, end, insetionArr }) => {
@@ -2049,41 +2056,87 @@ class WhiteModel extends Component {
       whiteModelGroup: this.whiteModelGroup
     });
   }
+  /**
+   * 转为obj
+   * @returns 
+   */
   toOBJ() {
     return new Promise((resolve) => {
-      resolve(exporter.parse(this.whiteModelGroup));
+      this.material.opacity = 1;
+      this.material.needsUpdate = true;
+      setTimeout(() => {
+        resolve(exporter.parse(this.whiteModelGroup));
+        this.material.opacity = 0.8;
+        this.material.transparent = true;
+      }, 20);
     });
   }
-  toGlb() {
+  /**
+   * 转为 glb
+   * @param binary 
+   * @returns 
+   */
+  toGltf(binary = true) {
     return new Promise((resolve) => {
       this.material.opacity = 1;
       this.material.needsUpdate = true;
-      setTimeout(() => {
-        glbExporter.parse(this.whiteModelGroup.children, (gltf) => {
-          resolve(gltf);
-          this.material.opacity = 0.8;
-          this.material.transparent = true;
-        }, () => {
-          resolve(void 0);
-        }, {
-          binary: true
-        });
-      }, 100);
+      setTimeout(async () => {
+        if (typeof window === "object") {
+          glbExporter.parse(this.whiteModelGroup.children, (gltf) => {
+            resolve(gltf);
+            this.material.opacity = 0.8;
+            this.material.transparent = true;
+          }, () => {
+            resolve(void 0);
+          }, {
+            binary
+          });
+        } else if (typeof global !== "function") {
+          try {
+            const obj2gltf = await include("obj2gltf", true);
+            const fs = await include("fs", false);
+            const obj = await this.toOBJ();
+            fs.writeFileSync(this.uuid, obj);
+            const result = await obj2gltf(this.uuid, {
+              binary
+            });
+            fs.unlinkSync(this.uuid);
+            if (binary) resolve(result);
+            else resolve(JSON.stringify(result));
+          } catch (error) {
+            resolve(void 0);
+            console.log(error);
+          }
+        }
+      }, 20);
     });
   }
+  /**
+   * 转为 OBJBlob
+   * @returns 
+   */
   async toOBJBlob() {
     const buffer = await this.toOBJ();
     if (buffer) {
       return new Blob([buffer], { type: "application/octet-stream" });
     }
   }
-  async toGlbBlob() {
-    const buffer = await this.toGlb();
+  /**
+   * 转为 GltfBlob
+   * @returns 
+   */
+  async toGltfBlob(binary = true) {
+    const buffer = await this.toGltf(binary);
     if (buffer) {
       return new Blob([buffer], { type: "application/octet-stream" });
     }
   }
-  async download(filename) {
+  /**
+   * 下载 OBJ
+   * @param filename 
+   * @returns 
+   */
+  async downloadOBJ(filename) {
     if (typeof window !== "undefined") {
       const blob = await this.toOBJBlob();
       if (!blob) return;
@@ -2094,32 +2147,29 @@ class WhiteModel extends Component {
     } else if (typeof global !== "undefined") {
       const buffer = await this.toOBJ();
       if (buffer) {
-        const packageName = "fs";
-        const { default: fs } = await import(
-          /* @vite-ignore */
-          packageName
-        );
+        const fs = await include("fs", false);
         fs.writeFileSync(filename, buffer);
       }
     }
   }
-  async downloadGlb(filename) {
+  /**
+   * 下载 Gltf
+   * @param filename 
+   * @returns 
+   */
+  async downloadGltf(filename, binary = true) {
     if (typeof window !== "undefined") {
-      const blob = await this.toGlbBlob();
+      const blob = await this.toGltfBlob(binary);
       if (!blob) return;
       const a = document.createElement("a");
       a.href = URL.createObjectURL(blob);
       a.download = filename;
       a.click();
     } else if (typeof global !== "undefined") {
-      const buffer = await this.toOBJ();
+      const buffer = await this.toGltf(binary);
       if (buffer) {
-        const packageName = "fs";
-        const { default: fs } = await import(
-          /* @vite-ignore */
-          packageName
-        );
-        fs.writeFileSync(filename, buffer);
+        const fs = await include("fs", false);
+        fs.writeFileSync(filename, binary ? buffer : Buffer.from(buffer));
       }
     }
   }

package/src/index2.js

@@ -7307,7 +7307,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(unref(ElButton), {
               size: "small",
               type: "primary",
-              onClick: _cache[1] || (_cache[1] = ($event) => unref(whiteModel).downloadGlb("test.glb"))
+              onClick: _cache[1] || (_cache[1] = ($event) => unref(whiteModel).downloadGltf("test.glb"))
             }, {
               default: withCtx(() => _cache[7] || (_cache[7] = [
                 createTextVNode(" 下载 白模 ", -1)

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

@@ -17,10 +17,37 @@ export declare class WhiteModel extends Component<{
     material: THREE.MeshBasicMaterial;
     onAddFromParent(parent: ComponentManager): void;
     updateModel(): void;
+    /**
+     * 转为obj
+     * @returns
+     */
     toOBJ(): Promise<string>;
-    toGlb(): Promise<ArrayBuffer | undefined>;
+    /**
+     * 转为 glb
+     * @param binary
+     * @returns
+     */
+    toGltf(binary?: boolean): Promise<string | ArrayBuffer | undefined>;
+    /**
+     * 转为 OBJBlob
+     * @returns
+     */
     toOBJBlob(): Promise<Blob | undefined>;
-    toGlbBlob(): Promise<Blob | undefined>;
-    download(filename: string): Promise<void>;
-    downloadGlb(filename: string): Promise<void>;
+    /**
+     * 转为 GltfBlob
+     * @returns
+     */
+    toGltfBlob(binary?: boolean): Promise<Blob | undefined>;
+    /**
+     * 下载 OBJ
+     * @param filename
+     * @returns
+     */
+    downloadOBJ(filename: string): Promise<void>;
+    /**
+     * 下载 Gltf
+     * @param filename
+     * @returns
+     */
+    downloadGltf(filename: string, binary?: boolean): Promise<void>;
 }

package/src/utils/include.d.ts

@@ -0,0 +1 @@
+export declare function include(path: string, exportDefault?: boolean): Promise<any>;