three-base 2.0.91 → 2.0.93

package/InstancedMeshBase.js

@@ -39,7 +39,16 @@ export default class InstancedMeshBase extends MeshBase {
             }
             else if (url instanceof Array) {
                 let modelurl = "";
-                const suffixs = ["obj", "glb", "gltf", "fbx", "dae", "stl", "usdz"];
+                const suffixs = [
+                    "zip",
+                    "obj",
+                    "glb",
+                    "gltf",
+                    "fbx",
+                    "dae",
+                    "stl",
+                    "usdz",
+                ];
                 for (let file of url) {
                     if (suffixs.includes(threeUtils.getSuffix(file.name))) {
                         modelurl = file.name;

package/MeshBase.js

@@ -39,7 +39,16 @@ export default class MeshBase extends Group {
             }
             else if (url instanceof Array) {
                 let modelurl = "";
-                const suffixs = ["obj", "glb", "gltf", "fbx", "dae", "stl", "usdz"];
+                const suffixs = [
+                    "zip",
+                    "obj",
+                    "glb",
+                    "gltf",
+                    "fbx",
+                    "dae",
+                    "stl",
+                    "usdz",
+                ];
                 for (let file of url) {
                     if (suffixs.includes(threeUtils.getSuffix(file.name))) {
                         modelurl = file.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-base",
-  "version": "2.0.91",
+  "version": "2.0.93",
   "description": "three 3d three-base",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/threeLoader.js

@@ -25,7 +25,7 @@ import axios from "axios";
 import dracoDecoderWASM from "./lib/draco/draco_decoder.wasm?url";
 import threeUtils from "./threeUtils";
 import { generateUUID } from "three/src/math/MathUtils";
-import { isString } from "lodash";
+import { isEmpty, isString } from "lodash";
 // 加载器
 class ThreeLoader extends EventDispatcher {
     constructor() {
@@ -181,6 +181,9 @@ class ThreeLoader extends EventDispatcher {
     }
     /** 加载模型支持glb,gltf,fbx,stl,obj,usdz,dae,zip */
     async loadModel(url, filename = "") {
+        if (isEmpty(url)) {
+            throw new Error(`loadModel:无效的参数 url=${url}`);
+        }
         // 本次需要销毁的bloburl,加载完成后就去销毁本次的文件
         const revokeObjectfile = [];
         // 获取模型文件的后缀
@@ -193,7 +196,16 @@ class ThreeLoader extends EventDispatcher {
             }
             else if (url instanceof Array) {
                 let suffix = "";
-                const suffixs = ["obj", "glb", "gltf", "fbx", "dae", "stl", "usdz"];
+                const suffixs = [
+                    "zip",
+                    "obj",
+                    "glb",
+                    "gltf",
+                    "fbx",
+                    "dae",
+                    "stl",
+                    "usdz",
+                ];
                 for (let file of url) {
                     suffix = threeUtils.getSuffix(file.name);
                     if (suffixs.includes(suffix)) {
@@ -216,13 +228,23 @@ class ThreeLoader extends EventDispatcher {
             }
             else if (url instanceof Array) {
                 let modelurl = "";
-                const suffixs = ["obj", "glb", "gltf", "fbx", "dae", "stl", "usdz"];
+                const suffixs = [
+                    "zip",
+                    "obj",
+                    "glb",
+                    "gltf",
+                    "fbx",
+                    "dae",
+                    "stl",
+                    "usdz",
+                ];
                 for (let file of url) {
                     const bloburl = await threeUtils.fileToBloburl(file);
                     this._blobs[file.name] = bloburl;
                     revokeObjectfile.push(file.name);
                     if (suffixs.includes(threeUtils.getSuffix(file.name))) {
                         modelurl = file.name;
+                        break;
                     }
                 }
                 return modelurl;
@@ -237,7 +259,9 @@ class ThreeLoader extends EventDispatcher {
                         responseType: "arraybuffer",
                     })
                         .then((res) => res.data)
-                    : url;
+                    : url instanceof File
+                        ? url
+                        : url[0];
                 return await JSZip.loadAsync(arrayBuffer).then(async (zip) => {
                     for (let filename in zip.files) {
                         if (!zip.files[filename].dir) {