From c893b1f9d93668a89ddcb6ba49acf9fcd6334fb7 Mon Sep 17 00:00:00 2001 From: Mathias Kanzler Date: Wed, 25 Sep 2024 15:55:18 +0200 Subject: [PATCH 1/3] Catch error during gltf loading and clear with empty gltf --- glTF-Sample-Renderer | 2 +- src/main.js | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/glTF-Sample-Renderer b/glTF-Sample-Renderer index 4c87bce8..e65ec5ab 160000 --- a/glTF-Sample-Renderer +++ b/glTF-Sample-Renderer @@ -1 +1 @@ -Subproject commit 4c87bce87b43dd85dd4b7133bfdb638ee2be34a8 +Subproject commit e65ec5ab373225632003a556ec0d195c9ecda9e6 diff --git a/src/main.js b/src/main.js index 3f909c81..146ddadb 100644 --- a/src/main.js +++ b/src/main.js @@ -151,6 +151,19 @@ export default async () => { uiModel.exitLoadingState(); + return state; + }).catch((error) => { + console.error("fail: "+error); + resourceLoader + .loadGltf(undefined,undefined) + .then((gltf) => { + state.gltf = gltf; + state.sceneIndex = 0 ; + state.cameraIndex = undefined; + + uiModel.exitLoadingState(); + redraw = true; + }); return state; }) ); From e7c9cf3721208a3e36fee933a84aa8679017bf58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=A4rtl?= Date: Tue, 1 Oct 2024 11:42:36 +0200 Subject: [PATCH 2/3] Update commit of submodule --- glTF-Sample-Renderer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glTF-Sample-Renderer b/glTF-Sample-Renderer index e65ec5ab..f79e91f4 160000 --- a/glTF-Sample-Renderer +++ b/glTF-Sample-Renderer @@ -1 +1 @@ -Subproject commit e65ec5ab373225632003a556ec0d195c9ecda9e6 +Subproject commit f79e91f4e1986897f444a8a2a3b4009fb1731e53 From eca58ffc8cacaa07bac58ce305106033829c89cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=A4rtl?= Date: Tue, 1 Oct 2024 11:44:39 +0200 Subject: [PATCH 3/3] Formatting --- src/main.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.js b/src/main.js index 146ddadb..8d2cd05a 100644 --- a/src/main.js +++ b/src/main.js @@ -153,17 +153,17 @@ export default async () => { return state; }).catch((error) => { - console.error("fail: "+error); + console.error("Loading failed: "+ error); resourceLoader - .loadGltf(undefined,undefined) - .then((gltf) => { - state.gltf = gltf; - state.sceneIndex = 0 ; - state.cameraIndex = undefined; - - uiModel.exitLoadingState(); - redraw = true; - }); + .loadGltf(undefined, undefined) + .then((gltf) => { + state.gltf = gltf; + state.sceneIndex = 0; + state.cameraIndex = undefined; + + uiModel.exitLoadingState(); + redraw = true; + }); return state; }) );