@xviewer.js/core 1.0.0-alpha.58 → 1.0.0-alpha.59

package/dist/main.js

@@ -1137,7 +1137,7 @@ class aFBXLoader extends aLoader {
             onLoad(aLoader._setUserData(node));
         };
         if (buffer) {
-            loadCallback(loader.parse(buffer, path));
+            loadCallback(loader.parse(buffer, resourcePath));
         } else {
             loader.load(url, loadCallback, onProgress, onError);
         }
@@ -3179,6 +3179,73 @@ class Reflector extends Component {
     }
 }
 
+class Animation extends Component {
+    get mixer() {
+        return this._mixer;
+    }
+    get action() {
+        return this._action;
+    }
+    get actions() {
+        return this._actions;
+    }
+    get progress() {
+        return this._progress;
+    }
+    set progress(v) {
+        if (this.playing) return;
+        if (this._action) {
+            const duration = this._action.getClip().duration;
+            this._mixer.setTime(v * duration);
+        }
+    }
+    onLoad() {
+        this._mixer = new three.AnimationMixer(this.node);
+        this._actions = this.node.animations.map((v)=>this._mixer.clipAction(v));
+    }
+    onDestroy() {
+        this._mixer.stopAllAction();
+    }
+    update(dt) {
+        if (this.playing) {
+            this._mixer.update(dt);
+        }
+        if (this._action) {
+            const duration = this._action.getClip().duration;
+            this._progress = this._mixer.time % duration / duration;
+        }
+    }
+    play(animName, state = {}) {
+        let action = animName ? this._actions.find((v)=>v.getClip().name === animName) : this._actions[0];
+        if (action) {
+            if (state.clampWhenFinished !== undefined) action.clampWhenFinished = state.clampWhenFinished;
+            if (state.zeroSlopeAtStart !== undefined) action.zeroSlopeAtStart = state.zeroSlopeAtStart;
+            if (state.zeroSlopeAtEnd !== undefined) action.zeroSlopeAtEnd = state.zeroSlopeAtEnd;
+            if (state.mode) action.setLoop(state.mode, state.repetitions);
+            if (state.duration) action.setDuration(state.duration);
+            if (this._action) {
+                this._action.stop();
+            }
+            this._action = action.play();
+            this.playing = true;
+        }
+        return this;
+    }
+    stop() {
+        if (this._action) {
+            this._action.stop();
+            this._action = null;
+        }
+        this.playing = false;
+        return this;
+    }
+    constructor(...args){
+        super(...args);
+        this._progress = 0;
+        this.playing = false;
+    }
+}
+
 const vert_fullscreen = /*glsl*/ `
 varying vec2 vUv;
 void main() {
@@ -4336,7 +4403,7 @@ class ResourceManager {
                     }
                 });
             } else {
-                reject("ResourceManager.loadAsset: missing loader for " + url);
+                reject("ResourceManager.loadAsset: missing loader for " + sel);
             }
         });
     }
@@ -4673,10 +4740,9 @@ class Viewer extends EventEmitter {
             const frameCallback = (time)=>{
                 if (this._running) {
                     this._frame(time * 0.001);
-                    requestAnimationFrame(frameCallback);
                 }
             };
-            requestAnimationFrame(frameCallback);
+            this._renderer.setAnimationLoop(frameCallback);
         }
         return this;
     }
@@ -5619,6 +5685,9 @@ class DropFilePlugin extends Plugin {
                 asset.userData.ext = ext;
                 this._onLoad && this._onLoad(asset);
             };
+            const errCallback = (err)=>{
+                this._onError && this._onError(err);
+            };
             if ([
                 "fbx",
                 "gltf",
@@ -5629,7 +5698,7 @@ class DropFilePlugin extends Plugin {
                         ext,
                         buffer: event.target.result,
                         resourcePath: dir
-                    }).then(loadCallback);
+                    }).then(loadCallback).catch(errCallback);
                 }, false);
                 reader.readAsArrayBuffer(file);
             } else {
@@ -5637,13 +5706,13 @@ class DropFilePlugin extends Plugin {
                     this.viewer.loadAsset({
                         ext,
                         url: event.target.result
-                    }).then(loadCallback);
+                    }).then(loadCallback).catch(errCallback);
                 }, false);
                 reader.readAsDataURL(file);
             }
         }
     }
-    constructor({ onLoad, extension = [
+    constructor({ onLoad, onError, extension = [
         "glb",
         "gltf",
         "fbx",
@@ -5664,6 +5733,7 @@ class DropFilePlugin extends Plugin {
             }
         };
         this._onLoad = onLoad;
+        this._onError = onError;
         this._extensions = Array.isArray(extension) ? extension : [
             extension
         ];
@@ -5716,6 +5786,7 @@ function getFilesFromItemList(items, onDone) {
     }
 }
 
+exports.Animation = Animation;
 exports.AnimationCurve = AnimationCurve;
 exports.Box = Box;
 exports.BoxProjectionPlugin = BoxProjectionPlugin;