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

package/dist/main.js

@@ -1121,14 +1121,18 @@ class aEXRLoader extends aLoader {
 }
 
 class aFBXLoader extends aLoader {
-    load({ url, onLoad, onProgress, onError }) {
+    load({ url, buffer, onLoad, onProgress, onError }) {
         const loadCallback = (node)=>{
             onLoad(aLoader._setUserData(node));
         };
         const loader = new FBXLoader_js.FBXLoader(this.manager.loadingManager);
         loader.setPath(this.manager.path);
         loader.setResourcePath(this.manager.resourcePath);
-        loader.load(url, loadCallback, onProgress, onError);
+        if (buffer) {
+            loadCallback(loader.parse(buffer, this.manager.path));
+        } else {
+            loader.load(url, loadCallback, onProgress, onError);
+        }
     }
     constructor(...args){
         super(...args);
@@ -1139,7 +1143,7 @@ class aFBXLoader extends aLoader {
 }
 
 class aGLTFLoader extends aLoader {
-    load({ url, onLoad, onProgress, onError }) {
+    load({ url, buffer, onLoad, onProgress, onError }) {
         const loadCallback = (gltf)=>{
             const node = gltf.scene;
             if (gltf.animations) node.animations = gltf.animations;
@@ -1152,7 +1156,11 @@ class aGLTFLoader extends aLoader {
         dracoLoader.setDecoderPath(this.manager.dracoPath);
         gltfLoader.setDRACOLoader(dracoLoader);
         gltfLoader.setMeshoptDecoder(meshopt_decoder_module_js.MeshoptDecoder);
-        gltfLoader.load(url, loadCallback, onProgress, onError);
+        if (buffer) {
+            gltfLoader.parse(buffer, this.manager.path, loadCallback, onError);
+        } else {
+            gltfLoader.load(url, loadCallback, onProgress, onError);
+        }
     }
     constructor(...args){
         super(...args);
@@ -1165,13 +1173,13 @@ class aGLTFLoader extends aLoader {
 
 class aHDRLoader extends aLoader {
     load({ url, onLoad, onProgress, onError, texSettings }) {
-        texSettings = Object.assign({
+        const settings = Object.assign({
             mapping: three.EquirectangularReflectionMapping
         }, texSettings);
         const loader = new RGBELoader_js.RGBELoader(this.manager.loadingManager);
         loader.setPath(this.manager.path);
         loader.setResourcePath(this.manager.resourcePath);
-        loader.load(url, (tex)=>onLoad(Object.assign(tex, texSettings)), onProgress, onError);
+        loader.load(url, (tex)=>onLoad(Object.assign(tex, settings)), onProgress, onError);
     }
     constructor(...args){
         super(...args);
@@ -4243,7 +4251,7 @@ class ResourceManager {
     static extension(path) {
         let str = path.split(".");
         if (str.length > 1) {
-            return str.pop();
+            return str.pop().toLowerCase();
         }
         return "";
     }
@@ -4255,28 +4263,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
@@ -4303,17 +4289,20 @@ class ResourceManager {
         this._caches.clear();
         this._loaders.clear();
     }
+    getLoader(ext) {
+        return this._loaders.get(ext);
+    }
     addLoader(Loader) {
         let loader = new Loader(this);
         for (let ext of loader.extension){
             this._loaders.set(ext, loader);
         }
     }
-    loadAsset({ url, ext, onProgress, ...props }) {
+    loadAsset({ url, buffer, 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 +4311,11 @@ class ResourceManager {
                     this._caches.set(key, file);
                     resolve(file);
                 };
-                let sel = ext || info.ext;
+                const sel = ext || ext_;
                 if (this._loaders.has(sel)) {
                     this._loaders.get(sel).load({
-                        url: info.url,
+                        url,
+                        buffer,
                         texSettings,
                         onProgress,
                         onLoad,
@@ -4334,7 +4324,7 @@ class ResourceManager {
                         }
                     });
                 } else {
-                    reject("ResourceManager.loadAsset: missing loader for " + ext);
+                    reject("ResourceManager.loadAsset: missing loader for " + url);
                 }
             }
         });
@@ -4611,6 +4601,15 @@ class Viewer extends EventEmitter {
     set targetFrameRate(v) {
         this._targetFrameRate = Math.max(0.001, v);
     }
+    get loadingManager() {
+        return this._loadingManager;
+    }
+    get resourceManager() {
+        return this._resourceManager;
+    }
+    get taskManager() {
+        return this._taskManager;
+    }
     destroy() {
         this.stop();
         this._renderer.dispose();
@@ -4737,24 +4736,12 @@ class Viewer extends EventEmitter {
     loadAsset(props) {
         return this._resourceManager.loadAsset(props);
     }
+    getLoader(ext) {
+        return this._resourceManager.getLoader(ext);
+    }
     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);
     }
@@ -4795,6 +4782,9 @@ class Viewer extends EventEmitter {
     removeComponent(node, component) {
         return this._componentManager.removeComponent(node, component);
     }
+    addTask(task) {
+        this._taskManager.add(task);
+    }
     addNode(object, { args, debug, scale, position, rotation, layer, shadowArgs, makeDefault, component, parent = this._scene, ...props } = {}) {
         let node = null;
         let ins = getClassInstance(object, args);
@@ -4973,7 +4963,7 @@ class Viewer extends EventEmitter {
         this._renderer.shadowMap.enabled = !!shadows;
         this._renderer.shadowMap.type = typeof shadows === "boolean" ? three.PCFSoftShadowMap : shadows;
         this._renderer.info.autoReset = false;
-        const loadingManager = new three.LoadingManager(loader.onLoad, loader.onProgress, loader.onError);
+        const loadingManager = this._loadingManager = new three.LoadingManager(loader.onLoad, loader.onProgress, loader.onError);
         this._resourceManager = new ResourceManager({
             path,
             resourcePath,
@@ -5607,6 +5597,7 @@ exports.Quat_quarticDamp = Quat_quarticDamp;
 exports.Quat_smoothDamp = Quat_smoothDamp;
 exports.Reflector = Reflector;
 exports.ReflectorMaterial = ReflectorMaterial;
+exports.ResourceManager = ResourceManager;
 exports.Sphere = Sphere;
 exports.SystemInfo = SystemInfo;
 exports.Tween = Tween;