@mml-io/mml-web-client 0.19.4 → 0.19.5

package/build/index.js

@@ -65087,6 +65087,7 @@ ${DracoWorker.toString()}
         this.updateDebugVisualisation();
       }
       if (!src) {
+        this.latestSrcModelPromise = null;
         this.srcLoadingInstanceManager.abortIfLoading();
         this.socketChildrenByBone.forEach((children) => {
           children.forEach((child) => {
@@ -65098,10 +65099,13 @@ ${DracoWorker.toString()}
         return;
       }
       const contentSrc = this.model.contentSrcToContentAddress(src);
+      this.srcLoadingInstanceManager.start(this.model.getLoadingProgressManager(), contentSrc);
       const srcModelPromise = this.asyncLoadSourceAsset(contentSrc, (loaded, total) => {
+        if (this.latestSrcModelPromise !== srcModelPromise) {
+          return;
+        }
         this.srcLoadingInstanceManager.setProgress(loaded / total);
       });
-      this.srcLoadingInstanceManager.start(this.model.getLoadingProgressManager(), contentSrc);
       this.latestSrcModelPromise = srcModelPromise;
       srcModelPromise.then((asset2) => {
         if (this.latestSrcModelPromise !== srcModelPromise || !this.model.isConnected) {
@@ -65247,6 +65251,8 @@ ${DracoWorker.toString()}
         this.loadedState = null;
       }
       this.clearDebugVisualisation();
+      this.latestSrcModelPromise = null;
+      this.latestAnimPromise = null;
       this.animLoadingInstanceManager.dispose();
       this.srcLoadingInstanceManager.dispose();
     }
@@ -97870,10 +97876,13 @@ void main() {
         this.registeredParentAttachment = null;
       }
       const animSrc = this.model.contentSrcToContentAddress(anim2);
+      this.animLoadingInstanceManager.start(this.model.getLoadingProgressManager(), animSrc);
       const animPromise = this.asyncLoadSourceAsset(animSrc, (loaded, total) => {
+        if (this.latestAnimPromise !== animPromise) {
+          return;
+        }
         this.animLoadingInstanceManager.setProgress(loaded / total);
       });
-      this.animLoadingInstanceManager.start(this.model.getLoadingProgressManager(), animSrc);
       this.latestAnimPromise = animPromise;
       animPromise.then((result) => {
         if (this.latestAnimPromise !== animPromise || !this.model.isConnected) {
@@ -97916,6 +97925,7 @@ void main() {
         this.updateDebugVisualisation();
       }
       if (!src) {
+        this.latestSrcModelPromise = null;
         this.srcLoadingInstanceManager.abortIfLoading();
         this.socketChildrenByBone.forEach((children) => {
           children.forEach((child) => {
@@ -97927,10 +97937,13 @@ void main() {
         return;
       }
       const contentSrc = this.model.contentSrcToContentAddress(src);
+      this.srcLoadingInstanceManager.start(this.model.getLoadingProgressManager(), contentSrc);
       const srcModelPromise = this.asyncLoadSourceAsset(contentSrc, (loaded, total) => {
+        if (this.latestSrcModelPromise !== srcModelPromise) {
+          return;
+        }
         this.srcLoadingInstanceManager.setProgress(loaded / total);
       });
-      this.srcLoadingInstanceManager.start(this.model.getLoadingProgressManager(), contentSrc);
       this.latestSrcModelPromise = srcModelPromise;
       srcModelPromise.then((result) => {
         if (this.latestSrcModelPromise !== srcModelPromise || !this.model.isConnected) {
@@ -97982,6 +97995,7 @@ void main() {
         if (this.animState) {
           this.playAnimation(this.animState.currentAnimationClip);
         }
+        console.log("Loaded model", this.loadedState);
         this.srcLoadingInstanceManager.finish();
         this.updateDebugVisualisation();
       }).catch((err2) => {
@@ -98183,6 +98197,8 @@ void main() {
         this.loadedState = null;
       }
       this.clearDebugVisualisation();
+      this.latestSrcModelPromise = null;
+      this.latestAnimPromise = null;
       this.animLoadingInstanceManager.dispose();
       this.srcLoadingInstanceManager.dispose();
     }