@xviewer.js/core 1.0.0-alpha.54 → 1.0.0-alpha.55

package/dist/main.js

@@ -4255,28 +4255,6 @@ class ResourceManager {
         let str = path.split("/").pop();
         return ext ? str.replace("." + ext, "") : str;
     }
-    static _parseURL(uri) {
-        let url = "";
-        let file = null;
-        let ext = "";
-        if (typeof File !== "undefined" && uri instanceof File) {
-            url = uri.name;
-            ext = ResourceManager.extension(url);
-            file = uri;
-        } else if (typeof uri === "object") {
-            url = uri.mainFile.name;
-            ext = ResourceManager.extension(url);
-            file = uri;
-        } else {
-            url += uri;
-            ext = ResourceManager.extension(url);
-        }
-        return {
-            url,
-            file,
-            ext
-        };
-    }
     static _getTextureKey(url, settings) {
         let keys = [
             url
@@ -4311,9 +4289,9 @@ class ResourceManager {
     }
     loadAsset({ url, ext, onProgress, ...props }) {
         return new Promise((resolve, reject)=>{
-            const info = ResourceManager._parseURL(url);
+            const ext_ = ResourceManager.extension(url);
             const texSettings = ResourceManager._splitTextureSettings(props);
-            const key = ResourceManager._getTextureKey(info.url, texSettings);
+            const key = ResourceManager._getTextureKey(url, texSettings);
             let result = this._caches.get(key);
             if (result) {
                 resolve(result);
@@ -4322,10 +4300,10 @@ class ResourceManager {
                     this._caches.set(key, file);
                     resolve(file);
                 };
-                let sel = ext || info.ext;
+                let sel = ext || ext_;
                 if (this._loaders.has(sel)) {
                     this._loaders.get(sel).load({
-                        url: info.url,
+                        url,
                         texSettings,
                         onProgress,
                         onLoad,
@@ -4740,21 +4718,6 @@ class Viewer extends EventEmitter {
     addLoader(Loader) {
         this._resourceManager.addLoader(Loader);
     }
-    async load({ url, ext, onProgress, castShadow = false, receiveShadow = false, ...props }) {
-        const node = await this.loadAsset({
-            url,
-            ext,
-            onProgress
-        });
-        if (castShadow || receiveShadow) {
-            node.userData.meshData.meshes.forEach((v)=>{
-                v.castShadow = castShadow;
-                v.receiveShadow = receiveShadow;
-            });
-        }
-        this.addNode(node, props);
-        return node;
-    }
     timeline(target) {
         return this._tweenManager.timeline(target);
     }