@omnimedia/omnitool 1.1.0-73 → 1.1.0-75
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/s/demo/routines/timeline-setup.ts +12 -1
- package/s/driver/fns/schematic.ts +3 -0
- package/s/driver/parts/compositor.ts +53 -11
- package/s/timeline/parts/item.ts +3 -0
- package/s/timeline/renderers/parts/samplers/visual/parts/sample.ts +5 -2
- package/s/timeline/sugar/helpers.ts +3 -3
- package/s/timeline/sugar/o.ts +4 -3
- package/s/timeline/utils/matrix.ts +21 -0
- package/x/{browserAll-6TVTCHHE.js → browserAll-LRGVU2GN.js} +2 -2
- package/x/{demo/chunk-YJQWVIHX.js → chunk-D5CIWPNS.js} +2 -2
- package/x/{chunk-W33LM336.js → chunk-MWCIWPRL.js} +2 -2
- package/x/demo/{browserAll-5AZHDDG6.js → browserAll-QEV2P3ED.js} +2 -2
- package/x/{chunk-63NSCXPX.js → demo/chunk-IRDQEA6B.js} +2 -2
- package/x/demo/{chunk-5ZZYIILO.js → chunk-RWJ2UHV4.js} +2 -2
- package/x/demo/demo.bundle.min.js +7 -7
- package/x/demo/demo.bundle.min.js.map +3 -3
- package/x/demo/routines/timeline-setup.js +8 -1
- package/x/demo/routines/timeline-setup.js.map +1 -1
- package/x/demo/webworkerAll-ELLD4M57.js +2 -0
- package/x/driver/fns/schematic.d.ts +3 -0
- package/x/driver/parts/compositor.d.ts +12 -1
- package/x/driver/parts/compositor.js +46 -9
- package/x/driver/parts/compositor.js.map +1 -1
- package/x/index.html +2 -2
- package/x/tests.bundle.min.js +11 -11
- package/x/tests.bundle.min.js.map +3 -3
- package/x/tests.html +1 -1
- package/x/timeline/parts/item.d.ts +2 -0
- package/x/timeline/parts/item.js.map +1 -1
- package/x/timeline/renderers/parts/samplers/visual/parts/sample.js +5 -2
- package/x/timeline/renderers/parts/samplers/visual/parts/sample.js.map +1 -1
- package/x/timeline/sugar/helpers.d.ts +2 -2
- package/x/timeline/sugar/helpers.js +2 -2
- package/x/timeline/sugar/helpers.js.map +1 -1
- package/x/timeline/sugar/o.d.ts +2 -2
- package/x/timeline/sugar/o.js +3 -2
- package/x/timeline/sugar/o.js.map +1 -1
- package/x/timeline/utils/matrix.d.ts +9 -0
- package/x/timeline/utils/matrix.js +10 -0
- package/x/timeline/utils/matrix.js.map +1 -1
- package/x/webworkerAll-KR5SWEBU.js +2 -0
- package/x/demo/webworkerAll-QKIC5O27.js +0 -2
- package/x/webworkerAll-VVIU3M54.js +0 -2
- /package/x/{browserAll-6TVTCHHE.js.map → browserAll-LRGVU2GN.js.map} +0 -0
- /package/x/{chunk-63NSCXPX.js.map → chunk-D5CIWPNS.js.map} +0 -0
- /package/x/{chunk-W33LM336.js.map → chunk-MWCIWPRL.js.map} +0 -0
- /package/x/demo/{browserAll-5AZHDDG6.js.map → browserAll-QEV2P3ED.js.map} +0 -0
- /package/x/demo/{chunk-YJQWVIHX.js.map → chunk-IRDQEA6B.js.map} +0 -0
- /package/x/demo/{chunk-5ZZYIILO.js.map → chunk-RWJ2UHV4.js.map} +0 -0
- /package/x/demo/{webworkerAll-QKIC5O27.js.map → webworkerAll-ELLD4M57.js.map} +0 -0
- /package/x/{webworkerAll-VVIU3M54.js.map → webworkerAll-KR5SWEBU.js.map} +0 -0
package/x/tests.html
CHANGED
|
@@ -2,6 +2,7 @@ import { TextStyleOptions } from "pixi.js";
|
|
|
2
2
|
import { Id, Hash } from "./basics.js";
|
|
3
3
|
import { Transform } from "../types.js";
|
|
4
4
|
import { Ms } from "../../units/ms.js";
|
|
5
|
+
export type Crop = [top: number, right: number, bottom: number, left: number];
|
|
5
6
|
export declare enum Kind {
|
|
6
7
|
Sequence = 0,
|
|
7
8
|
Stack = 1,
|
|
@@ -26,6 +27,7 @@ export declare namespace Item {
|
|
|
26
27
|
id: Id;
|
|
27
28
|
kind: Kind.Spatial;
|
|
28
29
|
transform: Transform;
|
|
30
|
+
crop?: Crop;
|
|
29
31
|
enabled: boolean;
|
|
30
32
|
};
|
|
31
33
|
type Gap = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"item.js","sourceRoot":"","sources":["../../../s/timeline/parts/item.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"item.js","sourceRoot":"","sources":["../../../s/timeline/parts/item.ts"],"names":[],"mappings":"AASA,MAAM,CAAN,IAAY,IAUX;AAVD,WAAY,IAAI;IACf,uCAAQ,CAAA;IACR,iCAAK,CAAA;IACL,iCAAK,CAAA;IACL,iCAAK,CAAA;IACL,+BAAI,CAAA;IACJ,6BAAG,CAAA;IACH,qCAAO,CAAA;IACP,2CAAU,CAAA;IACV,yCAAS,CAAA;AACV,CAAC,EAVW,IAAI,KAAJ,IAAI,QAUf;AAED,MAAM,CAAN,IAAY,MAEX;AAFD,WAAY,MAAM;IACjB,6CAAS,CAAA;AACV,CAAC,EAFW,MAAM,KAAN,MAAM,QAEjB"}
|
|
@@ -3,6 +3,9 @@ import { computeWorldMatrix } from "../../../handy.js";
|
|
|
3
3
|
import { Kind } from "../../../../../parts/item.js";
|
|
4
4
|
export async function sampleVisual(ctx, item, time, ancestors) {
|
|
5
5
|
const matrix = computeWorldMatrix(ctx.items, ancestors, item);
|
|
6
|
+
const crop = "spatialId" in item && item.spatialId
|
|
7
|
+
? ctx.items.get(item.spatialId)?.crop
|
|
8
|
+
: undefined;
|
|
6
9
|
switch (item.kind) {
|
|
7
10
|
case Kind.Stack: {
|
|
8
11
|
const nextAnc = [...ancestors, item];
|
|
@@ -18,7 +21,7 @@ export async function sampleVisual(ctx, item, time, ancestors) {
|
|
|
18
21
|
if (time < 0 || time >= item.duration)
|
|
19
22
|
return [];
|
|
20
23
|
const frame = await ctx.videoSampler(item, time);
|
|
21
|
-
return frame ? [{ kind: "image", frame, matrix, id: item.id }] : [];
|
|
24
|
+
return frame ? [{ kind: "image", frame, matrix, crop, id: item.id }] : [];
|
|
22
25
|
}
|
|
23
26
|
case Kind.Text: {
|
|
24
27
|
if (time < 0 || time >= item.duration)
|
|
@@ -26,7 +29,7 @@ export async function sampleVisual(ctx, item, time, ancestors) {
|
|
|
26
29
|
const style = item.styleId
|
|
27
30
|
? ctx.items.get(item.styleId)?.style
|
|
28
31
|
: undefined;
|
|
29
|
-
return [{ id: item.id, kind: "text", content: item.content, style, matrix }];
|
|
32
|
+
return [{ id: item.id, kind: "text", content: item.content, style, matrix, crop }];
|
|
30
33
|
}
|
|
31
34
|
case Kind.Gap: {
|
|
32
35
|
return [{ id: item.id, kind: "gap" }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sample.js","sourceRoot":"","sources":["../../../../../../../s/timeline/renderers/parts/samplers/visual/parts/sample.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAA;AAE5C,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEpD,OAAO,EAAsB,IAAI,EAAC,MAAM,8BAA8B,CAAA;AAEtE,MAAM,CAAC,KAAK,UAAU,YAAY,CACjC,GAAkB,EAClB,IAAc,EACd,IAAQ,EACR,SAA0B;IAE1B,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"sample.js","sourceRoot":"","sources":["../../../../../../../s/timeline/renderers/parts/samplers/visual/parts/sample.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAA;AAE5C,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEpD,OAAO,EAAsB,IAAI,EAAC,MAAM,8BAA8B,CAAA;AAEtE,MAAM,CAAC,KAAK,UAAU,YAAY,CACjC,GAAkB,EAClB,IAAc,EACd,IAAQ,EACR,SAA0B;IAE1B,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;IAC7D,MAAM,IAAI,GAAG,WAAW,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS;QACjD,CAAC,CAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAA8B,EAAE,IAAI;QACnE,CAAC,CAAC,SAAS,CAAA;IAEZ,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACjB,MAAM,OAAO,GAAG,CAAC,GAAG,SAAS,EAAE,IAAI,CAAC,CAAA;YAEpC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,IAAI,CAAC,WAAW;iBACd,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAC5B,MAAM,CAAC,CAAC,KAAK,EAAqB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;iBAC7C,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CACvD,CAAA;YAED,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;QACrB,CAAC;QAED,KAAK,IAAI,CAAC,QAAQ;YACjB,OAAO,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;QAElD,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACjB,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,CAAA;YAEhD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAChD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACxE,CAAC;QAED,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAChB,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,CAAA;YAEhD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO;gBACzB,CAAC,CAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAoB,EAAE,KAAK;gBACxD,CAAC,CAAC,SAAS,CAAA;YAEZ,OAAO,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC,CAAA;QACjF,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACf,OAAO,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;QACpC,CAAC;QAED;YACC,OAAO,EAAE,CAAA;IACX,CAAC;AACF,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { TextStyleOptions } from "pixi.js";
|
|
2
2
|
import { O } from "./o.js";
|
|
3
|
-
import { Item } from "../parts/item.js";
|
|
4
3
|
import { Transform } from "../types.js";
|
|
5
4
|
import { Media } from "../parts/media.js";
|
|
5
|
+
import { Crop, Item } from "../parts/item.js";
|
|
6
6
|
import { TimelineFile } from "../parts/basics.js";
|
|
7
7
|
type Build<T extends Item.Any = Item.Any> = (o: O) => T;
|
|
8
8
|
export declare function timeline(root: Build): TimelineFile;
|
|
@@ -22,7 +22,7 @@ export declare function text(content: string, options?: {
|
|
|
22
22
|
styles?: TextStyleOptions;
|
|
23
23
|
}): Build<Item.Text>;
|
|
24
24
|
export declare function gap(duration: number): Build<Item.Gap>;
|
|
25
|
-
export declare function spatial(transform
|
|
25
|
+
export declare function spatial(transform?: Transform, crop?: Crop): Build<Item.Spatial>;
|
|
26
26
|
export declare function textStyle(style: TextStyleOptions): Build<Item.TextStyle>;
|
|
27
27
|
export declare const transition: {
|
|
28
28
|
crossfade(duration: number): Build<Item.Transition>;
|
|
@@ -32,8 +32,8 @@ export function text(content, options) {
|
|
|
32
32
|
export function gap(duration) {
|
|
33
33
|
return o => o.gap(duration);
|
|
34
34
|
}
|
|
35
|
-
export function spatial(transform) {
|
|
36
|
-
return o => o.spatial(transform);
|
|
35
|
+
export function spatial(transform, crop) {
|
|
36
|
+
return o => o.spatial(transform, crop);
|
|
37
37
|
}
|
|
38
38
|
export function textStyle(style) {
|
|
39
39
|
return o => o.textStyle(style);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../s/timeline/sugar/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AAQxB,SAAS,cAAc;IACtB,OAAO;QACN,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,CAAC;KACT,CAAA;AACF,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,IAAW;IACnC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,EAAC,QAAQ,EAAE,cAAc,EAAE,EAAC,CAAC,CAAA;IAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAA;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAG,KAAc;IACzC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAG,KAAc;IACtC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,KAAK,CACpB,KAAY,EACZ,OAGC;IAED,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,KAAK,CACpB,KAAY,EACZ,OAIC;IAED,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,IAAI,CACnB,OAAe,EACf,OAGC;IAED,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,QAAgB;IACnC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC5B,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../s/timeline/sugar/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,CAAC,EAAC,MAAM,QAAQ,CAAA;AAQxB,SAAS,cAAc;IACtB,OAAO;QACN,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,CAAC;KACT,CAAA;AACF,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,IAAW;IACnC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,EAAC,QAAQ,EAAE,cAAc,EAAE,EAAC,CAAC,CAAA;IAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAA;IAC3B,OAAO,CAAC,CAAC,QAAQ,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAG,KAAc;IACzC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAG,KAAc;IACtC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,KAAK,CACpB,KAAY,EACZ,OAGC;IAED,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,KAAK,CACpB,KAAY,EACZ,OAIC;IAED,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,IAAI,CACnB,OAAe,EACf,OAGC;IAED,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,QAAgB;IACnC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC5B,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,SAAqB,EAAE,IAAW;IACzD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAuB;IAChD,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG;IACzB,SAAS,CAAC,QAAgB;QACzB,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAC7C,CAAC;CACD,CAAA"}
|
package/x/timeline/sugar/o.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { TextStyleOptions } from "pixi.js";
|
|
2
2
|
import { Media } from "../parts/media.js";
|
|
3
3
|
import { Id, TimelineFile } from "../parts/basics.js";
|
|
4
|
-
import { Item } from "../parts/item.js";
|
|
4
|
+
import { Crop, Item } from "../parts/item.js";
|
|
5
5
|
import { Transform, TransformOptions } from "../types.js";
|
|
6
6
|
export declare class O {
|
|
7
7
|
#private;
|
|
@@ -16,7 +16,7 @@ export declare class O {
|
|
|
16
16
|
getId(): number;
|
|
17
17
|
register(item: Item.Any): void;
|
|
18
18
|
textStyle: (style: TextStyleOptions) => Item.TextStyle;
|
|
19
|
-
spatial: (transform
|
|
19
|
+
spatial: (transform?: Transform, crop?: Crop) => Item.Spatial;
|
|
20
20
|
sequence: (...items: Item.Any[]) => Item.Sequence;
|
|
21
21
|
stack: (...items: Item.Any[]) => Item.Stack;
|
|
22
22
|
video: (media: Media, options?: {
|
package/x/timeline/sugar/o.js
CHANGED
|
@@ -35,11 +35,12 @@ export class O {
|
|
|
35
35
|
this.register(item);
|
|
36
36
|
return item;
|
|
37
37
|
};
|
|
38
|
-
spatial = (transform) => {
|
|
38
|
+
spatial = (transform, crop) => {
|
|
39
39
|
const item = {
|
|
40
40
|
id: this.getId(),
|
|
41
41
|
kind: Kind.Spatial,
|
|
42
|
-
transform,
|
|
42
|
+
transform: transform ?? this.transform(),
|
|
43
|
+
crop,
|
|
43
44
|
enabled: true
|
|
44
45
|
};
|
|
45
46
|
this.register(item);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAA;AAK7B,OAAO,
|
|
1
|
+
{"version":3,"file":"o.js","sourceRoot":"","sources":["../../../s/timeline/sugar/o.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAA;AAK7B,OAAO,EAAO,MAAM,EAAQ,IAAI,EAAC,MAAM,kBAAkB,CAAA;AAGzD,MAAM,OAAO,CAAC;IACM;IAAnB,YAAmB,KAA+B;QAA/B,UAAK,GAAL,KAAK,CAA0B;IAAG,CAAC;IAEtD,OAAO,CAAqB,EAAkB;QAC3C,IAAI,EAAE,KAAK,SAAS;YACnB,OAAO,SAAS,CAAA;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;QACnE,OAAO,IAAqB,CAAA;IAC/B,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAA;IAC3B,CAAC;IAED,KAAK;QACJ,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAA;IACnC,CAAC;IAEA,OAAO,CAAC,EAA2C;QACjD,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC/C,CAAC;IAEF,QAAQ,CAAC,IAAc;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACtB,GAAG,KAAK;YACR,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC;SAC7B,CAAC,CAAC,CAAA;IACJ,CAAC;IAEA,SAAS,GAAG,CAAC,KAAuB,EAAkB,EAAE;QACxD,MAAM,IAAI,GAAG;YACZ,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,IAAI,EAAE,IAAI,CAAC,SAAS;YACpB,KAAK;SACa,CAAA;QACnB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACX,CAAC,CAAA;IAED,OAAO,GAAG,CAAC,SAAqB,EAAE,IAAW,EAAgB,EAAE;QAC9D,MAAM,IAAI,GAAiB;YAC1B,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,IAAI,EAAE,IAAI,CAAC,OAAO;YAClB,SAAS,EAAE,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE;YACxC,IAAI;YACJ,OAAO,EAAE,IAAI;SACb,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAClB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IAEF,QAAQ,GAAG,CAAC,GAAG,KAAiB,EAAiB,EAAE;QAClD,MAAM,IAAI,GAAI;YACb,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACtB,CAAA;QAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IAED,KAAK,GAAG,CAAC,GAAG,KAAiB,EAAc,EAAE;QAC5C,MAAM,IAAI,GAAG;YACZ,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACzB,CAAA;QACf,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IAED,KAAK,GAAG,CACP,KAAY,EACZ,OAGC,EAAc,EAAE;QAEjB,IAAG,CAAC,KAAK,CAAC,QAAQ;YACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,KAAK,CAAC,QAAQ,CAAC,QAAQ,uBAAuB,CAAC,CAAA;QAE5F,MAAM,IAAI,GAAe;YACxB,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;YACvC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;YAC1B,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,KAAK,CAAC,QAAQ;SAC7C,CAAA;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IAED,KAAK,GAAG,CACP,KAAY,EACZ,OAIC,EAAc,EAAE;QAEjB,IAAG,CAAC,KAAK,CAAC,QAAQ;YACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,KAAK,CAAC,QAAQ,CAAC,QAAQ,uBAAuB,CAAC,CAAA;QAE5F,MAAM,IAAI,GAAe;YACxB,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI;YACvC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;YAC1B,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,KAAK,CAAC,QAAQ;YAC7C,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC;SACxB,CAAA;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IAED,IAAI,GAAG,CAAC,OAAe,EAAE,OAGvB,EAAa,EAAE;QAEhB,MAAM,IAAI,GAAG;YACZ,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,IAAI;SACtB,CAAA;QAEd,IAAG,OAAO,EAAE,MAAM;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;QAEjD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IAED,GAAG,GAAG,CAAC,QAAgB,EAAY,EAAE;QACpC,MAAM,IAAI,GAAG;YACZ,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;YAChB,IAAI,EAAE,IAAI,CAAC,GAAG;YACd,QAAQ;SACI,CAAA;QACb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IAED,UAAU,GAAG;QACZ,SAAS,EAAE,CAAC,QAAgB,EAAmB,EAAE;YAChD,MAAM,IAAI,GAAG;gBACZ,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE;gBAChB,IAAI,EAAE,IAAI,CAAC,UAAU;gBACrB,MAAM,EAAE,MAAM,CAAC,SAAS;gBACxB,QAAQ;aACW,CAAA;YACpB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACnB,OAAO,IAAI,CAAA;QACZ,CAAC;KACD,CAAA;IAEA,SAAS,GAAG,CAAC,OAA0B,EAAa,EAAE;QACpD,MAAM,QAAQ,GAAS;YACtB,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC3B,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAC3B,CAAA;QACD,MAAM,KAAK,GAAS;YACnB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACxB,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACxB,CAAA;QACD,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,CAAC,CAAA;QACvC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;IACpC,CAAC,CAAA;IAED,WAAW,CAAC,MAAkC,EAAE,GAAG,KAAiB;QACpE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACpB,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAe,CAAA;YAC7E,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;YAC1D,OAAO,KAAK,CAAA;QACb,CAAC,CAAC,CAAA;IACF,CAAC;IAEF,GAAG,GAAG,CACL,EAAM,EACN,OAAmB,EAClB,EAAE;QACH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACxB,GAAG,OAAO;YACV,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAC/B,IAAI,CAAC,EAAE,KAAK,EAAE;gBACb,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,EAAE;gBACzB,CAAC,CAAC,IAAI,CACP;SACD,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;CACD"}
|
|
@@ -4,5 +4,14 @@ export declare const transformToMat6: (t: Transform) => Mat6;
|
|
|
4
4
|
export declare const mat6ToMatrix: ([a, b, c, d, tx, ty]: Mat6) => Matrix;
|
|
5
5
|
export declare const transformToMatrix: (t: Transform) => Matrix;
|
|
6
6
|
export declare const mul6: (local: Mat6, parent: Mat6) => Mat6;
|
|
7
|
+
export declare const mat6ToTransform: (mat: Mat6Obj) => Transform;
|
|
8
|
+
export interface Mat6Obj {
|
|
9
|
+
a: number;
|
|
10
|
+
b: number;
|
|
11
|
+
c: number;
|
|
12
|
+
d: number;
|
|
13
|
+
tx: number;
|
|
14
|
+
ty: number;
|
|
15
|
+
}
|
|
7
16
|
export declare const I6: Mat6;
|
|
8
17
|
export type Mat6 = [a: number, b: number, c: number, d: number, tx: number, ty: number];
|
|
@@ -22,5 +22,15 @@ export const mul6 = (local, parent) => {
|
|
|
22
22
|
b1 * tx2 + d1 * ty2 + ty1
|
|
23
23
|
];
|
|
24
24
|
};
|
|
25
|
+
export const mat6ToTransform = (mat) => {
|
|
26
|
+
const scaleX = Math.hypot(mat.a, mat.b);
|
|
27
|
+
const scaleY = Math.hypot(mat.c, mat.d);
|
|
28
|
+
const rotation = Math.atan2(mat.b, mat.a) * (180 / Math.PI);
|
|
29
|
+
return [
|
|
30
|
+
[mat.tx, mat.ty],
|
|
31
|
+
[scaleX, scaleY],
|
|
32
|
+
rotation,
|
|
33
|
+
];
|
|
34
|
+
};
|
|
25
35
|
export const I6 = [1, 0, 0, 1, 0, 0];
|
|
26
36
|
//# sourceMappingURL=matrix.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matrix.js","sourceRoot":"","sources":["../../../s/timeline/utils/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAA;AAG9B,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAY,EAAQ,EAAE;IACrD,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAA;IAClB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAA;IACpB,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,CAAA;IAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACvB,OAAO,CAAC,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAO,EAAU,EAAE,CAClE,IAAI,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;AAE/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAY,EAAE,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;AAEnF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAW,EAAE,MAAY,EAAQ,EAAE;IACvD,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAA;IACxC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAA;IACzC,OAAO;QACN,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG;QACzB,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG;KACzB,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,EAAE,GAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"matrix.js","sourceRoot":"","sources":["../../../s/timeline/utils/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAA;AAG9B,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAY,EAAQ,EAAE;IACrD,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAA;IAClB,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,CAAA;IACpB,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,CAAA;IAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACvB,OAAO,CAAC,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAO,EAAU,EAAE,CAClE,IAAI,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;AAE/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAY,EAAE,EAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;AAEnF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAW,EAAE,MAAY,EAAQ,EAAE;IACvD,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAA;IACxC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAA;IACzC,OAAO;QACN,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;QACjB,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG;QACzB,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG;KACzB,CAAA;AACF,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAY,EAAa,EAAE;IAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;IACvC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAA;IAE3D,OAAO;QACN,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;QAChB,CAAC,MAAM,EAAE,MAAM,CAAC;QAChB,QAAQ;KACR,CAAA;AACF,CAAC,CAAA;AAWD,MAAM,CAAC,MAAM,EAAE,GAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|