enable embedded viewer

prefrontalcortex · Apr 20, 2024 · a05c380 · a05c380
1 parent 8cf1980
commit a05c380
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/web/src/routes/(assets)/[...path]/+page.server.ts b/web/src/routes/(assets)/[...path]/+page.server.ts
@@ -42,7 +42,10 @@ export async function load({ params }) {
     if (_path.endsWith("/")) _path = _path.substring(0, _path.length - 1);
 
     const currentDir = dirs?.find(child => child.path === _path || child.path === _path + "/");
-    const currentItem = items?.find(item => item.path === _path || item.path + "/" === _path);
+    let currentItem = items?.find(item => item.path === _path || item.path + "/" === _path);
+
+    // fall back to first item if we have a directory with only one item
+    currentItem = currentItem || (currentDir?.items.length == 1 ? currentDir.items[0] : undefined);
 
     // console.log("Loading page: " + path + ", currentDir: " + currentDir + ", currentItem: " + currentItem);
 

diff --git a/web/src/routes/(assets)/[...path]/+page.svelte b/web/src/routes/(assets)/[...path]/+page.svelte
@@ -8,8 +8,7 @@ export let data;
 function getViewerUrl(abs: string) {
     const encoded = encodeURIComponent(abs);
     return base + "/viewer/view?file=" + encoded;
-    return "http://localhost:3003/?file=" + encoded;
-    return "https://usd-viewer.glitch.me/?file=" + encoded;
+    // return "https://usd-viewer.glitch.me/?file=" + encoded;
 }
 
 $: absoluteGithubUrl = item ? "https://github.com/usd-wg/assets/blob/main/" + item.path + item.ext : "";

diff --git a/web/src/routes/viewer/view/+layout.server.ts b/web/src/routes/viewer/view/+layout.server.ts
@@ -0,0 +1,4 @@
+
+export const prerender = true;
+export const ssr = true;
+export const trailingSlash = 'always';
diff --git a/web/src/routes/viewer/view/+page.svelte b/web/src/routes/viewer/view/+page.svelte
@@ -3,7 +3,7 @@ import { base } from '$app/paths';
 
 let container: HTMLDivElement;
 
-function goFullscreen(event: MouseEvent & { currentTarget: EventTarget & HTMLDivElement; }) {
+function goFullscreen(event: MouseEvent & { currentTarget: EventTarget & HTMLButtonElement; }) {
   console.log("goFullscreen");
   const elem = document.body;
   if (elem.requestFullscreen) {
@@ -36,7 +36,7 @@ function goFullscreen(event: MouseEvent & { currentTarget: EventTarget & HTMLDiv
     {#if false}
     <a class="file" href="?file=">Clear<br/><span>Drop USDZ to load</span></a>
 
-    <a class="filename"></a>
+    <a href="." class="filename">Filename.usd</a>
     {/if}
 
     <p id="message-log">
@@ -50,12 +50,6 @@ function goFullscreen(event: MouseEvent & { currentTarget: EventTarget & HTMLDiv
 
 </div>
 
-{#if false}
-<div class="footer">
-  <a id="quick-look-link" rel="ar" href="#"><img width="128" height="128" src="ARKit_Glyph.svg" title="ARKit Glyph" style="max-width:100%; height:auto;"></a>
-</div>
-{/if}
-
 <style>