three-base 2.0.94 → 2.0.96

package/InstancedMeshBase.js

@@ -57,9 +57,6 @@ export default class InstancedMeshBase extends MeshBase {
                 return modelurl;
             }
         })();
-        if (this.url === modelurl) {
-            return;
-        }
         this.url = modelurl;
         if (!url) {
             this.clear();

package/MeshBase.js

@@ -57,9 +57,6 @@ export default class MeshBase extends Group {
                 return modelurl;
             }
         })();
-        if (this.url === modelurl) {
-            return;
-        }
         this.url = modelurl;
         if (!modelurl) {
             this.clear();

package/package.json

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

package/threeLoader.js

@@ -22,10 +22,10 @@ import dracoWasmWrapperJS from "./lib/draco/draco_wasm_wrapper.js?url";
 import dracoDecoderJS from "./lib/draco/draco_decoder.js?url";
 //@ts-ignore
 import axios from "axios";
+import { isArray, isEmpty, isNull, isString, isUndefined } from "lodash";
+import { generateUUID } from "three/src/math/MathUtils";
 import dracoDecoderWASM from "./lib/draco/draco_decoder.wasm?url";
 import threeUtils from "./threeUtils";
-import { generateUUID } from "three/src/math/MathUtils";
-import { isEmpty, isString } from "lodash";
 // 加载器
 class ThreeLoader extends EventDispatcher {
     constructor() {
@@ -181,7 +181,10 @@ class ThreeLoader extends EventDispatcher {
     }
     /** 加载模型支持glb,gltf,fbx,stl,obj,usdz,dae,zip */
     async loadModel(url, filename = "") {
-        if (isEmpty(url)) {
+        if ((isString(url) || isArray(url)) &&
+            isEmpty(url) &&
+            isUndefined(url) &&
+            isNull(url)) {
             throw new Error(`loadModel:无效的参数 url=${url}`);
         }
         // 本次需要销毁的bloburl,加载完成后就去销毁本次的文件