From d4d4c1fad4156d5ad30c47b00beda6fe3d71a501 Mon Sep 17 00:00:00 2001
From: kovacsv <viktorkovacs@gmail.com>
Date: Fri, 14 Jan 2022 18:20:36 +0100
Subject: [PATCH] Better error reporting.

---
 source/engine/import/importer3ds.js  | 2 +-
 source/engine/import/importerbase.js | 2 +-
 source/website/eventhandler.js       | 4 ++--
 source/website/website.js            | 4 +++-
 website/index.html                   | 5 +++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/source/engine/import/importer3ds.js b/source/engine/import/importer3ds.js
index 9885471..38cec3c 100644
--- a/source/engine/import/importer3ds.js
+++ b/source/engine/import/importer3ds.js
@@ -649,7 +649,7 @@ export class Importer3ds extends ImporterBase
     ReadChunks (reader, endByte, onChunk)
     {
         while (reader.GetPosition () <= endByte - 6) {
-            let chunkId = reader.ReadUnsignedInteger16 ();
+        let chunkId = reader.ReadUnsignedInteger16 ();
             let chunkLength = reader.ReadUnsignedInteger32 ();
             onChunk (chunkId, chunkLength);
         }
diff --git a/source/engine/import/importerbase.js b/source/engine/import/importerbase.js
index a2e4f5d..c9a37a3 100644
--- a/source/engine/import/importerbase.js
+++ b/source/engine/import/importerbase.js
@@ -51,7 +51,7 @@ export class ImporterBase
         }
 
         if (IsModelEmpty (this.model)) {
-            this.error = true;
+            this.SetError ('The model doesn\'t contain any meshes.');
             callbacks.onError ();
             callbacks.onComplete ();
             return;
diff --git a/source/website/eventhandler.js b/source/website/eventhandler.js
index f5c7760..8f6451f 100644
--- a/source/website/eventhandler.js
+++ b/source/website/eventhandler.js
@@ -5,10 +5,10 @@ export function SetEventHandler (eventHandler)
     eventHandlerFunc = eventHandler;
 }
 
-export function HandleEvent (eventName, eventLabel)
+export function HandleEvent (eventName, eventLabel, eventParams)
 {
     if (eventHandlerFunc === undefined || eventHandlerFunc === null) {
         return;
     }
-    eventHandlerFunc (eventName, eventLabel);
+    eventHandlerFunc (eventName, eventLabel, eventParams);
 }
diff --git a/source/website/website.js b/source/website/website.js
index a341b23..b274321 100644
--- a/source/website/website.js
+++ b/source/website/website.js
@@ -406,7 +406,9 @@ export class Website
                 } else if (importError.code === ImportErrorCode.FailedToLoadFile) {
                     HandleEvent ('failed_to_load_file', extensionsStr);
                 } else if (importError.code === ImportErrorCode.ImportFailed) {
-                    HandleEvent ('import_failed', extensionsStr);
+                    HandleEvent ('import_failed', extensionsStr, {
+                        error_message : importError.message
+                    });
                 }
             }
         });
diff --git a/website/index.html b/website/index.html
index 35fb1f9..856a466 100644
--- a/website/index.html
+++ b/website/index.html
@@ -34,10 +34,11 @@
 
     <!-- analytics start -->
     <script type="text/javascript">
-        OV.SetWebsiteEventHandler ((eventName, eventData) => {
+        OV.SetWebsiteEventHandler ((eventName, eventLabel, eventParams) => {
             console.log ({
                 eventName : eventName,
-                eventData : eventData
+                eventData : eventLabel,
+                eventParams : eventParams
             });
         });
     </script>