@omnimedia/omnitool 1.1.0-19 → 1.1.0-21

package/package.json

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

package/s/timeline/parts/compositor/parts/schedulers.ts

@@ -17,7 +17,7 @@ export const realtime = (
   let fps = 60
 
   let frameDuration = 1000 / fps
-  let currentTimeS = 0
+  let composeTime = 0
   let lastTime = 0
   let accumulator = 0
   let currentTime = 0
@@ -29,12 +29,12 @@ export const realtime = (
     lastTime = now
 
     accumulator += deltaTime
-    currentTime += deltaTime / 1000
+    currentTime += deltaTime
   	onUpdate(currentTime)
 
     while (accumulator >= frameDuration) {
-      onTick(currentTimeS)
-      currentTimeS += frameDuration / 1000
+      onTick(composeTime)
+      composeTime += frameDuration
       accumulator -= frameDuration
     }
 
@@ -54,11 +54,11 @@ export const realtime = (
       if (rafId !== null) cancelAnimationFrame(rafId)
       rafId = null
     },
-    seek(t) {
-      currentTimeS = Math.max(0, t)
+    seek(ms) {
+      composeTime = ms
       accumulator = 0
-      currentTime = t
-      onUpdate(t)
+      currentTime = ms
+      onUpdate(ms)
     },
     dispose() {
       this.pause()

package/s/timeline/parts/compositor/playback.ts

@@ -13,7 +13,7 @@ type ResolveMedia = (hash: string) => DecoderSource
 export class VideoPlayer {
 	readonly currentTime = signal(0)
 	#controller = realtime(
-		tickTime => this.#tick(tickTime),
+		compositeTime => this.#tick(compositeTime),
 		currentTime => this.currentTime(currentTime)
 	)
 
@@ -42,15 +42,15 @@ export class VideoPlayer {
 		return new this(driver, canvas, root, sampler)
 	}
 
-	async #tick(t: number) {
-		const dur = this.root.duration
-		const tt = (t > dur ? dur : t) * 1000
+	async #tick(ms: number) {
+		const duration = this.root.duration
+		const tt = ms > duration ? duration : ms
 		this.root.audio?.onTimeUpdate(tt)
 		const layers = await this.root.visuals?.sampleAt(tt) ?? []
 		const frame = await this.driver.composite(layers)
 		this.context.drawImage(frame, 0, 0)
 		frame.close()
-		if (t >= dur) this.pause()
+		if (ms >= duration) this.pause()
 	}
 
 	async play() {

package/s/timeline/parts/item.ts

@@ -12,6 +12,7 @@ export enum Kind {
 	Gap,
 	Spatial,
 	Transition,
+	TextStyle
 }
 
 export enum Effect {
@@ -19,6 +20,12 @@ export enum Effect {
 }
 
 export namespace Item {
+  export type TextStyle = {
+    id: Id
+    kind: Kind.TextStyle
+		style: TextStyleOptions
+  }
+
   export type Spatial = {
     id: Id
     kind: Kind.Spatial
@@ -68,7 +75,7 @@ export namespace Item {
 		content: string
 		duration: number
 		spatialId?: Id
-		style: TextStyleOptions
+		styleId?: Id
 	}
 
 	export type Transition = {

package/s/timeline/sugar/o.ts

@@ -1,3 +1,4 @@
+import {TextStyleOptions} from "pixi.js"
 
 import {Media} from "../parts/media.js"
 import {Id, TimelineFile} from "../parts/basics.js"
@@ -22,6 +23,12 @@ export class O {
     this.state.project = fn(this.state.project)
   }
 
+  textStyle = (style: TextStyleOptions): Item.TextStyle => ({
+		id: this.#getId(),
+		kind: Kind.TextStyle,
+		style
+  })
+
   spatial = (transform: Transform): Item.Spatial => {
   	const item: Item.Spatial = {
   		id: this.#getId(),
@@ -107,8 +114,7 @@ export class O {
 		id: this.#getId(),
 		content,
 		kind: Kind.Text,
-		duration: 2000,
-		style: {}
+		duration: 2000
 	})
 
 	gap = (duration: number): Item.Gap => ({
@@ -147,5 +153,20 @@ export class O {
 			return state
 		})
   }
+
+	update = <K extends keyof Item.Any>(itemId: Id, key: K, value: Item.Any[K]) => {
+    this.#mutate(project => {
+      const newItems = project.items.map(item => {
+        if (item.id === itemId) {
+          return {
+            ...item,
+            [key]: value,
+          }
+        }
+        return item
+      })
+      return {...project, items: newItems}
+    })
+	}
 }