@omnimedia/omnitool 1.1.0-70 → 1.1.0-72
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/driver/parts/compositor.ts +44 -14
- package/x/demo/demo.bundle.min.js +5 -5
- package/x/demo/demo.bundle.min.js.map +3 -3
- package/x/driver/parts/compositor.d.ts +8 -0
- package/x/driver/parts/compositor.js +37 -13
- package/x/driver/parts/compositor.js.map +1 -1
- package/x/index.html +2 -2
- package/x/tests.bundle.min.js +10 -10
- package/x/tests.bundle.min.js.map +3 -3
- package/x/tests.html +1 -1
|
@@ -7,6 +7,14 @@ export declare class Compositor {
|
|
|
7
7
|
renderer: Renderer;
|
|
8
8
|
stage: Container;
|
|
9
9
|
};
|
|
10
|
+
onPointerDown: import("@e280/stz").Pub<[{
|
|
11
|
+
id: Id;
|
|
12
|
+
object: Container;
|
|
13
|
+
}]>;
|
|
14
|
+
onPointerUp: import("@e280/stz").Pub<[{
|
|
15
|
+
id: Id;
|
|
16
|
+
object: Container;
|
|
17
|
+
}]>;
|
|
10
18
|
static setup(): Promise<Compositor>;
|
|
11
19
|
constructor(pixi: {
|
|
12
20
|
renderer: Renderer;
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
import { pub } from "@e280/stz";
|
|
1
2
|
import { autoDetectRenderer, Container, Sprite, Text, Texture } from "pixi.js";
|
|
2
3
|
import { mat6ToMatrix } from "../../timeline/utils/matrix.js";
|
|
3
4
|
import { makeTransition } from "../../features/transition/transition.js";
|
|
4
5
|
export class Compositor {
|
|
5
6
|
pixi;
|
|
7
|
+
onPointerDown = pub();
|
|
8
|
+
onPointerUp = pub();
|
|
6
9
|
static async setup() {
|
|
7
10
|
const renderer = await autoDetectRenderer({
|
|
8
11
|
width: 1920,
|
|
@@ -39,7 +42,7 @@ export class Compositor {
|
|
|
39
42
|
* get object for current Composition
|
|
40
43
|
* */
|
|
41
44
|
getActiveObject(id) {
|
|
42
|
-
return this.#activeObjects.get(id);
|
|
45
|
+
return this.#activeObjects.get(id)?.sprite;
|
|
43
46
|
}
|
|
44
47
|
async #renderLayer(layer, parent) {
|
|
45
48
|
if (Array.isArray(layer)) {
|
|
@@ -68,9 +71,9 @@ export class Compositor {
|
|
|
68
71
|
}
|
|
69
72
|
}
|
|
70
73
|
#renderTextLayer(layer, parent) {
|
|
71
|
-
const
|
|
72
|
-
this.#applyTransform(
|
|
73
|
-
parent.addChild(
|
|
74
|
+
const sprite = this.#findOrCreate(layer);
|
|
75
|
+
this.#applyTransform(sprite, layer.matrix);
|
|
76
|
+
parent.addChild(sprite);
|
|
74
77
|
return {
|
|
75
78
|
dispose: () => { }
|
|
76
79
|
};
|
|
@@ -115,22 +118,42 @@ export class Compositor {
|
|
|
115
118
|
text: layer.content,
|
|
116
119
|
style: layer.style
|
|
117
120
|
});
|
|
118
|
-
text.
|
|
121
|
+
text.eventMode = "static";
|
|
122
|
+
const down = () => this.onPointerDown.publish({ id: layer.id, object: text });
|
|
123
|
+
const up = () => this.onPointerUp.publish({ id: layer.id, object: text });
|
|
124
|
+
text.on("pointerdown", down);
|
|
125
|
+
text.on("pointerup", up);
|
|
119
126
|
return this.#activeObjects
|
|
120
|
-
.set(layer.id,
|
|
121
|
-
|
|
127
|
+
.set(layer.id, {
|
|
128
|
+
sprite: text,
|
|
129
|
+
dispose() {
|
|
130
|
+
text.off("pointerdown", down);
|
|
131
|
+
text.off("pointerup", up);
|
|
132
|
+
}
|
|
133
|
+
})
|
|
134
|
+
.get(layer.id)?.sprite;
|
|
122
135
|
}
|
|
123
136
|
case 'image': {
|
|
124
137
|
const sprite = new Sprite();
|
|
125
|
-
sprite.
|
|
138
|
+
sprite.eventMode = "static";
|
|
139
|
+
const down = () => this.onPointerDown.publish({ id: layer.id, object: sprite });
|
|
140
|
+
const up = () => this.onPointerUp.publish({ id: layer.id, object: sprite });
|
|
141
|
+
sprite.on("pointerdown", down);
|
|
142
|
+
sprite.on("pointerup", up);
|
|
126
143
|
return this.#activeObjects
|
|
127
|
-
.set(layer.id,
|
|
128
|
-
|
|
144
|
+
.set(layer.id, {
|
|
145
|
+
sprite,
|
|
146
|
+
dispose() {
|
|
147
|
+
sprite.off("pointerdown", down);
|
|
148
|
+
sprite.off("pointerup", up);
|
|
149
|
+
}
|
|
150
|
+
})
|
|
151
|
+
.get(layer.id)?.sprite;
|
|
129
152
|
}
|
|
130
153
|
}
|
|
131
154
|
}
|
|
132
155
|
else
|
|
133
|
-
return object;
|
|
156
|
+
return object.sprite;
|
|
134
157
|
}
|
|
135
158
|
#collectIds(layers) {
|
|
136
159
|
const result = new Set();
|
|
@@ -149,8 +172,9 @@ export class Compositor {
|
|
|
149
172
|
#cleanup(activeIds) {
|
|
150
173
|
for (const id of this.#activeObjects.keys()) {
|
|
151
174
|
if (!activeIds.has(id)) {
|
|
152
|
-
const
|
|
153
|
-
|
|
175
|
+
const { sprite, dispose } = this.#activeObjects.get(id);
|
|
176
|
+
sprite.destroy(true);
|
|
177
|
+
dispose();
|
|
154
178
|
this.#activeObjects.delete(id);
|
|
155
179
|
}
|
|
156
180
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compositor.js","sourceRoot":"","sources":["../../../s/driver/parts/compositor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compositor.js","sourceRoot":"","sources":["../../../s/driver/parts/compositor.ts"],"names":[],"mappings":"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"}
|
package/x/index.html
CHANGED
|
@@ -295,7 +295,7 @@ canvas {
|
|
|
295
295
|
}
|
|
296
296
|
}
|
|
297
297
|
</style>
|
|
298
|
-
<script type=module src="demo/demo.bundle.min.js?v=
|
|
298
|
+
<script type=module src="demo/demo.bundle.min.js?v=ce084a16fd02"></script>
|
|
299
299
|
|
|
300
300
|
|
|
301
301
|
<meta name="theme-color" content="#3cff9c">
|
|
@@ -317,7 +317,7 @@ canvas {
|
|
|
317
317
|
<section>
|
|
318
318
|
<header class="hero">
|
|
319
319
|
<div>
|
|
320
|
-
<h1>Omnitool <small>v1.1.0-
|
|
320
|
+
<h1>Omnitool <small>v1.1.0-72</small></h1>
|
|
321
321
|
<p>Developer demos for decoding, preview, waveform, playback, and export.</p>
|
|
322
322
|
</div>
|
|
323
323
|
</header>
|