3 files changed, 58 insertions, 11 deletions

diff --git a/apps/web/src/services/renderer/compositor/frame-descriptor.ts b/apps/web/src/services/renderer/compositor/frame-descriptor.ts
index d5ab88c3..d2bff525 100644
--- a/apps/web/src/services/renderer/compositor/frame-descriptor.ts
+++ b/apps/web/src/services/renderer/compositor/frame-descriptor.ts
@@ -121,13 +121,43 @@ async function collectNode({
 	}
 
 	if (node instanceof EffectLayerNode) {
-		if (!node.resolved || node.resolved.passes.length === 0) {
+		if (!node.resolved) {
 			return;
 		}
-		items.push({
-			type: "sceneEffect",
-			effectPassGroups: [node.resolved.passes],
-		});
+		const { motion, passes } = node.resolved;
+		if (
+			motion &&
+			(motion.scale !== 1 ||
+				motion.translateX !== 0 ||
+				motion.translateY !== 0 ||
+				(motion.rotate ?? 0) !== 0)
+		) {
+			const { width, height } = renderer;
+			for (const item of items) {
+				if (item.type !== "layer") continue;
+				item.transform = {
+					...item.transform,
+					centerX:
+						width / 2 +
+						(item.transform.centerX - width / 2) * motion.scale +
+						motion.translateX * width,
+					centerY:
+						height / 2 +
+						(item.transform.centerY - height / 2) * motion.scale +
+						motion.translateY * height,
+					width: item.transform.width * motion.scale,
+					height: item.transform.height * motion.scale,
+					rotationDegrees:
+						item.transform.rotationDegrees + (motion.rotate ?? 0),
+				};
+			}
+		}
+		if (passes.length > 0) {
+			items.push({
+				type: "sceneEffect",
+				effectPassGroups: [passes],
+			});
+		}
 		return;
 	}
 
diff --git a/apps/web/src/services/renderer/nodes/effect-layer-node.ts b/apps/web/src/services/renderer/nodes/effect-layer-node.ts
index d1b51fa3..791d20ce 100644
--- a/apps/web/src/services/renderer/nodes/effect-layer-node.ts
+++ b/apps/web/src/services/renderer/nodes/effect-layer-node.ts
@@ -1,4 +1,4 @@
-import type { EffectPass } from "@/effects/types";
+import type { EffectPass, MotionOffset } from "@/effects/types";
 import type { ParamValues } from "@/params";
 import { BaseNode } from "./base-node";
 
@@ -11,6 +11,7 @@ export type EffectLayerNodeParams = {
 
 export type ResolvedEffectLayerNodeState = {
 	passes: EffectPass[];
+	motion?: MotionOffset;
 };
 
 export class EffectLayerNode extends BaseNode<
diff --git a/apps/web/src/services/renderer/resolve.ts b/apps/web/src/services/renderer/resolve.ts
index a4c8d303..12f57e30 100644
--- a/apps/web/src/services/renderer/resolve.ts
+++ b/apps/web/src/services/renderer/resolve.ts
@@ -6,8 +6,10 @@ import {
 	intensityToSigma,
 } from "@/effects/definitions/blur";
 import { effectsRegistry, resolveEffectPasses } from "@/effects";
-import { applyMotionEffects } from "@/effects/motion";
+import { applyMotionEffects, sampleEasingBezier } from "@/effects/motion";
 import type { Effect, EffectPass } from "@/effects/types";
+import { BUILTIN_PRESETS } from "@/timeline/components/graph-editor/easing-presets";
+import { clamp } from "@/utils/math";
 import { getSourceTimeAtClipTime } from "@/retime";
 import {
 	DEFAULT_GRAPHIC_SOURCE_SIZE,
@@ -479,11 +481,25 @@ function resolveEffectLayerNode({
 		width: context.renderer.width,
 		height: context.renderer.height,
 	});
-	if (passes.length === 0) {
+
+	const motion = definition.motion?.evaluate({
+		effectParams: node.params.effectParams,
+		progress: sampleEasingBezier({
+			bezier:
+				BUILTIN_PRESETS.find(
+					(entry) => entry.id === node.params.effectParams.easing,
+				)?.value ?? [0.25, 0.1, 0.25, 1],
+			x: clamp({
+				value: (time - node.params.timeOffset) / node.params.duration,
+				min: 0,
+				max: 1,
+			}),
+		}),
+	});
+
+	if (passes.length === 0 && !motion) {
 		return null;
 	}
 
-	return {
-		passes,
-	};
+	return motion ? { passes, motion } : { passes };
 }