Refactor progress reset

TurboWarp · Jan 3, 2024 · ea4e613 · ea4e613
1 parent b02dfa1
commit ea4e613
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/engine/runtime.js b/src/engine/runtime.js
@@ -2275,9 +2275,7 @@ class Runtime extends EventEmitter {
         this.addCloudVariable = this._initializeAddCloudVariable(newCloudDataManager);
         this.removeCloudVariable = this._initializeRemoveCloudVariable(newCloudDataManager);
 
-        this.totalAssetRequests = 0;
-        this.finishedAssetRequests = 0;
-        this.emitAssetProgress();
+        this.resetProgress();
     }
 
     /**
@@ -3420,6 +3418,12 @@ class Runtime extends EventEmitter {
         this.emit(Runtime.ASSET_PROGRESS, this.finishedAssetRequests, this.totalAssetRequests);
     }
 
+    resetProgress () {
+        this.finishedAssetRequests = 0;
+        this.totalAssetRequests = 0;
+        this.emitAssetProgress();
+    }
+
     /**
      * Wrap an asset loading promise with progress support.
      * @template T

diff --git a/test/integration/tw_asset_progress.js b/test/integration/tw_asset_progress.js
@@ -31,7 +31,7 @@ test('emitAssetProgress', t => {
     t.end();
 });
 
-test('dispose', t => {
+test('resetProgress', t => {
     t.plan(4);
 
     const runtime = new Runtime();
@@ -43,13 +43,23 @@ test('dispose', t => {
         t.equal(total, 0, 'event total');
     });
 
-    runtime.dispose();
+    runtime.resetProgress();
 
     t.equal(runtime.finishedAssetRequests, 0, 'property finishedAssetRequests');
     t.equal(runtime.totalAssetRequests, 0, 'property totalAssetRequests');
     t.end();
 });
 
+test('dispose', t => {
+    t.plan(1);
+    const runtime = new Runtime();
+    runtime.resetProgress = () => {
+        t.pass();
+    };
+    runtime.dispose();
+    t.end();
+});
+
 test('wrapAssetRequest', t => {
     const runtime = new Runtime();