better propagation of loading errors

playcanvas · Oct 17, 2024 · ac2317f · ac2317f
1 parent 4a352a0
commit ac2317f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 25 deletions.
diff --git a/src/asset-loader.ts b/src/asset-loader.ts
@@ -181,7 +181,7 @@ class AssetLoader {
             })
             .catch((err) => {
                 console.error(err);
-                reject(`Failed to load splat data (${err})`);
+                reject('Failed to load splat data');
             });
         }).finally(() => {
             stopSpinner();

diff --git a/src/file-handler.ts b/src/file-handler.ts
@@ -6,6 +6,7 @@ import { convertPly, convertPlyCompressed, convertSplat } from './splat-convert'
 import { startSpinner, stopSpinner } from './ui/spinner';
 import { ElementType } from './element';
 import { Splat } from './splat';
+import { localize } from './ui/localization';
 
 interface RemoteStorageDetails {
     method: string;
@@ -121,13 +122,27 @@ const loadCameraPoses = async (url: string, filename: string, events: Events) =>
 // initialize file handler events
 const initFileHandler = async (scene: Scene, events: Events, dropTarget: HTMLElement, remoteStorageDetails: RemoteStorageDetails) => {
 
-    const handleLoad = (url: string, filename: string) => {
-        if (filename.toLowerCase().endsWith('.json')) {
-            return loadCameraPoses(url, filename, events);
-        } else if (filename.toLowerCase().endsWith('.ply') || filename.toLowerCase().endsWith('.splat')) {
-            return scene.loadModel(url, filename);
-        } else {
-            return null;
+    const handleLoad = async (url: string, filename: string) => {
+        try {
+            const lowerFilename = (filename || url).toLowerCase();
+            if (lowerFilename.endsWith('.json')) {
+                await loadCameraPoses(url, filename, events);
+            } else if (lowerFilename.endsWith('.ply') || lowerFilename.endsWith('.splat')) {
+                await scene.assetLoader.loadModel({ url, filename })
+                    .then((model) => {
+                        scene.add(model);
+                        scene.camera.focus();
+                        events.fire('loaded', filename);
+                    });
+            } else {
+                throw new Error(`Unsupported file type`);
+            }
+        } catch (err) {
+            events.invoke('showPopup', {
+                type: 'error',
+                header: localize('popup.error-loading'),
+                message: `${err.message ?? err} while loading '${filename}'`
+            });
         }
     };
 
@@ -141,7 +156,7 @@ const initFileHandler = async (scene: Scene, events: Events, dropTarget: HTMLEle
         fileSelector = document.createElement('input');
         fileSelector.setAttribute('id', 'file-selector');
         fileSelector.setAttribute('type', 'file');
-        fileSelector.setAttribute('accept', '.ply');
+        fileSelector.setAttribute('accept', '.ply,.splat');
         fileSelector.setAttribute('multiple', 'true');
 
         fileSelector.onchange = async () => {

diff --git a/src/main.ts b/src/main.ts
@@ -173,7 +173,9 @@ const main = async () => {
         window.launchQueue.setConsumer(async (launchParams: LaunchParams) => {
             for (const file of launchParams.files) {
                 const blob = await file.getFile();
-                scene.loadModel(URL.createObjectURL(blob), file.name);
+                const url = URL.createObjectURL(blob);
+                await events.invoke('load', url, file.name);
+                URL.revokeObjectURL(url);
             }
         });
     }

diff --git a/src/scene.ts b/src/scene.ts
@@ -216,21 +216,6 @@ class Scene {
         this.app.start();
     }
 
-    async loadModel(url: string, filename: string) {
-        try {
-            const model = await this.assetLoader.loadModel({ url, filename });
-            this.add(model);
-            this.camera.focus();
-            this.events.fire('loaded', filename);
-        } catch (err) {
-            this.events.invoke('showPopup', {
-                type: 'error',
-                header: localize('popup.error-loading'),
-                message: `${err.message ?? err} while loading '${filename}'`
-            });
-        }
-    }
-
     clear() {
         const models = this.getElementsByType(ElementType.model);
         models.forEach((model) => {