summaryrefslogtreecommitdiff
path: root/apps/web/src/lib/animation
diff options
context:
space:
mode:
authorMaze Winther <mazewinther@gmail.com>2026-03-02 13:13:07 +0100
committerMaze Winther <mazewinther@gmail.com>2026-03-02 13:13:07 +0100
commite7dcb586c0408255a0bf788e355fdb6d50d9b923 (patch)
tree74ff0fc0f1ba501a075342db9b4e454450926154 /apps/web/src/lib/animation
parent93bea01c9ed3fcbebc64c9cef382a51d24c925ed (diff)
downloadopencut-e7dcb586c0408255a0bf788e355fdb6d50d9b923.tar.gz
feat: Clip effects, asset sorting, and timeline improvements
Major features and improvements: * **Clip Effects**: * Added UI in Properties Panel to manage effects on video/image clips (add, remove, toggle, reorder). * Implemented dynamic parameter fields for effects. * Added support for keyframing effect parameters. * **Assets Panel**: * Added sorting options: Name, Type, Duration, and File Size. * Persisted view preferences (grid/list mode, sort order) to local storage. * Refactored media item rendering and drag interactions. * **Timeline & Interaction**: * **Keyframe Dragging**: Added ability to drag keyframes directly on the timeline element. * **Resizing**: Improved resize logic to respect neighboring clips (prevents overlaps). * **Visuals**: Implemented tiled background rendering for video/image clips on the timeline. * **Shortcuts**: Added "Deselect All" action bound to the `Escape` key. * **Fixes**: Corrected drag-and-drop coordinate calculations when the timeline track area is scrolled. * **Text Elements**: * Refactored text background storage to use an explicit `enabled` flag. * Added `V8toV9` storage migration to update existing projects. * **Architecture**: * Moved export state management to `ProjectManager` for better lifecycle handling. * Refactored `PropertiesPanel` sections to be more composable (custom headers, borders).
Diffstat (limited to 'apps/web/src/lib/animation')
-rw-r--r--apps/web/src/lib/animation/effect-param-channel.ts117
-rw-r--r--apps/web/src/lib/animation/keyframes.ts32
2 files changed, 142 insertions, 7 deletions
diff --git a/apps/web/src/lib/animation/effect-param-channel.ts b/apps/web/src/lib/animation/effect-param-channel.ts
new file mode 100644
index 00000000..07efe4d8
--- /dev/null
+++ b/apps/web/src/lib/animation/effect-param-channel.ts
@@ -0,0 +1,117 @@
+import type { Effect, EffectParamValues } from "@/types/effects";
+import type {
+ ElementAnimations,
+ NumberAnimationChannel,
+} from "@/types/animation";
+import {
+ getChannel,
+ removeKeyframe,
+ setChannel,
+ upsertKeyframe,
+} from "./keyframes";
+import { getChannelValueAtTime } from "./interpolation";
+
+const EFFECT_PARAM_PATH_PREFIX = "effects.";
+const EFFECT_PARAM_PATH_SUFFIX = ".params.";
+
+function buildEffectParamPath({
+ effectId,
+ paramKey,
+}: {
+ effectId: string;
+ paramKey: string;
+}): string {
+ return `${EFFECT_PARAM_PATH_PREFIX}${effectId}${EFFECT_PARAM_PATH_SUFFIX}${paramKey}`;
+}
+
+export function resolveEffectParamsAtTime({
+ effect,
+ animations,
+ localTime,
+}: {
+ effect: Effect;
+ animations: ElementAnimations | undefined;
+ localTime: number;
+}): EffectParamValues {
+ const resolved: EffectParamValues = {};
+
+ for (const [paramKey, staticValue] of Object.entries(effect.params)) {
+ const path = buildEffectParamPath({ effectId: effect.id, paramKey });
+ const channel = getChannel({ animations, propertyPath: path });
+ if (channel && channel.keyframes.length > 0) {
+ resolved[paramKey] = getChannelValueAtTime({
+ channel,
+ time: localTime,
+ fallbackValue: staticValue,
+ }) as number | string | boolean;
+ } else {
+ resolved[paramKey] = staticValue;
+ }
+ }
+
+ return resolved;
+}
+
+const EMPTY_NUMBER_CHANNEL: NumberAnimationChannel = {
+ valueKind: "number",
+ keyframes: [],
+};
+
+export function upsertEffectParamKeyframe({
+ animations,
+ effectId,
+ paramKey,
+ time,
+ value,
+ interpolation,
+ keyframeId,
+}: {
+ animations: ElementAnimations | undefined;
+ effectId: string;
+ paramKey: string;
+ time: number;
+ value: number;
+ interpolation?: "linear" | "hold";
+ keyframeId?: string;
+}): ElementAnimations | undefined {
+ const path = buildEffectParamPath({ effectId, paramKey });
+ const channel = getChannel({ animations, propertyPath: path });
+ const targetChannel =
+ channel && channel.valueKind === "number" ? channel : EMPTY_NUMBER_CHANNEL;
+ const updatedChannel = upsertKeyframe({
+ channel: targetChannel,
+ time,
+ value,
+ interpolation: interpolation ?? "linear",
+ keyframeId,
+ });
+
+ return (
+ setChannel({
+ animations,
+ propertyPath: path,
+ channel: updatedChannel,
+ }) ?? { channels: {} }
+ );
+}
+
+export function removeEffectParamKeyframe({
+ animations,
+ effectId,
+ paramKey,
+ keyframeId,
+}: {
+ animations: ElementAnimations | undefined;
+ effectId: string;
+ paramKey: string;
+ keyframeId: string;
+}): ElementAnimations | undefined {
+ const path = buildEffectParamPath({ effectId, paramKey });
+ const channel = getChannel({ animations, propertyPath: path });
+ const updatedChannel = removeKeyframe({ channel, keyframeId });
+ return setChannel({
+ animations,
+ propertyPath: path,
+ channel: updatedChannel,
+ });
+}
diff --git a/apps/web/src/lib/animation/keyframes.ts b/apps/web/src/lib/animation/keyframes.ts
index 56f156a4..3e3613f2 100644
--- a/apps/web/src/lib/animation/keyframes.ts
+++ b/apps/web/src/lib/animation/keyframes.ts
@@ -127,7 +127,9 @@ function buildKeyframe({
}
if (typeof value !== "string" && typeof value !== "boolean") {
- throw new Error("Discrete channel keyframes require boolean or string values");
+ throw new Error(
+ "Discrete channel keyframes require boolean or string values",
+ );
}
return {
@@ -145,14 +147,23 @@ function createEmptyChannel({
}): AnimationChannel {
const propertyDefinition = getAnimationPropertyDefinition({ propertyPath });
if (propertyDefinition.valueKind === "number") {
- return { valueKind: "number", keyframes: [] } satisfies NumberAnimationChannel;
+ return {
+ valueKind: "number",
+ keyframes: [],
+ } satisfies NumberAnimationChannel;
}
if (propertyDefinition.valueKind === "color") {
- return { valueKind: "color", keyframes: [] } satisfies ColorAnimationChannel;
+ return {
+ valueKind: "color",
+ keyframes: [],
+ } satisfies ColorAnimationChannel;
}
- return { valueKind: "discrete", keyframes: [] } satisfies DiscreteAnimationChannel;
+ return {
+ valueKind: "discrete",
+ keyframes: [],
+ } satisfies DiscreteAnimationChannel;
}
export function upsertKeyframe({
@@ -432,7 +443,10 @@ export function splitAnimationsAtTime({
const hasBoundaryOnRight = rightKeyframes.some((keyframe) =>
isNearlySameTime({ leftTime: keyframe.time, rightTime: 0 }),
);
- if (shouldIncludeSplitBoundary && (!hasBoundaryOnLeft || !hasBoundaryOnRight)) {
+ if (
+ shouldIncludeSplitBoundary &&
+ (!hasBoundaryOnLeft || !hasBoundaryOnRight)
+ ) {
const boundaryValue = getChannelValueAtTime({
channel: normalizedChannel,
time: splitTime,
@@ -442,7 +456,9 @@ export function splitAnimationsAtTime({
? (propertyPath as AnimationPropertyPath)
: null;
const boundaryInterpolation = knownPropertyPath
- ? getDefaultInterpolationForProperty({ propertyPath: knownPropertyPath })
+ ? getDefaultInterpolationForProperty({
+ propertyPath: knownPropertyPath,
+ })
: normalizedChannel.valueKind === "discrete"
? "hold"
: "linear";
@@ -523,7 +539,9 @@ export function upsertElementKeyframe({
return animations;
}
- const defaultInterpolation = getDefaultInterpolationForProperty({ propertyPath });
+ const defaultInterpolation = getDefaultInterpolationForProperty({
+ propertyPath,
+ });
const propertyDefinition = getAnimationPropertyDefinition({ propertyPath });
const channel = getChannel({ animations, propertyPath });
const targetChannel =