Add support for viewing Image files in the Asset Browser

AO-StreetArt · Dec 16, 2018 · ee71449 · ee71449
1 parent 3c2cd6a
commit ee71449
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/main/webapp/WEB-INF/jsp/assetBrowser.jsp b/src/main/webapp/WEB-INF/jsp/assetBrowser.jsp
@@ -159,10 +159,25 @@
         var assetFileType = selectedData[0]["fileType"]
         console.log(assetId)
         // Replace the information stored in the Babylon scene
-        activeAsset.dispose();
-        BABYLON.SceneLoader.Append("/v1/asset/" + assetId + "/", "file." + assetFileType, scene, function (scene) {
-          console.log("Asset Loaded")
-        });
+        for (let i = scene.meshes.length - 1; i >= 0; i--) {
+          scene.meshes[i].dispose();
+        }
+        for (let i = scene.spriteManagers.length - 1; i >= 0; i--) {
+          scene.spriteManagers[i].dispose();
+        }
+        if (assetFileType == "obj") {
+          BABYLON.SceneLoader.Append("/v1/asset/" + assetId + "/", "file." + assetFileType, scene, function (scene) {
+            console.log("Asset Loaded")
+          });
+        } else if (assetFileType == "png" || assetFileType == "jpg" || assetFileType == "jpeg") {
+          var spriteManagerAsset = new BABYLON.SpriteManager("imageAssetManager", "/v1/asset/" + assetId + "/file" + assetFileType, 1, 800, scene);
+          var imgAsset = new BABYLON.Sprite("imageAsset", spriteManagerAsset);
+          imgAsset.position.x = 0
+          imgAsset.position.y = 0
+          imgAsset.position.z = 0
+          imgAsset.width = 5;
+          imgAsset.height = 5;
+        }
       }
     }
 

diff --git a/src/main/webapp/WEB-INF/jsp/sceneBrowser.jsp b/src/main/webapp/WEB-INF/jsp/sceneBrowser.jsp
@@ -25,7 +25,6 @@
   <body>
     <div class="container-fluid pre-scrollable" style="height:100%;max-height:100%;">
       <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
-        <a class="navbar-brand" href="#">Aesel</a>
           <ul class="navbar-nav mr-auto">
             <li class="nav-item">
               <a class="nav-link" href="/portal/home">Home</a>