@omnimedia/omnitool 1.1.0-84 → 1.1.0-85

package/README.md

@@ -233,7 +233,7 @@ const timeline = omni.timeline(o => {
 		duration: 2000,
 		styles: {fill: "white", fontSize: 36},
 	})
-	o.set(title.id, {animationId: fadeIn.id})
+	o.set(title.id, {animationIds: [fadeIn.id]})
 
 	return o.stack(
 		o.video(clip, {duration: 4000}),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@omnimedia/omnitool",
-	"version": "1.1.0-84",
+	"version": "1.1.0-85",
 	"description": "open source video processing tools",
 	"license": "MIT",
 	"author": "Przemysław Gałęzki",

package/s/demo/routines/timeline-setup.ts

@@ -32,7 +32,7 @@ export async function TimelineSchemaTest(driver: Driver, file: File) {
 		)
 
 		const video = o.video(videoA, {duration: 3000, start: 1000})
-		o.set<Item.Text>(text.id, {styleId: style.id, spatialId: textSpatial.id, animationId: fade.id})
+		o.set<Item.Text>(text.id, {styleId: style.id, spatialId: textSpatial.id, animationIds: [fade.id]})
 		o.set<Item.Video>(video.id, {spatialId: videoSpatial.id})
 
 		return o.sequence(

package/s/timeline/parts/item.ts

@@ -94,7 +94,7 @@ export namespace Item {
 		start: number
 		duration: number
 		spatialId?: Id
-		animationId?: Id
+		animationIds?: Id[]
 		filterIds?: Id[]
 	}
 
@@ -113,7 +113,7 @@ export namespace Item {
 		content: string
 		duration: number
 		spatialId?: Id
-		animationId?: Id
+		animationIds?: Id[]
 		styleId?: Id
 		filterIds?: Id[]
 	}

package/s/timeline/renderers/parts/handy.ts

@@ -1,4 +1,5 @@
 
+import {Keyframes} from '../../types.js'
 import {ms, Ms} from '../../../units/ms.js'
 import {Id, TimelineFile} from '../../parts/basics.js'
 import { SampleContext } from './samplers/visual/parts/types.js'
@@ -366,12 +367,30 @@ export function computeOpacity(
 	item: Item.Any,
 	time: Ms,
 ) {
-	if (!("animationId" in item) || item.animationId === undefined)
+	if (!("animationIds" in item) || item.animationIds === undefined)
 		return 1
 
-	const animation = ctx.items.get(item.animationId) as Item.Animation | undefined
-	return animation?.enabled && animation.anims.opacity
-		? resolveScalarAnimation(time, animation.anims.opacity)
-		: 1
+	let opacity = 1
+	for (const id of item.animationIds) {
+		const animation = ctx.items.get(id) as Item.Animation | undefined
+		const anim = animation?.anims.opacity
+		if (animation?.enabled && anim && keyframesActiveAt(anim.track, time))
+			opacity = resolveScalarAnimation(time, anim)
+	}
+	return opacity
+}
+
+function keyframesActiveAt(keys: Keyframes, time: Ms) {
+	if (keys.length === 0)
+		return false
+
+	let start = keys[0][0]
+	let end = keys[0][0]
+	for (const [keyTime] of keys) {
+		start = Math.min(start, keyTime)
+		end = Math.max(end, keyTime)
+	}
+
+	return time >= start && time <= end
 }
 

package/s/timeline/sugar/o.ts

@@ -177,7 +177,7 @@ export class O {
 			const animation = make(terp, track)
 			const next = {
 				...item,
-				animationId: animation.id
+				animationIds: [...(item.animationIds ?? []), animation.id]
 			}
 			this.set<T>(item.id, next as Partial<T>)
 			return next