Merge pull request #2451 from luzhuang/fix/gltfLoaderThrowError

fix: gltfLoader throw error when url load failed
galacean · Dec 6, 2024 · 34e0879 · 34e0879
2 parents cfe8c34 + 34b705b
commit 34e0879
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/packages/loader/src/gltf/parser/GLTFParserContext.ts b/packages/loader/src/gltf/parser/GLTFParserContext.ts
@@ -150,9 +150,12 @@ export class GLTFParserContext {
   _addTaskCompletePromise(taskPromise: Promise<any>): void {
     const task = this._progress.taskComplete;
     task.total += 1;
-    taskPromise.then(() => {
-      this._setTaskCompleteProgress(++task.loaded, task.total);
-    });
+    taskPromise.then(
+      () => {
+        this._setTaskCompleteProgress(++task.loaded, task.total);
+      },
+      () => {}
+    );
   }
 
   private _handleSubAsset<T>(

diff --git a/tests/src/core/resource/ResourceManager.test.ts b/tests/src/core/resource/ResourceManager.test.ts
@@ -68,10 +68,12 @@ describe("ResourceManager", () => {
       const glTFLoader = ResourceManager._loaders["GLTF"];
 
       const loaderSpy = vi.spyOn(glTFLoader, "load");
-      
+
       engine.resourceManager.load("https://gw.alipayobjects.com/os/bmw-prod/5e3c1e4e-496e-45f8-8e05-f89f2bd5e4a4.glb");
       engine.resourceManager.load("https://gw.alipayobjects.com/os/bmw-prod/5e3c1e4e-496e-45f8-8e05-f89f2bd5e4a4.glb");
-      engine.resourceManager.load("https://gw.alipayobjects.com/os/bmw-prod/5e3c1e4e-496e-45f8-8e05-f89f2bd5e4a4.glb?q=materials[0]");
+      engine.resourceManager.load(
+        "https://gw.alipayobjects.com/os/bmw-prod/5e3c1e4e-496e-45f8-8e05-f89f2bd5e4a4.glb?q=materials[0]"
+      );
       expect(loaderSpy).toHaveBeenCalled();
     });
   });
@@ -88,4 +90,14 @@ describe("ResourceManager", () => {
 
     // TODO: case for gltf loader load invalid q url, expect to throw
   });
+
+  describe("load asset", () => {
+    it("not found", async () => {
+      try {
+        await engine.resourceManager.load("/model.glb");
+      } catch (e) {
+        expect(e).to.be.an.instanceOf(Error);
+      }
+    });
+  });
 });