{#if !tracks.length}
{clips.length
diff --git a/src/components/editors/AssetBrowser.svelte b/src/components/editors/AssetBrowser.svelte
index b9ed92684..422d30904 100644
--- a/src/components/editors/AssetBrowser.svelte
+++ b/src/components/editors/AssetBrowser.svelte
@@ -17,7 +17,11 @@
import { bottomDockable } from '$lib/bottomDockDrop';
import { focusStack } from '$lib/windowFocus';
import { minimalScroll } from '$lib/ui/minimalScroll.js';
- import { assetBrowserOpen, assetBrowserKind, assetBrowserRes } from '$lib/cc0/assetBrowserState.js';
+ import {
+ assetBrowserOpen,
+ assetBrowserKind,
+ assetBrowserRes
+ } from '$lib/cc0/assetBrowserState.js';
import {
CC0_KINDS,
CC0_SITES,
@@ -31,8 +35,22 @@
filterRows,
creditLine
} from '$lib/cc0/cc0Core.js';
- import { phList, phCategories, acgPage, acgCategories, forgetCc0Memo } from '$lib/cc0/cc0Fetch.js';
- import { importCc0, cc0Jobs, rowKey, heldItemFor, placeItem, applyPresetToSelection, errorText } from '$lib/cc0/cc0Import.js';
+ import {
+ phList,
+ phCategories,
+ acgPage,
+ acgCategories,
+ forgetCc0Memo
+ } from '$lib/cc0/cc0Fetch.js';
+ import {
+ importCc0,
+ cc0Jobs,
+ rowKey,
+ heldItemFor,
+ placeItem,
+ applyPresetToSelection,
+ errorText
+ } from '$lib/cc0/cc0Import.js';
import { explorerItems, revealItem } from '$lib/explorer';
import { editEnvSky } from '$lib/environment';
import { materialPresets } from '$lib/materialPresets';
@@ -65,9 +83,12 @@
/** a load in flight is superseded by the next one (tab switch, a new search) */
let ticket = 0;
- const filtered = $derived(kind.source === 'polyhaven' ? filterRows(rows, { query, category }) : rows);
- const visible = $derived(kind.source === 'polyhaven' ? filtered.slice(0, shown) : filtered);
- const more = $derived(kind.source === 'polyhaven' ? filtered.length > shown : rows.length < acgTotal);
+ /** 57 M5: the Avatars tab lists CC-BY collections only when asked (their credit is kept) */
+ let includeCcBy = $state(false);
+ const listed = $derived(kind.source === 'polyhaven' || kind.source === 'osa' || kind.source === 'motion');
+ const filtered = $derived(listed ? filterRows(rows, { query, category }) : rows);
+ const visible = $derived(listed ? filtered.slice(0, shown) : filtered);
+ const more = $derived(listed ? filtered.length > shown : rows.length < acgTotal);
const selectionCount = $derived(($selectedObjects ?? []).length);
/** @param {boolean} [fresh] */
@@ -79,13 +100,34 @@
staleWhy = '';
try {
if (kind.source === 'polyhaven') {
- const [list, cats] = await Promise.all([phList(kind.phType ?? '', fresh), phCategories(kind.phType ?? '', fresh).catch(() => null)]);
+ const [list, cats] = await Promise.all([
+ phList(kind.phType ?? '', fresh),
+ phCategories(kind.phType ?? '', fresh).catch(() => null)
+ ]);
if (my !== ticket) return;
rows = normalizePolyHaven(list.data, /** @type {any} */ (kind.key));
categories = cats ? normalizePhCategories(cats.data) : [];
noteStale(list);
+ } else if (kind.source === 'osa') {
+ // 57 M5: the Open Source Avatars registry (VRM avatars; CC0 unless CC-BY is asked for)
+ const { osaList } = await import('$lib/avatars/osaRegistry.js');
+ const list = await osaList({ fresh, includeCcBy });
+ if (my !== ticket) return;
+ rows = list.rows;
+ categories = list.categories;
+ noteStale(list);
+ } else if (kind.source === 'motion') {
+ // 57 M5: the Motion pack (humanoid .tpanim clips, CC0)
+ const { motionRows } = await import('$lib/tpanim/motionKit.js');
+ const list = await motionRows(fresh);
+ if (my !== ticket) return;
+ rows = list.rows;
+ categories = list.categories;
} else {
- const [page, cats] = await Promise.all([acgPage({ query: query.trim(), category, fresh }), acgCategories(fresh).catch(() => null)]);
+ const [page, cats] = await Promise.all([
+ acgPage({ query: query.trim(), category, fresh }),
+ acgCategories(fresh).catch(() => null)
+ ]);
if (my !== ticket) return;
rows = normalizeAmbientCg(page.data);
acgTotal = ambientCgTotal(page.data);
@@ -172,7 +214,11 @@
/** the preset this browser made for a material row, if it is still in the library
* @param {any} row @param {any[]} list */
function heldPreset(row, list) {
- return list.find((p) => p.payload?.source?.site === row.source && p.payload?.source?.id === row.id) ?? null;
+ return (
+ list.find(
+ (p) => p.payload?.source?.site === row.source && p.payload?.source?.id === row.id
+ ) ?? null
+ );
}
/** @param {any} row @param {any[]} _items (an unused argument so the card re-derives on a Library change) */
const heldItem = (row, _items) => heldItemFor(row);
@@ -184,10 +230,21 @@
try {
const made = await importCc0(row, $assetBrowserRes, opts);
if (made.item) {
- if (row.kind === 'hdris') showToast((opts.applySky === false ? 'Added ' : 'Lighting the scene with ') + made.item.name);
- else showToast('Added ' + made.item.name + ' to the Library', [{ label: 'Show', action: () => show(made.item) }]);
+ if (row.kind === 'hdris')
+ showToast(
+ (opts.applySky === false ? 'Added ' : 'Lighting the scene with ') + made.item.name
+ );
+ else
+ showToast('Added ' + made.item.name + ' to the Library', [
+ { label: 'Show', action: () => show(made.item) }
+ ]);
} else if (made.preset) {
- showToast('Saved ' + made.preset.name + ' to your materials' + (opts.applyToSelection && selectionCount ? ' and applied it' : ''));
+ showToast(
+ 'Saved ' +
+ made.preset.name +
+ ' to your materials' +
+ (opts.applyToSelection && selectionCount ? ' and applied it' : '')
+ );
}
return made;
} catch (err) {
@@ -209,6 +266,61 @@
if (held) await placeItem(held);
}
+ /** 57 M5: a Motion pack clip goes into the Explorer, a file like any other clip @param {any} row */
+ async function addMotion(row) {
+ const key = rowKey(row);
+ placing = { ...placing, [key]: true };
+ cardError = { ...cardError, [key]: '' };
+ try {
+ const { addMotionClip } = await import('$lib/tpanim/motionKit.js');
+ await addMotionClip(row.id);
+ showToast(row.name + ' added to the Explorer: drag it onto a character to play it');
+ } catch (err) {
+ cardError = { ...cardError, [key]: errorText(err) };
+ } finally {
+ placing = { ...placing, [key]: false };
+ }
+ }
+ /** 57 M5: an avatar goes straight into the scene as a VRM character, its credit kept @type {Record} */
+ let placing = $state({});
+ /** @param {any} row */
+ async function placeAvatar(row) {
+ const key = rowKey(row);
+ placing = { ...placing, [key]: true };
+ cardError = { ...cardError, [key]: '' };
+ try {
+ const res = await fetch(row.vrm);
+ if (!res.ok) throw new Error('the avatar file is unreachable (HTTP ' + res.status + ')');
+ const bytes = await res.arrayBuffer();
+ const { importFile } = await import('$lib/fileHandler.svelte.js');
+ const { osaProvenance } = await import('$lib/avatars/osaRegistry.js');
+ const uuid = await importFile(
+ new File([bytes], row.name + '.vrm'),
+ row.name,
+ 'vrm',
+ undefined,
+ undefined,
+ { provenance: osaProvenance(row) }
+ );
+ if (uuid)
+ showToast(
+ 'Placed ' +
+ row.name +
+ (row.licence === 'CC0-1.0'
+ ? ' (CC0)'
+ : ' — ' +
+ row.licence +
+ ': credit ' +
+ (row.authors[0] || row.project) +
+ ' where you share it')
+ );
+ } catch (err) {
+ cardError = { ...cardError, [key]: errorText(err) };
+ } finally {
+ placing = { ...placing, [key]: false };
+ }
+ }
+
/** @param {any} row */
async function useSky(row) {
const held = heldItemFor(row);
@@ -253,19 +365,37 @@
id="asset-browser-window"
class="ui-panel tp-ui tp-window tp-themed fixed flex flex-col overflow-hidden outline-hidden"
tabindex="-1"
- use:dragWindow={{ key: 'assetBrowserWindow', defaultRect: { left: 160, top: 96 }, resizable: true, minW: 300, minH: 260 }}
+ use:dragWindow={{
+ key: 'assetBrowserWindow',
+ defaultRect: { left: 160, top: 96 },
+ resizable: true,
+ minW: 300,
+ minH: 260
+ }}
use:bottomDockable={{ key: 'assets' }}
use:focusStack={'assets'}
style="z-index: var(--z-window); width: 560px; height: 600px"
- data-keywords="cc0 free assets poly haven ambientcg models hdri sky textures materials download"
+ data-keywords="cc0 free assets poly haven ambientcg models hdri sky textures materials download avatars vrm characters"
>
-
+
@@ -303,59 +467,171 @@
Free assets (CC0)
-
-
@@ -279,23 +409,57 @@
onchange={(v) => assetBrowserKind.set(v)}
/>
- onSearch('')} />
+ onSearch('')}
+ />
({ value: c.id, name: c.label + ' (' + c.count + ')' }))]}
+ items={[
+ { value: '', name: 'All categories' },
+ ...categories.map((c) => ({ value: c.id, name: c.label + ' (' + c.count + ')' }))
+ ]}
onchange={onCategory}
/>
({ value: r, label: r, title: r === '1k' ? 'Small files — right for a Quest or a phone' : r === '2k' ? 'The desktop default' : 'Big files: slow to share with peers' }))}
+ options={RESOLUTIONS.map((r) => ({
+ value: r,
+ label: r,
+ title:
+ r === '1k'
+ ? 'Small files — right for a Quest or a phone'
+ : r === '2k'
+ ? 'The desktop default'
+ : 'Big files: slow to share with peers'
+ }))}
value={$assetBrowserRes}
onchange={(v) => assetBrowserRes.set(v)}
/>
+ {#if kind.source === 'osa'}
+
+ {/if}
{!online ? 'You are offline. ' : ''}{staleAt ? 'Showing the list saved ' + when(staleAt) + '.' : ''} + >{!online ? 'You are offline. ' : ''}{staleAt + ? 'Showing the list saved ' + when(staleAt) + '.' + : ''} {!online ? 'Downloads need a connection.' : staleWhy}
{/if} -
+
{#if listError}
{:else if loading && !rows.length}
-
{:else if $publishExportTab === 'export'}
- {listError}
- +Loading {kind.label.toLowerCase()}…
++ Loading {kind.label.toLowerCase()}… +
{:else if !visible.length} -Nothing matches{query ? ' “' + query + '”' : ''}. Try another word or category.
++ Nothing matches{query ? ' “' + query + '”' : ''}. Try another word or category. +
{/if}-
{#each visible as row (rowKey(row))}
{@const key = rowKey(row)}
{@const job = $cc0Jobs[key]}
- {@const item = row.kind === 'models' || row.kind === 'hdris' ? heldItem(row, $explorerItems) : null}
- {@const preset = row.kind === 'textures' || row.kind === 'materials' ? heldPreset(row, $materialPresets) : null}
-
- + {@const item = + row.kind === 'models' || row.kind === 'hdris' + ? heldItem(row, $explorerItems) + : row.kind === 'motion' + ? $explorerItems.find((/** @type {any} */ it) => it.kind === 'anim' && it.name === row.name + '.tpanim') + : null} + {@const preset = + row.kind === 'textures' || row.kind === 'materials' + ? heldPreset(row, $materialPresets) + : null} +
-
{#if row.thumb} -
/** @type {any} */ (e.currentTarget).classList.add('ab-noimg')} /> +
{row.name}
-{row.authors.join(', ') || CC0_SITES[/** @type {'polyhaven'|'ambientcg'} */ (row.source)].label}
++ {row.authors.join(', ') || + CC0_SITES[/** @type {'polyhaven'|'ambientcg'} */ (row.source)].label}{row.source === + 'osa' + ? ' · ' + (row.licence === 'CC0-1.0' ? 'CC0' : row.licence) + : ''} +
{#if job} -- +{/if} @@ -402,6 +688,13 @@ gap: 6px; padding: 6px 0 4px; } + .ab-ccby { + display: flex; + align-items: center; + gap: 4px; + font-size: 11px; + color: var(--text-muted); + } .ab-filters :global(.ab-cat) { min-width: 120px; flex: 1 1 140px; diff --git a/src/components/editors/ClipToolsPanel.svelte b/src/components/editors/ClipToolsPanel.svelte new file mode 100644 index 000000000..a9045358b --- /dev/null +++ b/src/components/editors/ClipToolsPanel.svelte @@ -0,0 +1,313 @@ + + + ++-{job.phase} {job.total ? mb(job.done) + ' / ' + mb(job.total) : ''}
++ {job.phase} + {job.total ? mb(job.done) + ' / ' + mb(job.total) : ''} +
{:else}- {#if row.kind === 'models'} + {#if row.kind === 'motion'} + + {:else if row.kind === 'avatars'} + + {:else if row.kind === 'models'} {#if item} - - + + {:else} - + {/if} {:else if row.kind === 'hdris'} - + {:else} {#if !preset} - + {/if} {/if} @@ -380,7 +658,8 @@ variant="ghost" size="sm" disabled={loading} - onclick={() => (kind.source === 'polyhaven' ? (shown += PAGE) : loadMoreAcg())}>Show more (kind.source === 'polyhaven' ? (shown += PAGE) : loadMoreAcg())} + >Show more{/if} @@ -388,8 +667,15 @@Every asset here is CC0 (public domain) — - Poly Haven and - ambientCG. Credits stay with each file. + Poly Haven + and + ambientCG{kind.source === 'osa' ? '' : '.'} Credits stay with each file. + {#if kind.source === 'osa'}Avatars: the Open Source Avatars registry — CC0 collections, CC-BY ones on request (their credit is kept).{/if}
+ {#if embedded.names.length && !embedded.off} +diff --git a/src/components/editors/Explorer.svelte b/src/components/editors/Explorer.svelte index bc92c92c2..18e3dd833 100644 --- a/src/components/editors/Explorer.svelte +++ b/src/components/editors/Explorer.svelte @@ -1083,6 +1083,7 @@ prefab: 'boxes', 'prefab-folder': 'folder', // 37 R4: a folder inside the Prefabs view scene: 'map', // 21-F4: a level (.tpscene) + anim: 'person-standing', // 57 M1: an animation clip (.tpanim) tpchat: 'message-square' // 56 C10: a chat of the scene (Scene ▸ chats) }; // semantic icon colors (ui.css classes over the --icon-* theme tokens) @@ -1095,11 +1096,12 @@ text: 'Text and config', object: '3D models', prefab: 'Prefabs', - scene: 'Scenes' + scene: 'Scenes', + anim: 'Animation clips' }; /** R22-R7: the filter's fixed order. Every kind the Explorer can hold, so the menu is * a statement about the app rather than about this library's current contents. */ - const FILTER_KINDS = ['image', 'object', 'audio', 'video', 'text', 'scene', 'prefab']; + const FILTER_KINDS = ['image', 'object', 'anim', 'audio', 'video', 'text', 'scene', 'prefab']; const KIND_COLORS: Record+ + ++ {/if} + + {#if activeRef} + ++ {#if fact} + {fact.fps} fps · {fact.frames} f · {fmt(fact.duration)} + {#if fact.humanoid}humanoid{/if} + + {fact.seam.ok ? 'seamless loop' : 'loop seam ' + fact.seam.angle.toFixed(1) + '°'} + + {:else} + reading the clip… + {/if} ++ + ++ + + + + + + {#if renaming} + + { + renaming = false; + void update({ name: e.currentTarget.value }); + }} + onkeydown={(e) => { + if (e.key === 'Enter') e.currentTarget.blur(); + if (e.key === 'Escape') renaming = false; + }} + /> + {:else} + + {/if} + + ++ + + {#if duration > 0} ++ ++ {/if} + {/if} + + ++ in / out + + +++ {fmt(Math.min(markIn, markOut))} – {fmt(Math.max(markIn, markOut))} + + + + + {#if previewing} + + {/if} +++ ++ {#if statesOpen} + + {#await import('./AnimStatesWindow.svelte') then m} +(statesOpen = false)} /> + {/await} + {/if} + + + {#if refs.length > 1} + ++ {/if} +Join clips…
++ {#each refs as r (r.name)} + + {/each} + + +++ diff --git a/src/components/editors/nodes/PlayAnimNode.svelte b/src/components/editors/nodes/PlayAnimNode.svelte index 5b2f0abc5..fa6035cad 100644 --- a/src/components/editors/nodes/PlayAnimNode.svelte +++ b/src/components/editors/nodes/PlayAnimNode.svelte @@ -81,6 +81,20 @@ on:input={(e) => setNodeData(id, { speed: +e.currentTarget.value })} /> + ++ + + speed (m/s) — unwired: its own + {#each SLOTS as slot (slot.key)} + + {/each} + + {#each [{ key: 'walkSpeed', label: 'walk speed', min: 0.2, max: 4, step: 0.1, unit: 'm/s', fallback: 1.4 }, { key: 'runSpeed', label: 'run speed', min: 0.5, max: 10, step: 0.1, unit: 'm/s', fallback: 3.5 }, { key: 'crossfade', label: 'crossfade', min: 0, max: 1, step: 0.05, unit: 's', fallback: 0.25 }] as r (r.key)} + + {/each} ++{running ? 'playing' : 'idle'} diff --git a/src/components/menu/Inspector.svelte b/src/components/menu/Inspector.svelte index d2177978c..c0be4d568 100644 --- a/src/components/menu/Inspector.svelte +++ b/src/components/menu/Inspector.svelte @@ -97,7 +97,8 @@ import { nameOf } from '$lib/lockControl'; import { geometrySpec } from '$lib/geometryParams'; import { LIGHT_PARAMS, SHADOW_TYPES, SHADOW_SIZES, setShadowMapSize, cappedShadowSize } from '$lib/lightParams'; - import { animatedObjects, setAnimationState } from '$lib/animatedImports'; + import { animatedObjects, setAnimationState, restRowsOf } from '$lib/animatedImports'; + import CharacterSection from './inspector/CharacterSection.svelte'; import { captureAutoKey, playheadOf } from '$lib/animationPreview'; import { moveObjectToGroup, selectObject, flyTo, setPickThrough } from '$lib/objectActions'; import { listPhysicsObjects, enablePhysicsOnSelection, setPhysicsFor, PHYSICS_MATERIALS } from '$lib/physics'; @@ -3197,7 +3198,7 @@{/if} - {#if $animatedObjects[$selectedObject.uuid]} + {#if $animatedObjects[$selectedObject.uuid]?.clips?.length} {@const anim = $animatedObjects[$selectedObject.uuid]}+ {/if} + {#if $publishSlot} {:else} @@ -66,9 +69,9 @@ {/if}