@xviewer.js/core 1.0.5-alhpa.0 → 1.0.5-alhpa.1

package/dist/module.js

@@ -4348,6 +4348,9 @@ function _getMipBlurMaterial(lodMax, width, height) {
 }
 
 class TaskManager {
+    get isComplete() {
+        return this._taskIndex >= this._tasks.length;
+    }
     destroy() {
         this._tasks = [];
         this._taskIndex = 0;
@@ -4480,6 +4483,9 @@ class ResourceManager {
         }
         return settings;
     }
+    get isComplete() {
+        return this._loaded >= this._totalCount;
+    }
     destroy() {
         this._loaders.clear();
     }
@@ -4504,6 +4510,7 @@ class ResourceManager {
                     ...props,
                     onProgress,
                     onLoad: (asset)=>{
+                        this._loaded++;
                         this._resources.set(url, asset);
                         resolve(asset);
                     },
@@ -4512,6 +4519,7 @@ class ResourceManager {
                         reject(err);
                     }
                 });
+                this._totalCount++;
             } else {
                 reject("ResourceManager.loadAsset: missing loader for " + sel);
             }
@@ -4523,6 +4531,8 @@ class ResourceManager {
     constructor(viewer){
         this._loaders = new Map();
         this._resources = new Map();
+        this._loaded = 0;
+        this._totalCount = 0;
         this._viewer = viewer;
     }
 }
@@ -4737,9 +4747,9 @@ class Viewer extends EventEmitter {
         }
     }
     loop(dt) {
-        if (!this._loading) {
+        if (this._resourceManager.isComplete) {
             this._taskManager.update();
-            if (!this._tasking) {
+            if (this._taskManager.isComplete) {
                 this._running = true;
             }
         }
@@ -5150,14 +5160,8 @@ class Viewer extends EventEmitter {
         this._renderer.sortObjects = sortObjects;
         this._targetFrameRate = targetFrameRate;
         this._windowSize = typeof resize === "function" ? resize : resize === ResizeMode.AUTO ? this._windowSize : null;
-        const complete = (set, cb)=>{
-            set();
-            cb && cb();
-        };
-        this._taskManager = new TaskManager(()=>complete(()=>this._tasking = false, tasker.onComplete), tasker.onProgress, tasker.onError);
-        this._taskManager.onStart = ()=>this._tasking = true;
-        this._loadingManager = new LoadingManager(()=>complete(()=>this._loading = false, loader.onComplete), loader.onProgress, loader.onError);
-        this._loadingManager.onStart = ()=>this._loading = true;
+        this._taskManager = new TaskManager(tasker.onComplete, tasker.onProgress, tasker.onError);
+        this._loadingManager = new LoadingManager(loader.onComplete, loader.onProgress, loader.onError);
         this._resourceManager = new ResourceManager(this);
         this._componentManager = new ComponentManager(this);
         this._resourceOptions = {