@omnimedia/omnitool 1.1.0-85 → 1.1.0-87

package/x/timeline/sugar/o.d.ts

@@ -3,10 +3,8 @@ import { Media } from "../parts/media.js";
 import { Id, TimelineFile } from "../parts/basics.js";
 import { FilterActions } from "../parts/filters.js";
 import { Crop, Item } from "../parts/item.js";
-import { Anim, AnimateAction, Interpolation, Keyframes, TrackTransform, Transform, TransformOptions, Vec2, VisualAnimations } from "../types.js";
-type VisualAnimateActions = {
-    [TKey in keyof VisualAnimations]-?: AnimateAction;
-};
+import { PresetAnimateActions } from "../parts/animations/types.js";
+import { Anim, AnimateAction, Interpolation, Keyframes, TrackTransform, Transform, TransformOptions, Vec2 } from "../types.js";
 export declare class O {
     #private;
     state: {
@@ -21,7 +19,6 @@ export declare class O {
     register(item: Item.Any): void;
     textStyle: (style: TextStyleOptions) => Item.TextStyle;
     spatial: (transform?: Transform, crop?: Crop) => Item.Spatial;
-    animatedSpatial: (anim: Anim<TrackTransform>, crop?: Crop) => Item.AnimatedSpatial;
     anim: {
         scalar: (terp: Interpolation, track: Keyframes) => Anim<Keyframes>;
         vec2: (terp: Interpolation, source: Keyframes<Vec2>) => {
@@ -32,10 +29,13 @@ export declare class O {
             };
         };
         transform: (terp: Interpolation, source: Keyframes<Transform>) => Anim<TrackTransform>;
-        presets: import("../parts/animations/types.js").AnimationPresetActions;
     };
     filter: FilterActions;
-    animate: VisualAnimateActions;
+    animate: {
+        presets: PresetAnimateActions;
+        opacity: AnimateAction<"opacity">;
+        transform: AnimateAction<"transform">;
+    };
     sequence: (...items: Item.Any[]) => Item.Sequence;
     stack: (...items: Item.Any[]) => Item.Stack;
     video: (media: Media, options?: {
@@ -59,4 +59,3 @@ export declare class O {
     addChildren(parent: Item.Stack | Item.Sequence, ...items: Item.Any[]): void;
     set: <K extends Item.Any>(id: Id, partial: Partial<K>) => void;
 }
-export {};

package/x/timeline/sugar/o.js

@@ -1,7 +1,7 @@
 import { hex } from "@e280/stz";
 import { filters } from "../parts/filters.js";
-import { makeAnimationPresets, visualAnimations } from "../parts/animations/registry.js";
 import { Effect, Kind } from "../parts/item.js";
+import { animationPresets, makeAnimationPresets, visualAnimations } from "../parts/animations/registry.js";
 export class O {
     state;
     constructor(state) {
@@ -48,17 +48,6 @@ export class O {
         this.register(item);
         return item;
     };
-    animatedSpatial = (anim, crop) => {
-        const item = {
-            id: this.getId(),
-            kind: Kind.AnimatedSpatial,
-            anim,
-            crop,
-            enabled: true
-        };
-        this.register(item);
-        return item;
-    };
     #registerAnimation = (anims) => {
         const item = {
             id: this.getId(),
@@ -69,20 +58,13 @@ export class O {
         this.register(item);
         return item;
     };
-    #transformAnimation = (terp, source) => {
-        const track = {
-            position: { x: [], y: [] },
-            scale: { x: [], y: [] },
-            rotation: [],
+    #attachAnimation = (item, animation) => {
+        const next = {
+            ...item,
+            animationIds: [...(item.animationIds ?? []), animation.id]
         };
-        for (const [time, [position, scale, rotation]] of source) {
-            track.position.x.push([time, position[0]]);
-            track.position.y.push([time, position[1]]);
-            track.scale.x.push([time, scale[0]]);
-            track.scale.y.push([time, scale[1]]);
-            track.rotation.push([time, rotation]);
-        }
-        return { terp, track };
+        this.set(item.id, next);
+        return next;
     };
     anim = {
         scalar: (terp, track) => ({ terp, track }),
@@ -94,9 +76,23 @@ export class O {
             }
             return { terp, track };
         },
-        transform: this.#transformAnimation,
-        presets: makeAnimationPresets((terp, track) => ({ terp, track }), this.#transformAnimation, options => this.transform(options)),
+        transform: (terp, source) => {
+            const track = {
+                position: { x: [], y: [] },
+                scale: { x: [], y: [] },
+                rotation: [],
+            };
+            for (const [time, [position, scale, rotation]] of source) {
+                track.position.x.push([time, position[0]]);
+                track.position.y.push([time, position[1]]);
+                track.scale.x.push([time, scale[0]]);
+                track.scale.y.push([time, scale[1]]);
+                track.rotation.push([time, rotation]);
+            }
+            return { terp, track };
+        },
     };
+    #animationPresets = makeAnimationPresets((terp, track) => ({ terp, track }), (terp, source) => this.anim.transform(terp, source), options => this.transform(options));
     #makeFilter = (type) => {
         const make = (params) => {
             const item = {
@@ -127,18 +123,31 @@ export class O {
         return Object.fromEntries(entries);
     };
     filter = this.#makeFilters();
+    #makeAnimationValue = (key, terp, track) => (key === "transform"
+        ? this.anim.transform(terp, track)
+        : this.anim.scalar(terp, track));
     #makeAnimate = (key) => {
         const make = (terp, track) => this.#registerAnimation({
-            [key]: this.anim.scalar(terp, track)
+            [key]: this.#makeAnimationValue(key, terp, track)
         });
         const action = ((item, terp, track) => {
             const animation = make(terp, track);
-            const next = {
-                ...item,
-                animationIds: [...(item.animationIds ?? []), animation.id]
-            };
-            this.set(item.id, next);
-            return next;
+            return this.#attachAnimation(item, animation);
+        });
+        action.make = make;
+        return action;
+    };
+    #makePresetAnimate = (key) => {
+        const make = (options) => {
+            const preset = animationPresets[key];
+            const anim = this.#animationPresets[key](options);
+            return this.#registerAnimation(preset.type === "motion"
+                ? { transform: anim }
+                : { opacity: anim });
+        };
+        const action = ((item, options) => {
+            const animation = make(options);
+            return this.#attachAnimation(item, animation);
         });
         action.make = make;
         return action;
@@ -148,7 +157,15 @@ export class O {
             .map(key => [key, this.#makeAnimate(key)]);
         return Object.fromEntries(entries);
     };
-    animate = this.#makeAnimateActions();
+    #makePresetAnimateActions = () => {
+        const entries = Object.keys(animationPresets)
+            .map(key => [key, this.#makePresetAnimate(key)]);
+        return Object.fromEntries(entries);
+    };
+    animate = {
+        ...this.#makeAnimateActions(),
+        presets: this.#makePresetAnimateActions(),
+    };
     sequence = (...items) => {
         const item = {
             id: this.getId(),

package/x/timeline/sugar/o.js.map

@@ -1 +1 @@
-{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"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"}

package/x/timeline/types.d.ts

@@ -22,10 +22,13 @@ export type Vec2Animation = Anim<TrackVec2>;
 export type TransformAnimation = Anim<TrackTransform>;
 export type VisualAnimations = {
     opacity?: ScalarAnimation;
+    transform?: TransformAnimation;
 };
-export interface AnimateAction {
-    <T extends VisualAnimatableItem>(item: T, terp: Interpolation, track: Keyframes): T;
-    make(terp: Interpolation, track: Keyframes): Item.Animation;
+export type VisualAnimationInput<TKey extends keyof VisualAnimations> = TKey extends "transform" ? Keyframes<Transform> : Keyframes;
+export type VisualAnimationValue<TKey extends keyof VisualAnimations> = TKey extends "transform" ? TransformAnimation : ScalarAnimation;
+export interface AnimateAction<TKey extends keyof VisualAnimations = keyof VisualAnimations> {
+    <T extends VisualAnimatableItem>(item: T, terp: Interpolation, track: VisualAnimationInput<TKey>): T;
+    make(terp: Interpolation, track: VisualAnimationInput<TKey>): Item.Animation;
 }
 export type TransformOptions = {
     position?: Vec2;

package/x/timeline/utils/anim.d.ts

@@ -1,5 +1,3 @@
-import { Item } from "../parts/item.js";
 import { ScalarAnimation, Transform, TransformAnimation } from "../types.js";
 export declare const resolveTransformAnimation: (time: number, anim: TransformAnimation) => Transform;
 export declare const resolveScalarAnimation: (time: number, anim: ScalarAnimation) => number;
-export declare const resolveTransform: (spatial: Item.Spatial | Item.AnimatedSpatial, time: number) => Transform;

package/x/timeline/utils/anim.js

@@ -1,5 +1,4 @@
 import { resolveTerp } from "./terps.js";
-import { Kind } from "../parts/item.js";
 const resolveScalar = (time, keys, terp, fallback = 0) => {
     if (keys.length === 0)
         return fallback;
@@ -38,7 +37,4 @@ export const resolveTransformAnimation = (time, anim) => ([
     resolveScalar(time, anim.track.rotation, anim.terp),
 ]);
 export const resolveScalarAnimation = (time, anim) => resolveScalar(time, anim.track, anim.terp);
-export const resolveTransform = (spatial, time) => spatial.kind === Kind.AnimatedSpatial
-    ? resolveTransformAnimation(time, spatial.anim)
-    : spatial.transform;
 //# sourceMappingURL=anim.js.map

package/x/timeline/utils/anim.js.map

@@ -1 +1 @@
-{"version":3,"file":"anim.js","sourceRoot":"","sources":["../../../s/timeline/utils/anim.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"anim.js","sourceRoot":"","sources":["../../../s/timeline/utils/anim.ts"],"names":[],"mappings":"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"}