diff --git a/src/lib/components/Spinny3DPreview.svelte b/src/lib/components/Spinny3DPreview.svelte index c1e2fb8..fda6b1b 100644 --- a/src/lib/components/Spinny3DPreview.svelte +++ b/src/lib/components/Spinny3DPreview.svelte @@ -4,7 +4,13 @@ import { onDestroy, onMount } from 'svelte'; import fileSizeFromUrl from '$lib/utils'; - let { identifier, modelUrl, lineColor = 0x94857d, sizeCutoff = 2.5 * 1024 * 1024 } = $props(); + let { + identifier, + modelUrl, + lineColor = 0x94857d, + sizeCutoff = 2.5 * 1024 * 1024, + respectLocalStorage = true + } = $props(); let loadedPercent: number = $state(0); let showLoadButton: boolean = $state(false); @@ -380,7 +386,11 @@ fileSizeFromUrl(modelUrl).then((size) => { fileSize = size; - if (size <= sizeCutoff) { + if ( + size <= sizeCutoff && + ((respectLocalStorage && window.localStorage.getItem('enableModelRendering') !== 'false') || + !respectLocalStorage) + ) { loadModel(); } else { showLoadButton = true; @@ -435,7 +445,9 @@ loadModel(); }} > - Load ({Math.round((fileSize / 1024 / 1024) * 10) / 10} MiB) + Load ({fileSize >= 1000 * 1000 + ? `${Math.round((fileSize / 1000 / 1000) * 10) / 10} MB` + : `${Math.round((fileSize / 1000) * 10) / 10} kB`}) {:else}

Loading... {Math.round(loadedPercent)}%

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 5bdd401..72dbd94 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -295,6 +295,7 @@ identifier="keyring" modelUrl={keyringModel} sizeCutoff={8 * 1024 * 1024} + respectLocalStorage={false} />
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte index 7087ca7..44e9c18 100644 --- a/src/routes/dashboard/+page.svelte +++ b/src/routes/dashboard/+page.svelte @@ -1,8 +1,19 @@ @@ -12,8 +23,16 @@

Checklist

- 0}>Create your first project + 0} + >Create your first project 0}>Make your first journal entry 0}>Ship your project
+
+ +
diff --git a/src/routes/dashboard/projects/[id]/ship/+page.svelte b/src/routes/dashboard/projects/[id]/ship/+page.svelte index 71c1e30..bc2e0ff 100644 --- a/src/routes/dashboard/projects/[id]/ship/+page.svelte +++ b/src/routes/dashboard/projects/[id]/ship/+page.svelte @@ -69,7 +69,9 @@ {#if form?.invalid_printables_url}

Invalid Printables URL

{:else if form?.invalid_license} -

License not allowed, see below! You don't want Orpheus chasing you, do you?

+

+ License not allowed, see below! You don't want Orpheus chasing you, do you? +

{/if}
@@ -121,7 +123,8 @@

{:else}

- e.g. orpheus.f3d, monkey.blend (must be under {MAX_UPLOAD_SIZE / 1024 / 1024} MiB) + e.g. orpheus.f3d, monkey.blend (must be under {MAX_UPLOAD_SIZE / 1024 / 1024} MiB). Make + sure to use a format that preserves timeline if your editor supports that!

{/if} @@ -156,9 +159,7 @@ = 120} >At least 120 minutes spent - = 2} - >At least 2 journal logs + = 2}>At least 2 journal logs Project has a description