@xviewer.js/core 1.0.4-alpha.2 → 1.0.4-alpha.4

package/dist/module.js

@@ -145,7 +145,6 @@ function getClassInstance(constructor, args = []) {
 
 class Loader {
     static _setUserData(node) {
-        const keys = Loader._texKeys;
         const meshes = [];
         const textures = {};
         const materials = {};
@@ -163,7 +162,7 @@ class Loader {
             queue.push(...object.children);
         }
         Object.values(materials).forEach((mat)=>{
-            keys.forEach((k)=>{
+            Loader._texKeys.forEach((k)=>{
                 let tex = mat[k];
                 if (tex) {
                     textures[tex.uuid] = tex;
@@ -224,13 +223,10 @@ class FBXLoader extends Loader {
         loader.manager = manager;
         loader.setPath(path);
         loader.setResourcePath(resourcePath);
-        const loadCallback = (node)=>{
-            onLoad(Loader._setUserData(node));
-        };
         if (buffer) {
-            loadCallback(loader.parse(buffer, resourcePath));
+            onLoad(loader.parse(buffer, resourcePath));
         } else {
-            loader.load(url, loadCallback, onProgress, onError);
+            loader.load(url, onLoad, onProgress, onError);
         }
     }
     constructor(...args){
@@ -257,15 +253,10 @@ class GLTFLoader extends Loader {
         loader.manager = manager;
         loader.setPath(path);
         loader.setResourcePath(resourcePath);
-        const loadCallback = (gltf)=>{
-            const node = gltf.scene;
-            node.animations.push(...gltf.animations);
-            onLoad(Loader._setUserData(node));
-        };
         if (buffer) {
-            loader.parse(buffer, resourcePath, loadCallback, onError);
+            loader.parse(buffer, resourcePath, onLoad, onError);
         } else {
-            loader.load(url, loadCallback, onProgress, onError);
+            loader.load(url, onLoad, onProgress, onError);
         }
     }
     constructor(...args){
@@ -359,15 +350,10 @@ class BINLoader extends Loader {
         loader.manager = manager;
         loader.setPath(path);
         loader.setResourcePath(resourcePath);
-        const loadCallback = (gltf)=>{
-            const node = gltf.scene;
-            node.animations.push(...gltf.animations);
-            onLoad(Loader._setUserData(node));
-        };
         if (buffer) {
-            loader.parse(buffer, resourcePath, loadCallback, onError);
+            loader.parse(buffer, resourcePath, onLoad, onError);
         } else {
-            loader.load(url, loadCallback, onProgress, onError);
+            loader.load(url, onLoad, onProgress, onError);
         }
     }
     constructor(...args){
@@ -2225,8 +2211,7 @@ class ComponentScheduler {
                 if (comp.onEnable) {
                     comp.onEnable();
                 }
-                if (typeof comp.start === "function" && !comp.flags.isStartCalled) {
-                    comp.flags.isStartCalled = true;
+                if (typeof comp.start === "function") {
                     this.startInvoker.add(comp);
                 }
                 if (typeof comp.update === "function") {
@@ -2267,11 +2252,22 @@ class ComponentScheduler {
         }
     }
     constructor(){
-        this.startInvoker = new InvokerOneCall((comp)=>comp.start());
-        this.updateInvoker = new Invoker((comp, dt)=>comp.update(dt));
-        this.lastUpdateInvoker = new Invoker((comp, dt)=>comp.lastUpdate(dt));
-        this.renderInvoker = new Invoker((comp, dt)=>comp.render(dt));
-        this.resizeInvoker = new Invoker((comp, width, height)=>comp.resize(width, height));
+        this.startInvoker = new InvokerOneCall((comp)=>{
+            comp.start();
+            comp.start = undefined;
+        });
+        this.updateInvoker = new Invoker((comp, dt)=>{
+            !comp.start && comp.update(dt);
+        });
+        this.lastUpdateInvoker = new Invoker((comp, dt)=>{
+            !comp.start && comp.lastUpdate(dt);
+        });
+        this.renderInvoker = new Invoker((comp, dt)=>{
+            !comp.start && comp.render(dt);
+        });
+        this.resizeInvoker = new Invoker((comp, width, height)=>{
+            !comp.start && comp.resize(width, height);
+        });
     }
 }
 
@@ -2456,12 +2452,12 @@ ComponentManager._infoMap = new Map();
 
 class Renderer extends Component {
     render(dt) {
-        const { renderer, scene, camera } = this.context;
+        const { renderer, scene, camera } = this.viewer;
         renderer.setRenderTarget(null);
         renderer.render(scene, camera);
     }
     resize(width, height) {
-        const { renderer } = this.context;
+        const { renderer } = this.viewer;
         renderer.setSize(width, height);
     }
     constructor(...args){
@@ -4391,19 +4387,15 @@ class ResourceManager {
         }
         return loader;
     }
-    loadAsset({ url, buffer, ext, path, resourcePath, dracoPath, manager, onProgress, ...props }) {
+    loadAsset({ url, ext, onProgress, ...props }) {
         return new Promise((resolve, reject)=>{
             const sel = ext || url && ResourceManager.extension(url) || "";
             const texSettings = ResourceManager._splitTextureSettings(props);
             if (this._loaders.has(sel)) {
                 this._loaders.get(sel).load({
                     url,
-                    buffer,
                     texSettings,
-                    path,
-                    resourcePath,
-                    dracoPath,
-                    manager,
+                    ...props,
                     onProgress,
                     onLoad: resolve,
                     onError: (err)=>{
@@ -4860,6 +4852,9 @@ class Viewer extends EventEmitter {
     clearColor(renderTarget, color, alpha) {
         Viewer.ClearColor(this._renderer, renderTarget, color, alpha);
     }
+    stash(renderTarget, callback, clearColor, clearAlpha) {
+        Viewer.Stash(this._renderer, renderTarget, callback, clearColor, clearAlpha);
+    }
     blur(blurLevel, shadingScale, inputBuffer, tempBuffer, outputBuffer, fixedOutput) {
         Viewer.Blur(this._renderer, blurLevel, shadingScale, inputBuffer, tempBuffer, outputBuffer, fixedOutput);
     }
@@ -4955,7 +4950,7 @@ class Viewer extends EventEmitter {
         renderer.autoClear = true;
         renderer.setRenderTarget(renderTarget);
         clearColor !== undefined && renderer.setClearColor(clearColor, clearAlpha);
-        callback && callback();
+        callback && callback(renderer);
         renderer.autoClear = autoClear;
         renderer.setRenderTarget(RT);
         clearColor !== undefined && renderer.setClearColor(color, alpha);