@3driseai/3drise-viewer 0.1.39 → 0.1.41

package/dist/animationsV2/ClipsRuntime.d.ts

@@ -18,6 +18,16 @@ export interface RuntimeEvent {
 }
 /** @deprecated name kept for existing imports */
 export type ClipEvent = RuntimeEvent;
+/**
+ * Blends: a property never jumps when a driver takes it over or lets it go. When a continuous
+ * track first wins a property, the runtime remembers where the property IS (the last value it
+ * wrote, else the live value, else the authored one) and for `blend` seconds writes a mix from
+ * there to the track's value; when every driver lets the property go, it glides back to the
+ * authored value the same way. So a project whose saved objects sit elsewhere than a sequence's
+ * first keys, a sequence first posed mid-way (a scroll story on a reload), a clip started while
+ * another one holds the property, or a clip stopped mid-move - none of them cut.
+ */
+export declare const DEFAULT_BLEND = 0.35;
 /**
  * How a cue switches (apply / revert) or fires its subject. The triggers engine installs one,
  * so cues run through it with the clip or sequence as their source. Returns false when an
@@ -46,6 +56,21 @@ declare class ClipsRuntime {
     private eventListeners;
     /** tracks whose authored value must be written back on the next tick */
     private pendingRestore;
+    /** Blend-ins in flight, per property (see Blend). */
+    private blends;
+    /** Blend-outs in flight, per property: written by the tick until done. */
+    private blendOuts;
+    /** Runtime seconds (frame deltas), the clock the blends run on. */
+    private clock;
+    /** Blend seconds of the driver that last wrote each property (for its blend-out). */
+    private blendOf;
+    /** Next tick writes every winner even if unchanged (an edited clip). */
+    private forceWrite;
+    /** Diagnostics: keys written last tick, and keys written for the FIRST time last tick. */
+    private lastWritten;
+    private lastFirstWrites;
+    private everWritten;
+    private tickCost;
     /** last written value per property (targetKey -> JSON) */
     private written;
     /** Discrete values laid last tick, per element (JSON) — to see which elements changed. */
@@ -70,6 +95,11 @@ declare class ClipsRuntime {
     setLiveValue(state: string, path: string, value: KeyValue, node?: string): boolean;
     /** What was last written by `setLiveValue`, else the authored value (action patches included). */
     getLiveValue(state: string, path: string, node?: string): KeyValue | undefined;
+    /** Diagnostics: a write whose speed differs sharply from the previous frame's (a velocity discontinuity), per property. */
+    private lastSpeed;
+    private probeJump;
+    /** Where a property is right now: the last value the runtime wrote, else the live / authored value. */
+    private currentValue;
     /** Whether `setLiveValue` can write this path (it has an applier). */
     canSetLiveValue(state: string, path: string): boolean;
     /**

package/dist/animationsV2/ClipsRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClipsRuntime.d.ts","sourceRoot":"","sources":["../../src/animationsV2/ClipsRuntime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClipsRuntime.d.ts","sourceRoot":"","sources":["../../src/animationsV2/ClipsRuntime.ts"],"names":[],"mappings":"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"}

package/dist/animationsV2/ClipsRuntime.js

@@ -41,12 +41,38 @@
 //
 import { SceneActions, expandMaterialVariant } from '@3driseai/3drise-core';
 import { logTrigger } from '../triggers/log.js';
-import { getAtPath, sampleTrack } from './clipUtils.js';
+import { getAtPath, isSwitchTrack, sampleTrack } from './clipUtils.js';
+import { interpolateValue } from '@3driseai/3drise-core';
 import { applyValue, clearApplierCaches, isApplicable, isTargetMounted, releaseLive } from './appliers.js';
 import { readNodeValue, restoreNodeTrack } from './nodeTracks.js';
 import { cueStatesAt, entryLocalTime, isEntryActive, resolveSequence, cueCommand, clipCueSchedule, firedBetween, } from './sequenceUtils.js';
 /** Longest an autoplaying sequence waits for its targets. */
 const MAX_TARGET_WAIT_MS = 8000;
+/** A saved playback rate: positive and finite, else 1. */
+const rate = (s) => (typeof s === 'number' && Number.isFinite(s) && s > 0 ? s : 1);
+/**
+ * Blends: a property never jumps when a driver takes it over or lets it go. When a continuous
+ * track first wins a property, the runtime remembers where the property IS (the last value it
+ * wrote, else the live value, else the authored one) and for `blend` seconds writes a mix from
+ * there to the track's value; when every driver lets the property go, it glides back to the
+ * authored value the same way. So a project whose saved objects sit elsewhere than a sequence's
+ * first keys, a sequence first posed mid-way (a scroll story on a reload), a clip started while
+ * another one holds the property, or a clip stopped mid-move - none of them cut.
+ */
+export const DEFAULT_BLEND = 0.35;
+const smooth = (t) => t * t * (3 - 2 * t);
+const canBlend = (v) => typeof v === 'number' || (typeof v === 'string' && /^#[0-9a-f]{6}$/i.test(v)) || (Array.isArray(v) && v.every(x => typeof x === 'number'));
+function mixValues(path, a, b, p) {
+    if (p <= 0)
+        return a;
+    if (p >= 1)
+        return b;
+    if (!canBlend(a) || !canBlend(b) || typeof a !== typeof b || (Array.isArray(a) !== Array.isArray(b)))
+        return b;
+    if (Array.isArray(a) && Array.isArray(b) && a.length !== b.length)
+        return b;
+    return interpolateValue(path.split('.').pop() ?? path, a, b, p);
+}
 /** The SceneActions layer discrete tracks are set through. */
 const TIMELINE_LAYER = 'timeline';
 /** Frames a changed element's continuous tracks are re-written for (its re-render may rebuild their target). */
@@ -81,6 +107,21 @@ class ClipsRuntime {
     eventListeners = new Set();
     /** tracks whose authored value must be written back on the next tick */
     pendingRestore = [];
+    /** Blend-ins in flight, per property (see Blend). */
+    blends = new Map();
+    /** Blend-outs in flight, per property: written by the tick until done. */
+    blendOuts = new Map();
+    /** Runtime seconds (frame deltas), the clock the blends run on. */
+    clock = 0;
+    /** Blend seconds of the driver that last wrote each property (for its blend-out). */
+    blendOf = new Map();
+    /** Next tick writes every winner even if unchanged (an edited clip). */
+    forceWrite = false;
+    /** Diagnostics: keys written last tick, and keys written for the FIRST time last tick. */
+    lastWritten = [];
+    lastFirstWrites = [];
+    everWritten = new Set();
+    tickCost = 0;
     /** last written value per property (targetKey -> JSON) */
     written = new Map();
     /** Discrete values laid last tick, per element (JSON) — to see which elements changed. */
@@ -150,6 +191,49 @@ class ClipsRuntime {
             return undefined;
         return getAtPath(this.ctx.getSettings(state), path);
     }
+    /** Diagnostics: a write whose speed differs sharply from the previous frame's (a velocity discontinuity), per property. */
+    lastSpeed = new Map();
+    probeJump(key, prevJson, value, dt) {
+        if (prevJson === undefined)
+            return;
+        let prev;
+        try {
+            prev = JSON.parse(prevJson);
+        }
+        catch {
+            return;
+        }
+        const num = (v) => typeof v === 'number' ? [v] : Array.isArray(v) && v.every(x => typeof x === 'number') ? v : null;
+        const a = num(prev), b = num(value);
+        if (!a || !b || a.length !== b.length || dt <= 0)
+            return;
+        const d = Math.max(...a.map((x, i) => Math.abs(b[i] - x)));
+        const speed = d / dt;
+        const last = this.lastSpeed.get(key);
+        this.lastSpeed.set(key, speed);
+        if (last === undefined || last < 1e-4)
+            return;
+        const ratio = speed / last;
+        if (ratio > 2.5 || ratio < 0.4)
+            this.dlog('JUMP', key, { from: prev, to: value, speedWas: +last.toFixed(4), speedNow: +speed.toFixed(4), dt: +dt.toFixed(4), at: this.clock.toFixed(3) });
+    }
+    /** Where a property is right now: the last value the runtime wrote, else the live / authored value. */
+    currentValue(state, path, node) {
+        const key = targetKey(state, node, path);
+        const out = this.blendOuts.get(key);
+        if (out) {
+            const u = out.duration > 0 ? (this.clock - out.start) / out.duration : 1;
+            return mixValues(path, out.from, out.to, smooth(Math.min(1, u)));
+        }
+        const w = this.written.get(key);
+        if (w !== undefined) {
+            try {
+                return JSON.parse(w);
+            }
+            catch { /* fall through */ }
+        }
+        return this.getLiveValue(state, path, node);
+    }
     /** Whether `setLiveValue` can write this path (it has an applier). */
     canSetLiveValue(state, path) {
         return isApplicable(state, path);
@@ -219,6 +303,9 @@ class ClipsRuntime {
         this.clips.clear();
         this.sequences.clear();
         this.pendingRestore = [];
+        this.blends.clear();
+        this.blendOuts.clear();
+        this.blendOf.clear();
         this.written.clear();
         this.laid.clear();
         this.rewrite.clear();
@@ -294,7 +381,7 @@ class ClipsRuntime {
             this.pendingRestore.push(...removed);
         inst.clip = clip;
         inst.time = Math.min(inst.time, clip.duration);
-        this.written.clear(); // values may have changed under the same time
+        this.forceWrite = true; // values may have changed under the same time (the written marks stay: no spurious blend-ins)
         this.bumpState();
     }
     /**
@@ -518,6 +605,17 @@ class ClipsRuntime {
             return;
         }
         const dt = Math.min(delta, 0.1);
+        this.clock += dt;
+        const tickStart = this.debug ? performance.now() : 0;
+        if (this.debug) {
+            const t = this.tickCost;
+            if (t > 8)
+                this.dlog('slow tick (previous)', { ms: +t.toFixed(1), at: this.clock.toFixed(3) });
+        }
+        if (this.debug && delta > 0.028)
+            this.dlog('long frame', { delta: +delta.toFixed(3), at: this.clock.toFixed(3), writtenLastTick: this.lastWritten.slice(0, 40), firstWrites: this.lastFirstWrites });
+        this.lastWritten = [];
+        this.lastFirstWrites = [];
         let anyPlaying = false;
         for (const inst of [...this.clips.values()]) {
             const prev = inst.time;
@@ -601,22 +699,70 @@ class ClipsRuntime {
             else
                 this.laid.delete(state);
             this.rewrite.set(state, REWRITE_FRAMES);
+            this.dlog('layer changed (element re-renders)', state, { at: this.clock.toFixed(3), patch: layer[state] });
             // Switch tracks over an action / Change cue setting the same thing: reported, not resolved.
             if (json)
                 this.noteLayerClash(state, layer[state]);
         }
         SceneActions.setLayer(TIMELINE_LAYER, layer);
+        // Released properties gliding back to authored (a winner for the same property takes over).
+        for (const [key, b] of this.blendOuts) {
+            if (winners.has(key)) {
+                this.blendOuts.delete(key);
+                continue;
+            }
+            const u = b.duration > 0 ? (this.clock - b.start) / b.duration : 1;
+            const v = mixValues(b.path, b.from, b.to, smooth(Math.min(1, u)));
+            applyValue(ctx, b.state, b.path, v, b.node);
+            if (u >= 1)
+                this.blendOuts.delete(key);
+        }
         const failed = [];
         for (const [key, p] of winners) {
             if (p.discrete)
                 continue;
-            const json = JSON.stringify(p.value);
-            if (this.written.get(key) === json && !this.rewrite.has(p.state))
+            // A driver taking the property over: start it from where the property is, not from the key.
+            let blend = this.blends.get(key);
+            if (!this.written.has(key)) {
+                const duration = p.blend ?? DEFAULT_BLEND;
+                const from = this.currentValue(p.state, p.path, p.node);
+                if (duration > 0 && from !== undefined && JSON.stringify(from) !== JSON.stringify(p.value)) {
+                    blend = { from, start: this.clock, duration };
+                    this.blends.set(key, blend);
+                    this.dlog('blend in', key, { from, to: p.value, duration });
+                }
+                else {
+                    this.blends.delete(key);
+                    blend = undefined;
+                    if (this.debug)
+                        this.dlogEvery('noblend:' + key, 2000, 'no blend', key, { duration, from, to: p.value });
+                }
+            }
+            let value = p.value;
+            if (blend) {
+                const u = (this.clock - blend.start) / blend.duration;
+                if (u >= 1)
+                    this.blends.delete(key);
+                else
+                    value = mixValues(p.path, blend.from, p.value, smooth(u));
+            }
+            const json = JSON.stringify(value);
+            if (!this.forceWrite && this.written.get(key) === json && !this.rewrite.has(p.state))
                 continue;
             // Recorded only when it landed: a target that is not mounted yet (a model still
             // loading) is retried next frame instead of being skipped for good.
-            if (applyValue(ctx, p.state, p.path, p.value, p.node))
+            if (this.debug) {
+                this.probeJump(key, this.written.get(key), value, dt);
+                this.lastWritten.push(key + '=' + json.slice(0, 24));
+                if (!this.everWritten.has(key)) {
+                    this.everWritten.add(key);
+                    this.lastFirstWrites.push(key);
+                }
+            }
+            if (applyValue(ctx, p.state, p.path, value, p.node)) {
                 this.written.set(key, json);
+                this.blendOf.set(key, p.blend ?? DEFAULT_BLEND);
+            }
             else if (this.debug)
                 failed.push(key);
         }
@@ -628,6 +774,9 @@ class ClipsRuntime {
             else
                 this.rewrite.set(state, n - 1);
         }
+        this.forceWrite = false;
+        if (this.debug)
+            this.tickCost = performance.now() - tickStart;
         if (anyPlaying)
             this.bump();
     }
@@ -781,7 +930,7 @@ class ClipsRuntime {
     *proposals() {
         const drivers = [];
         for (const inst of this.clips.values()) {
-            drivers.push({ order: inst.order, run: () => sampleTracks(inst.clip.tracks, inst.time) });
+            drivers.push({ order: inst.order, run: () => sampleTracks(inst.clip.tracks, inst.time, inst.clip.blend ?? DEFAULT_BLEND) });
         }
         for (const inst of this.sequences.values()) {
             drivers.push({
@@ -790,7 +939,7 @@ class ClipsRuntime {
                     for (const e of inst.schedule.entries) {
                         if (!inst.active.has(e.id))
                             continue;
-                        yield* sampleTracks(e.clip.tracks, entryLocalTime(e, inst.time));
+                        yield* sampleTracks(e.clip.tracks, entryLocalTime(e, inst.time), e.clip.blend ?? inst.seq.blend ?? DEFAULT_BLEND);
                     }
                 },
             });
@@ -804,13 +953,15 @@ class ClipsRuntime {
         this.pendingRestore = [];
         const done = new Set();
         for (const track of tracks) {
-            if (track.discrete)
+            if (isSwitchTrack(track))
                 continue; // the layer drops it on its own
             const key = targetKey(track.state, track.node, track.path);
             if (done.has(key))
                 continue;
             done.add(key);
+            const last = this.written.get(key);
             this.written.delete(key);
+            this.blends.delete(key);
             if (track.node) {
                 // Node tracks restore their exact pre-animation snapshot (see nodeTracks).
                 const node = track.node;
@@ -821,10 +972,28 @@ class ClipsRuntime {
             // (another driver re-writes it this frame).
             if (releaseLive(track.state, track.path))
                 continue;
-            // Another driver may still own this property; it re-writes this frame.
+            // Another driver may still own this property; it re-writes this frame. Otherwise it glides
+            // back to the authored value (blend-out) instead of cutting.
             const authored = getAtPath(ctx.getSettings(track.state), track.path);
-            if (authored !== undefined)
+            if (authored === undefined)
+                continue;
+            const duration = this.blendOf.get(key) ?? DEFAULT_BLEND;
+            let from;
+            if (last !== undefined) {
+                try {
+                    from = JSON.parse(last);
+                }
+                catch {
+                    from = undefined;
+                }
+            }
+            if (duration > 0 && from !== undefined && canBlend(from) && canBlend(authored) && JSON.stringify(from) !== JSON.stringify(authored)) {
+                this.blendOuts.set(key, { state: track.state, path: track.path, from, to: authored, start: this.clock, duration });
+            }
+            else {
+                this.blendOuts.delete(key);
                 applyValue(ctx, track.state, track.path, authored);
+            }
         }
     }
     /** Whether any active driver still has a track on (state, node, path). */
@@ -842,7 +1011,8 @@ class ClipsRuntime {
     }
     advanceClip(inst, delta) {
         const { clip } = inst;
-        inst.time += delta * inst.speed * inst.direction;
+        // the play's own speed × the clip's saved rate
+        inst.time += delta * inst.speed * rate(clip.speed) * inst.direction;
         const atEnd = inst.direction === 1 ? inst.time >= clip.duration : inst.time <= 0;
         if (!atEnd)
             return;
@@ -895,7 +1065,8 @@ class ClipsRuntime {
             inst.time = 0;
             return this.finishSequence(inst);
         }
-        inst.time += delta * inst.speed * inst.direction;
+        // the play's own speed × the sequence's saved rate
+        inst.time += delta * inst.speed * rate(seq.speed) * inst.direction;
         const atEnd = inst.direction === 1 ? inst.time >= total : inst.time <= 0;
         if (!atEnd)
             return;
@@ -963,14 +1134,14 @@ class ClipsRuntime {
 }
 const round2 = (n) => Math.round(n * 100) / 100;
 const isDriven = (seq) => !!seq.driver && seq.driver !== 'time';
-function* sampleTracks(tracks, t) {
+function* sampleTracks(tracks, t, blend) {
     for (const track of tracks) {
         if (track.muted || track.keys.length === 0)
             continue;
         const value = sampleTrack(track, t);
         if (value === undefined)
             continue;
-        yield { state: track.state, node: track.node, path: track.path, value, discrete: !!track.discrete };
+        yield { state: track.state, node: track.node, path: track.path, value, discrete: isSwitchTrack(track), blend };
     }
 }
 const clipsRuntime = new ClipsRuntime();

package/dist/animationsV2/clipUtils.d.ts

@@ -8,6 +8,15 @@ export declare const snapToFrame: (t: number, fps: number) => number;
 /** 'SS:FF' timecode (minutes folded into seconds past 59 — clips are short). */
 export declare function timecode(t: number, fps: number): string;
 export declare function easeProgress(ease: EaseName | undefined, p: number): number;
+/**
+ * A switch track: set at its keys through the SceneActions patch layer (the element
+ * re-renders, as when an action changes it), never written per frame. The structural
+ * tracks (Track.discrete) — and an object's `meshSettings.visible`: showing / hiding has
+ * to reach the object's settings, where its visibility-linked effects play in and out
+ * (usePresentedVisibility). Written straight onto the Object3D it would cut them.
+ * A model part's `visible` (node track) stays per frame — parts have no effects.
+ */
+export declare const isSwitchTrack: (track: Pick<Track, "discrete" | "node" | "path">) => boolean;
 /**
  * The track's value at time t. Before the first key: the first key's value;
  * after the last: the last key's value. Keys must be sorted by t.
@@ -18,6 +27,12 @@ export declare const sortKeys: (keys: Keyframe[]) => Keyframe[];
 export declare function upsertKey(track: Track, t: number, value: KeyValue, fps: number): Track;
 /** Move keys by dt seconds, clamped to [0, duration], snapped to frames unless `free`. */
 export declare function moveKeys(clip: AnimationClip, selection: Set<string>, dt: number, free: boolean): AnimationClip;
+/**
+ * Copies of the selected keys `dt` seconds away (snapped to a frame), on their own tracks; the
+ * originals stay. A copy landing on a key of its track replaces it. `ids` maps original → copy id
+ * (pass the same map while dragging so the copies keep their ids).
+ */
+export declare function copyKeys(clip: AnimationClip, selection: Set<string>, dt: number, ids: Map<string, string>): AnimationClip;
 export declare function deleteKeys(clip: AnimationClip, selection: Set<string>): AnimationClip;
 export declare function setKeysEase(clip: AnimationClip, selection: Set<string>, ease: EaseName): AnimationClip;
 export declare function setKeyValue(clip: AnimationClip, keyId: string, value: KeyValue): AnimationClip;

package/dist/animationsV2/clipUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clipUtils.d.ts","sourceRoot":"","sources":["../../src/animationsV2/clipUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAOlF,eAAO,MAAM,GAAG,GAAI,QAAQ,MAAM,WAAqF,CAAC;AAExH,uFAAuF;AACvF,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAOrD;AAMD,eAAO,MAAM,cAAc,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAwB,CAAC;AAC9E,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,EAAE,KAAK,MAAM,WAAgB,CAAC;AAC1E,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAgD,CAAC;AAEnG,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAKvD;AAaD,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAK1E;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAyBzE;AAMD,eAAO,MAAM,QAAQ,GAAI,MAAM,QAAQ,EAAE,eAAwC,CAAC;AAElF,2EAA2E;AAC3E,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAOtF;AAED,0FAA0F;AAC1F,wBAAgB,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,aAAa,CAc9G;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,aAAa,CAKrF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,GAAG,aAAa,CAQtG;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,aAAa,CAQ9F;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,QAAQ,CAAA;CAAE,GAAG,SAAS,CAMvG;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,EAAE,CAIzD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAEhE;AAED,4CAA4C;AAC5C,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAQvF"}
+{"version":3,"file":"clipUtils.d.ts","sourceRoot":"","sources":["../../src/animationsV2/clipUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAOlF,eAAO,MAAM,GAAG,GAAI,QAAQ,MAAM,WAAqF,CAAC;AAExH,uFAAuF;AACvF,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAOrD;AAMD,eAAO,MAAM,cAAc,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAwB,CAAC;AAC9E,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,EAAE,KAAK,MAAM,WAAgB,CAAC;AAC1E,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAgD,CAAC;AAEnG,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAKvD;AAaD,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAK1E;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,KAAG,OACL,CAAC;AAE7E;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAyBzE;AAMD,eAAO,MAAM,QAAQ,GAAI,MAAM,QAAQ,EAAE,eAAwC,CAAC;AAElF,2EAA2E;AAC3E,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAOtF;AAED,0FAA0F;AAC1F,wBAAgB,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,aAAa,CAc9G;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,aAAa,CAkBzH;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,aAAa,CAKrF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,GAAG,aAAa,CAQtG;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,aAAa,CAQ9F;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,QAAQ,CAAA;CAAE,GAAG,SAAS,CAMvG;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,EAAE,CAIzD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAEhE;AAED,4CAA4C;AAC5C,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAQvF"}

package/dist/animationsV2/clipUtils.js

@@ -46,6 +46,15 @@ export function easeProgress(ease, p) {
         return p;
     return applyEasing(name, p);
 }
+/**
+ * A switch track: set at its keys through the SceneActions patch layer (the element
+ * re-renders, as when an action changes it), never written per frame. The structural
+ * tracks (Track.discrete) — and an object's `meshSettings.visible`: showing / hiding has
+ * to reach the object's settings, where its visibility-linked effects play in and out
+ * (usePresentedVisibility). Written straight onto the Object3D it would cut them.
+ * A model part's `visible` (node track) stays per frame — parts have no effects.
+ */
+export const isSwitchTrack = (track) => !!track.discrete || (!track.node && track.path === 'meshSettings.visible');
 /**
  * The track's value at time t. Before the first key: the first key's value;
  * after the last: the last key's value. Keys must be sorted by t.
@@ -56,7 +65,7 @@ export function sampleTrack(track, t) {
         return undefined;
     // A switch track switches AT its first key: before it the element keeps its authored value
     // (an eased track holds its first value before it, so a move can start later than 0).
-    if (t < keys[0].t - 1e-9 && track.discrete)
+    if (t < keys[0].t - 1e-9 && isSwitchTrack(track))
         return undefined;
     if (t <= keys[0].t)
         return keys[0].value;
@@ -75,7 +84,7 @@ export function sampleTrack(track, t) {
     }
     const a = keys[lo];
     const b = keys[hi];
-    if (track.discrete || isSteppedValue(a.value) || isSteppedValue(b.value))
+    if (isSwitchTrack(track) || isSteppedValue(a.value) || isSteppedValue(b.value))
         return a.value;
     const span = b.t - a.t;
     const p = span > 0 ? easeProgress(a.ease, (t - a.t) / span) : 1;
@@ -115,6 +124,34 @@ export function moveKeys(clip, selection, dt, free) {
         }),
     };
 }
+/**
+ * Copies of the selected keys `dt` seconds away (snapped to a frame), on their own tracks; the
+ * originals stay. A copy landing on a key of its track replaces it. `ids` maps original → copy id
+ * (pass the same map while dragging so the copies keep their ids).
+ */
+export function copyKeys(clip, selection, dt, ids) {
+    return {
+        ...clip,
+        tracks: clip.tracks.map(track => {
+            const picked = track.keys.filter(k => selection.has(k.id));
+            if (!picked.length)
+                return track;
+            const copies = picked.map(k => {
+                let id = ids.get(k.id);
+                if (!id) {
+                    id = uid('k');
+                    ids.set(k.id, id);
+                }
+                return { ...k, id, t: snapToFrame(Math.min(clip.duration, Math.max(0, k.t + dt)), clip.fps) };
+            });
+            const taken = new Set(copies.map(c => c.t));
+            // a copy on top of its own original replaces nothing (no move yet): keep the original
+            const kept = track.keys.filter(k => selection.has(k.id) || !taken.has(k.t));
+            const fresh = copies.filter(c => !picked.some(p => p.t === c.t));
+            return { ...track, keys: sortKeys([...kept, ...fresh]) };
+        }),
+    };
+}
 export function deleteKeys(clip, selection) {
     return {
         ...clip,

package/dist/animationsV2/normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/animationsV2/normalize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAkB,MAAM,SAAS,CAAC;AAQhF,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,aAAa,CAgBrD;AAID,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,iBAAiB,CA4C7D"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/animationsV2/normalize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAkB,MAAM,SAAS,CAAC;AAQhF,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,aAAa,CAkBrD;AAID,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,iBAAiB,CA8C7D"}

package/dist/animationsV2/normalize.js

@@ -13,6 +13,8 @@ export function normalizeClip(row) {
         loop: flag(row.loop),
         yoyo: flag(row.yoyo),
         endMode: row.endMode === 'restore' ? 'restore' : 'hold',
+        speed: Number(row.speed) > 0 ? Number(row.speed) : 1,
+        ...(row.blend !== undefined && row.blend !== null && Number.isFinite(Number(row.blend)) ? { blend: Math.max(0, Number(row.blend)) } : {}),
         tracks: Array.isArray(row.tracks) ? row.tracks : [],
         cues: (Array.isArray(row.cues) ? row.cues : [])
             .filter((c) => c && c.command && typeof c.command === 'object')
@@ -56,6 +58,8 @@ export function normalizeSequence(row) {
         yoyo: flag(row.yoyo),
         reverse: flag(row.reverse),
         endMode: row.endMode === 'restore' ? 'restore' : 'hold',
+        speed: Number(row.speed) > 0 ? Number(row.speed) : 1,
+        ...(row.blend !== undefined && row.blend !== null && Number.isFinite(Number(row.blend)) ? { blend: Math.max(0, Number(row.blend)) } : {}),
         driver: DRIVERS.includes(row.driver) ? row.driver : 'time',
         driverSettings: {
             sensitivity: Number(row.driverSettings?.sensitivity) > 0 ? Number(row.driverSettings.sensitivity) : DEFAULT_DRIVER_SETTINGS.sensitivity,

package/dist/animationsV2/types.d.ts

@@ -47,6 +47,14 @@ export interface AnimationClip {
     yoyo: boolean;
     /** When a non-looping clip finishes: keep the last values, or return to authored. */
     endMode: 'hold' | 'restore';
+    /** Playback rate when the clip plays directly (1 = authored; a play's own speed multiplies it). Inside a sequence, the step clip's speed applies. */
+    speed?: number;
+    /**
+     * Seconds a property glides from where it is to the clip's value when the clip takes it over,
+     * and back to the authored value when the clip lets it go (see ClipsRuntime blends). Absent: the
+     * runtime default (DEFAULT_BLEND). 0 = snap, as before.
+     */
+    blend?: number;
     tracks: Track[];
     /** Effects, effect clips and actions switched / fired along the clip (TimelineCue). */
     cues?: TimelineCue[];
@@ -124,6 +132,10 @@ export interface AnimationSequence {
     yoyo: boolean;
     reverse: boolean;
     endMode: 'hold' | 'restore';
+    /** Playback rate of the whole sequence (1 = authored; a play's own speed multiplies it). Input-driven sequences ignore it. */
+    speed?: number;
+    /** Blend-in / out seconds for every clip in the sequence (a clip's own `blend` wins). Absent: the runtime default. */
+    blend?: number;
     /** What moves the clock. Input drivers scrub the sequence instead of playing it. */
     driver: SequenceDriver;
     driverSettings: SequenceDriverSettings;

package/dist/animationsV2/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/animationsV2/types.ts"],"names":[],"mappings":"AAMA,wFAAwF;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,MAAM,QAAQ,GAChB,QAAQ,GAAG,MAAM,GACjB,YAAY,GAAG,aAAa,GAAG,eAAe,GAC9C,aAAa,GAAG,cAAc,GAAG,gBAAgB,GACjD,aAAa,GAAG,cAAc,GAAG,gBAAgB,GACjD,YAAY,GAAG,aAAa,GAAG,eAAe,GAC9C,YAAY,GAAG,aAAa,GAAG,eAAe,GAC9C,YAAY,GAAG,aAAa,GAAG,eAAe,GAC9C,gBAAgB,GAAG,eAAe,CAAC;AAEvC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC;AAE5D,MAAM,WAAW,QAAQ;IACvB,6EAA6E;IAC7E,EAAE,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,QAAQ,CAAC;IAChB,8CAA8C;IAC9C,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qJAAqJ;IACrJ,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB;IACnB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,mFAAmF;IACnF,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,qFAAqF;IACrF,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,uFAAuF;IACvF,IAAI,CAAC,EAAE,WAAW,EAAE,CAAC;IACrB,sDAAsD;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAMD,8FAA8F;AAC9F,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,oGAAoG;IACpG,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uGAAuG;IACvG,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,sGAAsG;AACtG,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;IAClC,kEAAkE;IAClE,EAAE,EAAE,MAAM,CAAC;IACX,0GAA0G;IAC1G,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,8FAA8F;AAC9F,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,8BAA8B;IAC9B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,kFAAkF;AAClF,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEzE,MAAM,WAAW,sBAAsB;IACrC,+GAA+G;IAC/G,WAAW,EAAE,MAAM,CAAC;IACpB,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;IAClB,4EAA4E;IAC5E,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,uBAAuB,EAAE,sBAA2E,CAAC;AAElH,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB;IACpB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,6EAA6E;IAC7E,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,+BAA+B;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,oFAAoF;IACpF,MAAM,EAAE,cAAc,CAAC;IACvB,cAAc,EAAE,sBAAsB,CAAC;IACvC,mFAAmF;IACnF,QAAQ,EAAE,OAAO,CAAC;IAClB,sDAAsD;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,YAAY,EAAE,QAA2B,CAAC;AACvD,eAAO,MAAM,WAAW,2BAA4B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/animationsV2/types.ts"],"names":[],"mappings":"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"}