Update ASSIMP Viewer

Author: GitHubDragonFly

viewers/templates/ASSIMP Viewer.html

@@ -356,7 +356,7 @@
         height: 50vh;
         top: 50vh;
         left: 25vw;
-        padding: 10px;
+        padding: 5px;
         border: none;
       }
 
@@ -371,7 +371,7 @@
         height: 50vh;
         top: 50vh;
         left: 25vw;
-        padding: 10px;
+        padding: 5px;
         border: none;
       }
 
@@ -3193,13 +3193,13 @@
         }
       }
 
-      function load_with_assimp( fetched_files = null, from_url = false ) {
+      async function load_with_assimp( fetched_files = null, from_url = false ) {
         if (fetched_files === null) return;
 
         assimp_load = true;
 
         // Use ASSIMPJS to load files - some models might take time to load
-        assimpjs().then( async function( ajs ) {
+        await assimpjs().then( async function( ajs ) {
           if (from_url === true) {
             Promise.all( assimp_files.map( ( file, index ) => fetch( fetched_files[ index ] ) )).then( ( responses ) => {
               return Promise.all( responses.map( ( res ) => res.arrayBuffer() ) );
@@ -3263,7 +3263,7 @@
             result = null;
             resultFile = null;
 
-            load_components( false );
+            load_components( from_url );
           }
         });
       }
@@ -3392,6 +3392,8 @@
           // Load DRACO or gltf file
           if (selected_gltf_file !== null) loadFile();
           else if (selected_draco_file !== null) loadDRACO();
+        } else {
+          if (assimp_load === true && selected_gltf_file !== null) loadFile();
         }
       }
 
@@ -3704,9 +3706,9 @@
       }
 
       function loadFile() {
-        let lfile = local_files[ selected_gltf_file ];
+        let lfile = local_files ? local_files[ selected_gltf_file ] : ( assimp_load === true ? selected_gltf_file : null );
 
-        gltf_loader.load( URL.createObjectURL( assimp_load === true ? selected_gltf_file : lfile ), async function( gltf ) {
+        gltf_loader.load( URL.createObjectURL( lfile ), async function( gltf ) {
           URL.revokeObjectURL( assimp_load === true ? selected_gltf_file : lfile );
 
           parser = gltf.parser;
@@ -4059,7 +4061,7 @@
               handle_error( error );
             });
           } else {
-            gltf_loader.load( selected_gltf_url_file, async function( gltf ) {
+            gltf_loader.load( selected_gltf_url_file ? selected_gltf_url_file : selected_gltf_file, async function( gltf ) {
               parser = gltf.parser;
               scenes = gltf.scenes;
               cameras = gltf.cameras;