@softure-ai/marketing-kit 0.28.0 → 0.31.0
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/CHANGELOG.md +35 -0
- package/README.md +23 -3
- package/dist/config/config.d.ts.map +1 -1
- package/dist/config/config.js +1 -0
- package/dist/config/config.js.map +1 -1
- package/dist/config/schema.d.ts +6 -0
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +6 -2
- package/dist/config/schema.js.map +1 -1
- package/dist/footage/caption-highlight.d.ts +23 -3
- package/dist/footage/caption-highlight.d.ts.map +1 -1
- package/dist/footage/caption-highlight.js +23 -2
- package/dist/footage/caption-highlight.js.map +1 -1
- package/dist/footage/compose.d.ts.map +1 -1
- package/dist/footage/compose.js +15 -6
- package/dist/footage/compose.js.map +1 -1
- package/dist/footage/draft-boxes.d.ts +3 -1
- package/dist/footage/draft-boxes.d.ts.map +1 -1
- package/dist/footage/draft-boxes.js +3 -2
- package/dist/footage/draft-boxes.js.map +1 -1
- package/dist/footage/draft-overlays.d.ts.map +1 -1
- package/dist/footage/draft-overlays.js +191 -41
- package/dist/footage/draft-overlays.js.map +1 -1
- package/dist/footage/draft.d.ts.map +1 -1
- package/dist/footage/draft.js +40 -5
- package/dist/footage/draft.js.map +1 -1
- package/dist/footage/edl.d.ts +27 -0
- package/dist/footage/edl.d.ts.map +1 -1
- package/dist/footage/film.d.ts +15 -3
- package/dist/footage/film.d.ts.map +1 -1
- package/dist/footage/film.js +7 -2
- package/dist/footage/film.js.map +1 -1
- package/dist/footage/overlay-html.d.ts +8 -0
- package/dist/footage/overlay-html.d.ts.map +1 -1
- package/dist/footage/overlay-html.js +127 -29
- package/dist/footage/overlay-html.js.map +1 -1
- package/dist/footage/overlay-motion.d.ts +107 -0
- package/dist/footage/overlay-motion.d.ts.map +1 -0
- package/dist/footage/overlay-motion.js +129 -0
- package/dist/footage/overlay-motion.js.map +1 -0
- package/dist/footage/overlay-schema.d.ts +63 -2
- package/dist/footage/overlay-schema.d.ts.map +1 -1
- package/dist/footage/overlay-schema.js +70 -5
- package/dist/footage/overlay-schema.js.map +1 -1
- package/dist/footage/overlays.d.ts +16 -1
- package/dist/footage/overlays.d.ts.map +1 -1
- package/dist/footage/overlays.js +43 -12
- package/dist/footage/overlays.js.map +1 -1
- package/dist/index.d.ts +5 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/schema/edl.schema.json +82 -1
- package/schema/marketing.schema.json +12 -2
- package/src/config/config.ts +1 -0
- package/src/config/schema.ts +6 -2
- package/src/footage/caption-highlight.ts +27 -5
- package/src/footage/compose.ts +15 -5
- package/src/footage/draft-boxes.ts +7 -3
- package/src/footage/draft-overlays.ts +224 -42
- package/src/footage/draft.ts +52 -6
- package/src/footage/film.ts +17 -3
- package/src/footage/overlay-html.ts +148 -27
- package/src/footage/overlay-motion.ts +157 -0
- package/src/footage/overlay-schema.ts +90 -5
- package/src/footage/overlays.ts +70 -16
- package/src/index.ts +28 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"caption-highlight.js","sourceRoot":"","sources":["../../src/footage/caption-highlight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAoB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"caption-highlight.js","sourceRoot":"","sources":["../../src/footage/caption-highlight.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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"}
|
package/dist/footage/compose.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { assertLocalReferences, escapeHtml, fontFaces, fontStack } from "../compose/html.js";
|
|
2
2
|
import { CAPTION_LINE_HEIGHT, getCaptionPillCss, getCaptionPositionCss } from "../compose/timeline.js";
|
|
3
|
-
import { CAPTION_HIGHLIGHT_BOX_PADDING_EM, CAPTION_HIGHLIGHT_BOX_RADIUS, CAPTION_HIGHLIGHT_SECONDS, getCaptionHighlight } from "./caption-highlight.js";
|
|
3
|
+
import { CAPTION_HIGHLIGHT_BOX_PADDING_EM, CAPTION_HIGHLIGHT_BOX_RADIUS, CAPTION_HIGHLIGHT_SECONDS, CAPTION_UNDERLINE_EM, getCaptionEntranceTween, getCaptionHighlight } from "./caption-highlight.js";
|
|
4
4
|
import { CAPTION_SAFE_ZONES, getCaptionChunkLayouts, getCaptionSpans, getFootageCaptionChunks, isSameCaptionPlace } from "./captions.js";
|
|
5
5
|
import { getEdlDuration, getSegmentStarts } from "./edl.js";
|
|
6
6
|
import { CAPTION_MIN_FONT_SCALE, DEFAULT_EDIT, DEFAULT_END_CARD_SECONDS, DEFAULT_LOGO_END_CARD_FADE_SECONDS, getEndCardSeconds, getFootageEdit, } from "./film.js";
|
|
@@ -142,6 +142,8 @@ export function composeFootage(input) {
|
|
|
142
142
|
throw new Error(`composeFootage: ${highlight.error}`);
|
|
143
143
|
const look = highlight.look;
|
|
144
144
|
const isBox = isHighlight && look.style === "box";
|
|
145
|
+
const isUnderline = isHighlight && look.style === "underline";
|
|
146
|
+
const entrance = getCaptionEntranceTween(film.captionEntrance);
|
|
145
147
|
const caption = getFootageCaptionChunks(film, words);
|
|
146
148
|
const spans = getCaptionSpans(caption, cutEnd);
|
|
147
149
|
const boxes = getCaptionChunkLayouts(caption, edl, captionBox);
|
|
@@ -152,7 +154,7 @@ export function composeFootage(input) {
|
|
|
152
154
|
// A chunk in a segment's own box overrides the shared rule's anchor; one in the film's box is written as before.
|
|
153
155
|
const style = isSameCaptionPlace(place, captionBox) ? "" : ` style="${place.bottom === undefined ? `bottom:auto;top:${place.top}px` : `top:auto;bottom:${place.bottom}px`}"`;
|
|
154
156
|
const box = isHighlight
|
|
155
|
-
? `<p class="pill">${chunk.words.map((w, j) => `<span id="cw${i}_${j}">${isBox ? `<i class="hl" id="cb${i}_${j}"></i>` : ""}${escapeHtml(w.text)}</span>`).join(" ")}</p>`
|
|
157
|
+
? `<p class="pill">${chunk.words.map((w, j) => `<span id="cw${i}_${j}">${isBox ? `<i class="hl" id="cb${i}_${j}"></i>` : ""}${isUnderline ? `<i class="ul" id="cu${i}_${j}"></i>` : ""}${escapeHtml(w.text)}</span>`).join(" ")}</p>`
|
|
156
158
|
: `<p class="phrase">${escapeHtml(chunk.words.map((w) => w.text).join(" "))}</p>`;
|
|
157
159
|
return `<div id="cap${i}" class="clip caption" data-start="${start}" data-duration="${r3(stop - start)}"${style}>${box}</div>`;
|
|
158
160
|
})
|
|
@@ -221,6 +223,8 @@ ${input.style === undefined ? "" : `${getStyledPillCss(input.style, look.style =
|
|
|
221
223
|
${isBox ? `.pill{position:relative;z-index:0}
|
|
222
224
|
.pill span{position:relative}
|
|
223
225
|
.hl{position:absolute;top:0;bottom:0;left:-${CAPTION_HIGHLIGHT_BOX_PADDING_EM}em;right:-${CAPTION_HIGHLIGHT_BOX_PADDING_EM}em;z-index:-1;border-radius:${CAPTION_HIGHLIGHT_BOX_RADIUS}px;background:${look.box};opacity:0}
|
|
226
|
+
` : ""}${isUnderline ? `.pill span{position:relative}
|
|
227
|
+
.ul{position:absolute;left:0;right:0;top:${CAPTION_UNDERLINE_EM.top}em;height:${CAPTION_UNDERLINE_EM.thickness}em;border-radius:${CAPTION_UNDERLINE_EM.thickness / 2}em;background:${look.color};opacity:0}
|
|
224
228
|
` : ""}.phrase{font-weight:650;font-size:${captionBox.fontSize}px;line-height:${CAPTION_LINE_HEIGHT};letter-spacing:-.01em;text-align:center;color:#fff;text-shadow:0 2px 6px rgba(0,0,0,.55),0 0 18px rgba(0,0,0,.35)}
|
|
225
229
|
.endcard{position:absolute;inset:0;display:flex;flex-direction:column;justify-content:center;align-items:center;padding:0 80px;text-align:center}
|
|
226
230
|
.brand{display:flex;justify-content:center;align-items:center;gap:18px;font-family:${headingFont};font-size:46px}
|
|
@@ -248,13 +252,14 @@ const tl = gsap.timeline({ paused: true });
|
|
|
248
252
|
${tweens.join("\n")}
|
|
249
253
|
const captions = ${JSON.stringify(isHighlight ? caption.map((chunk) => chunk.words.map((w) => w.start)) : [])};
|
|
250
254
|
captions.forEach((words, i) => {
|
|
251
|
-
tl.fromTo("#cap" + i + " .pill", {
|
|
252
|
-
|
|
253
|
-
|
|
255
|
+
${entrance === null ? "" : ` tl.fromTo("#cap" + i + " .pill", ${toTweenVars(entrance.from)}, ${toTweenVars(entrance.to)}, Math.max(0, words[0] - 0.05));\n`}${look.style === "underline"
|
|
256
|
+
? ` words.forEach((t, j) => tl.fromTo("#cu" + i + "_" + j, { opacity: 0 }, { opacity: 1, duration: 0.06, immediateRender: false }, t).to("#cu" + i + "_" + j, { opacity: 0, duration: 0.2 }, t + ${CAPTION_HIGHLIGHT_SECONDS}));`
|
|
257
|
+
: look.style === "box"
|
|
258
|
+
? ` words.forEach((t, j) => {
|
|
254
259
|
tl.fromTo("#cb" + i + "_" + j, { opacity: 0 }, { opacity: 1, duration: 0.06, immediateRender: false }, t).to("#cb" + i + "_" + j, { opacity: 0, duration: 0.2 }, t + ${CAPTION_HIGHLIGHT_SECONDS});
|
|
255
260
|
tl.fromTo("#cw" + i + "_" + j, { color: "${c.captionText}" }, { color: "${look.text}", duration: 0.06, immediateRender: false }, t).to("#cw" + i + "_" + j, { color: "${c.captionText}", duration: 0.2 }, t + ${CAPTION_HIGHLIGHT_SECONDS});
|
|
256
261
|
});`
|
|
257
|
-
|
|
262
|
+
: ` words.forEach((t, j) => tl.fromTo("#cw" + i + "_" + j, { color: "${c.captionText}" }, { color: "${look.color}", duration: 0.06, immediateRender: false }, t).to("#cw" + i + "_" + j, { color: "${c.captionText}", duration: 0.2 }, t + 0.32));`}
|
|
258
263
|
});
|
|
259
264
|
${overlayMarkup.tweens.map((tween) => `${tween}\n`).join("")}${endCardTweens.join("\n")}
|
|
260
265
|
tl.set({}, {}, ${end});
|
|
@@ -265,6 +270,10 @@ window.__timelines["${COMPOSITION_ID}"] = tl;
|
|
|
265
270
|
</html>
|
|
266
271
|
`);
|
|
267
272
|
}
|
|
273
|
+
/** Tween vars as the page's script writes them: `{ y: 14, opacity: 0 }`, strings quoted. */
|
|
274
|
+
function toTweenVars(vars) {
|
|
275
|
+
return `{ ${Object.entries(vars).map(([key, value]) => `${key}: ${typeof value === "string" ? JSON.stringify(value) : String(value)}`).join(", ")} }`;
|
|
276
|
+
}
|
|
268
277
|
/** The caption pill's rule in the brand's style, after the pill's own: its radius, padding, shadow and border in `accent`. */
|
|
269
278
|
export function getStyledPillCss(style, accent) {
|
|
270
279
|
const pad = getStylePadding(CAPTION_PILL_PADDING, style.padding);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/footage/compose.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,10 @@ export interface DraftBoxEventsInput {
|
|
|
24
24
|
style: Pick<BrandStyle, "shadow" | "border">;
|
|
25
25
|
/** The frame's width / 1080. */
|
|
26
26
|
scale: number;
|
|
27
|
-
/** Motion tags every drawing takes (a fade, a move); a `\move` replaces the `\pos`. */
|
|
27
|
+
/** Motion tags every drawing takes (a fade, a move, a scale, a clip); a `\move` replaces the `\pos`. */
|
|
28
28
|
motion?: string;
|
|
29
|
+
/** A blur entrance or exit: the tags for a drawing whose own blur is `own` (the shadow's, else 0). */
|
|
30
|
+
blurTags?: (own: number) => string;
|
|
29
31
|
}
|
|
30
32
|
/** The shadow, box and border drawings of one box. */
|
|
31
33
|
export declare function getDraftBoxEvents(input: DraftBoxEventsInput): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft-boxes.d.ts","sourceRoot":"","sources":["../../src/footage/draft-boxes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAIlF;;;;GAIG;AAEH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,QAAQ,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;IAC7C,gCAAgC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,
|
|
1
|
+
{"version":3,"file":"draft-boxes.d.ts","sourceRoot":"","sources":["../../src/footage/draft-boxes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAIlF;;;;GAIG;AAEH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,QAAQ,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,QAAQ,CAAC,CAAC;IAC7C,gCAAgC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,wGAAwG;IACxG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sGAAsG;IACtG,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CACpC;AAQD,sDAAsD;AACtD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,EAAE,CAmBtE"}
|
|
@@ -12,12 +12,13 @@ export function getDraftBoxEvents(input) {
|
|
|
12
12
|
const motion = input.motion ?? "";
|
|
13
13
|
const pos = motion.includes("\\move") ? "" : "\\pos(0,0)";
|
|
14
14
|
const drawing = getRoundedRectDrawing(box, radius);
|
|
15
|
-
const event = (tags, shape) => `Dialogue: ${String(input.layer)},${input.at},${input.styleName},,0,0,0,,{\\an7${pos}${motion}${tags}\\p1}${shape}{\\p0}`;
|
|
15
|
+
const event = (tags, shape, blur = 0) => `Dialogue: ${String(input.layer)},${input.at},${input.styleName},,0,0,0,,{\\an7${pos}${motion}${tags}${input.blurTags?.(blur) ?? ""}\\p1}${shape}{\\p0}`;
|
|
16
16
|
const events = [];
|
|
17
17
|
if (input.style.shadow === "soft") {
|
|
18
18
|
const lowered = getRoundedRectDrawing({ ...box, top: box.top + STYLE_SHADOW.offsetY * scale }, radius);
|
|
19
19
|
const alpha = Math.round((1 - STYLE_SHADOW.opacity) * 255).toString(16).padStart(2, "0").toUpperCase();
|
|
20
|
-
|
|
20
|
+
const blur = Math.round((STYLE_SHADOW.blur / 3) * scale);
|
|
21
|
+
events.push(event(`\\1c&H000000&\\1a&H${alpha}&\\bord0\\shad0\\blur${String(blur)}`, lowered, blur));
|
|
21
22
|
}
|
|
22
23
|
events.push(event(`${toColorTags(input.color, 1)}\\bord0\\shad0`, drawing));
|
|
23
24
|
if (input.style.border === "thin") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft-boxes.js","sourceRoot":"","sources":["../../src/footage/draft-boxes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"draft-boxes.js","sourceRoot":"","sources":["../../src/footage/draft-boxes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAmC5D,oFAAoF;AACpF,SAAS,WAAW,CAAC,GAAW,EAAE,IAAW;IAC3C,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5B,OAAO,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;AACvF,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,iBAAiB,CAAC,KAA0B;IAC1D,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IACrC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;IAC1D,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,IAAI,GAAG,CAAC,EAAE,EAAE,CACtD,aAAa,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,SAAS,kBAAkB,GAAG,GAAG,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,CAAC;IAC3J,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,qBAAqB,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,YAAY,CAAC,OAAO,GAAG,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACvG,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QACvG,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,KAAK,wBAAwB,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACvG,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5E,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;IAClJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft-overlays.d.ts","sourceRoot":"","sources":["../../src/footage/draft-overlays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGzF,OAAO,
|
|
1
|
+
{"version":3,"file":"draft-overlays.d.ts","sourceRoot":"","sources":["../../src/footage/draft-overlays.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGzF,OAAO,EAA0E,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAc/H,OAAO,EAgBL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,eAAe,CAAC;AA8BvB,0HAA0H;AAC1H,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM,EAAE,CAOrF;AAcD,wGAAwG;AACxG,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAY3F;AAED,oHAAoH;AACpH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAY/H;AAUD,kHAAkH;AAClH,wBAAgB,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAMpE;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAQtE;AAED,UAAU,YAAY;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,qHAAqH;IACrH,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,EAAE,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAG9L;AAwYD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,SAAS,eAAe,EAAE,EACpC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACxC,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAAO,GACtG,MAAM,EAAE,CAQV"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { getCornerRadiusPx } from "./brand-style.js";
|
|
2
2
|
import { getDraftBoxEvents } from "./draft-boxes.js";
|
|
3
3
|
import { toAssColor } from "./draft-color.js";
|
|
4
|
-
import { getCounterSeconds, getOverlayColors, getTypingTimes } from "./overlay-html.js";
|
|
5
|
-
import {
|
|
4
|
+
import { getCounterSeconds, getOverlayColors, getPlaceCardTimes, getTypingTimes } from "./overlay-html.js";
|
|
5
|
+
import { OVERLAY_EASES, PIN_DROP_SECONDS, PIN_DROP_SHARE, UNDERLINE_EM, UNDERLINE_SECONDS, getEntranceMotion, getExitMotion, getWipeHalves, } from "./overlay-motion.js";
|
|
6
|
+
import { OVERLAY_FONT_ROLES, OVERLAY_LINE_HEIGHT, OVERLAY_LIST_LINE_HEIGHT, OVERLAY_TITLE_LINE_HEIGHT, SEARCH_BAR_ICON_EM, SEARCH_BAR_PADDING_EM, estimateTextWidth, formatOverlayNumber, getDrawnOverlayCard, getOverlayPadding, getPlaceCardPinRow, getPlaceCardPinSize, getSideTextLines, getTitleContentBox, } from "./overlays.js";
|
|
6
7
|
/**
|
|
7
8
|
* The draft's overlays as ASS (issue #1200): the same places and times as the render, simplified. Text overlays are
|
|
8
9
|
* drawn rounded cards of the brand's background, fitted to their text, with the text in its foreground; an
|
|
@@ -107,20 +108,103 @@ export function getDraftCardRadius(overlay, box, context, own) {
|
|
|
107
108
|
const token = overlay.cornerRadius ?? (context.style === undefined ? null : overlay.kind === "search_bar" ? "pill" : context.style.cornerRadius);
|
|
108
109
|
return token === null ? own : getCornerRadiusPx(token, box.height, context.scale);
|
|
109
110
|
}
|
|
110
|
-
/**
|
|
111
|
-
function
|
|
112
|
-
const
|
|
113
|
-
const
|
|
111
|
+
/** An overlay's draft motion with its entrance `name` (already the kind's own when it names none). */
|
|
112
|
+
function getDraftMotion(overlay, name, card, context) {
|
|
113
|
+
const easing = overlay.easing ?? "smooth";
|
|
114
|
+
const frame = { width: 1080 * context.scale, height: 1920 * context.scale };
|
|
115
|
+
return {
|
|
116
|
+
name,
|
|
117
|
+
entrance: getEntranceMotion(name, easing, frame),
|
|
118
|
+
exit: getExitMotion({ exit: overlay.exit ?? "auto", entrance: overlay.entrance, easing, frame }),
|
|
119
|
+
card,
|
|
120
|
+
scale: context.scale,
|
|
121
|
+
isSnappy: easing === "snappy",
|
|
122
|
+
isCardMoved: name === "slide" || name === "rise" || name === "pop",
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
/** The same motion entering by a plain fade: a part that comes in after its card (a delayed subtitle, a staggered point). */
|
|
126
|
+
function withFadeEntrance(motion) {
|
|
127
|
+
return { ...motion, name: "fade", entrance: getEntranceMotion("fade", "smooth", { width: 1080, height: 1920 }) };
|
|
128
|
+
}
|
|
129
|
+
/** The rectangle a wipe clips to, round the card with room for its shadow and border. */
|
|
130
|
+
function getWipeClip(motion) {
|
|
131
|
+
const room = 24 * motion.scale;
|
|
132
|
+
const { card } = motion;
|
|
133
|
+
return { x0: r0(card.left - room / 4), y0: r0(card.top - room), x1: r0(card.left + card.width + room / 4), y1: r0(card.top + card.height + room) };
|
|
134
|
+
}
|
|
135
|
+
const toClip = (box) => `\\clip(${box.x0},${box.y0},${box.x1},${box.y1})`;
|
|
136
|
+
const toMs = (seconds) => Math.max(0, Math.round(seconds * 1000));
|
|
137
|
+
/**
|
|
138
|
+
* The position and motion tags of one event of a run: the first takes the entrance (a fade, a slide or a rise moving up
|
|
139
|
+
* into place, a pop growing about the card's middle, a wipe's clip), the last the exit (a fade, a move down, a wipe
|
|
140
|
+
* off to the right). libass scales about an event's position, so a pop moves the position with the scale (both linear)
|
|
141
|
+
* to keep the card's middle still. `pos` is the event's position, (0, 0) for a drawing.
|
|
142
|
+
*/
|
|
143
|
+
function getMotionTags(motion, input) {
|
|
144
|
+
const { entrance, exit } = motion;
|
|
145
|
+
const { pos, ms } = input;
|
|
146
|
+
let move = null;
|
|
147
|
+
const tags = [];
|
|
148
|
+
let fadeIn = 0;
|
|
149
|
+
if (input.isFirst && entrance.kind === "tween") {
|
|
150
|
+
const enterMs = toMs(entrance.seconds);
|
|
151
|
+
fadeIn = motion.name === "fade" || motion.name === "slide" || motion.name === "type" ? FADE_IN_MS : r0(enterMs * 0.7);
|
|
152
|
+
if (motion.name === "slide")
|
|
153
|
+
move = `\\move(${r0(pos.x)},${r0(pos.y + SLIDE_PX * motion.scale)},${r0(pos.x)},${r0(pos.y)},0,${SLIDE_MS})`;
|
|
154
|
+
if (entrance.from.y > 0 && motion.name !== "slide")
|
|
155
|
+
move = `\\move(${r0(pos.x)},${r0(pos.y + entrance.from.y)},${r0(pos.x)},${r0(pos.y)},0,${enterMs})`;
|
|
156
|
+
if (entrance.from.scale < 1) {
|
|
157
|
+
const s = entrance.from.scale;
|
|
158
|
+
const centre = { x: motion.card.left + motion.card.width / 2, y: motion.card.top + motion.card.height / 2 };
|
|
159
|
+
move = `\\move(${r0(centre.x + s * (pos.x - centre.x))},${r0(centre.y + s * (pos.y - centre.y))},${r0(pos.x)},${r0(pos.y)},0,${enterMs})`;
|
|
160
|
+
const percent = Math.round(s * 100);
|
|
161
|
+
tags.push(`\\fscx${percent}\\fscy${percent}\\t(0,${enterMs},\\fscx100\\fscy100)`);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
const clip = getWipeClip(motion);
|
|
165
|
+
if (input.isFirst && entrance.kind === "wipe") {
|
|
166
|
+
const halves = getWipeHalves(entrance.seconds);
|
|
167
|
+
const [grow, reveal] = [toMs(halves.grow), toMs(halves.reveal)];
|
|
168
|
+
const closed = toClip({ ...clip, x1: clip.x0 });
|
|
169
|
+
tags.push(input.part === "card" ? `${closed}\\t(0,${grow},${toClip(clip)})` : `${closed}\\t(${grow},${grow + reveal},${toClip(clip)})`);
|
|
170
|
+
}
|
|
171
|
+
let fadeOut = 0;
|
|
172
|
+
if (input.isLast && exit.kind !== "none") {
|
|
173
|
+
if (exit.kind === "wipe") {
|
|
174
|
+
const exitMs = toMs(exit.seconds);
|
|
175
|
+
if (!(input.isFirst && entrance.kind === "wipe"))
|
|
176
|
+
tags.push(toClip(clip));
|
|
177
|
+
tags.push(`\\t(${Math.max(0, ms - exitMs)},${ms},${toClip({ ...clip, x0: clip.x1 })})`);
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
fadeOut = motion.isSnappy ? r0(FADE_OUT_MS * 0.7) : FADE_OUT_MS;
|
|
181
|
+
if (exit.kind === "tween" && exit.from.y > 0 && !motion.isCardMoved) {
|
|
182
|
+
const exitMs = toMs(exit.seconds);
|
|
183
|
+
move = `\\move(${r0(pos.x)},${r0(pos.y)},${r0(pos.x)},${r0(pos.y + exit.from.y)},${Math.max(0, ms - exitMs)},${ms})`;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
114
187
|
const fade = fadeIn === 0 && fadeOut === 0 ? "" : `\\fad(${fadeIn},${fadeOut})`;
|
|
115
|
-
|
|
116
|
-
return `${move}${fade}`;
|
|
188
|
+
return { position: move ?? `\\pos(${r0(pos.x)},${r0(pos.y)})`, rest: `${fade}${tags.join("")}` };
|
|
117
189
|
}
|
|
118
|
-
/**
|
|
190
|
+
/** A blur entrance's and exit's tags for an event whose own blur is `own`: from blurred to its own, from its own to blurred. */
|
|
191
|
+
function getBlurTags(motion, input, own) {
|
|
192
|
+
const tags = [];
|
|
193
|
+
if (input.isFirst && motion.entrance.kind === "tween" && motion.entrance.from.blur > 0) {
|
|
194
|
+
tags.push(`\\blur${Math.max(own, r0(motion.entrance.from.blur / 2))}\\t(0,${toMs(motion.entrance.seconds)},\\blur${own})`);
|
|
195
|
+
}
|
|
196
|
+
if (input.isLast && motion.exit.kind === "tween" && motion.exit.from.blur > 0) {
|
|
197
|
+
const exitMs = toMs(motion.exit.seconds);
|
|
198
|
+
tags.push(`\\t(${Math.max(0, input.ms - exitMs)},${input.ms},\\blur${Math.max(own, r0(motion.exit.from.blur / 2))})`);
|
|
199
|
+
}
|
|
200
|
+
return tags.join("");
|
|
201
|
+
}
|
|
202
|
+
/** Text events for a run of steps, positioned at `pos` with `tags`, the entrance on the first and the exit on the last. */
|
|
119
203
|
function getTextEvents(input) {
|
|
120
204
|
return input.steps.map((step, index) => {
|
|
121
|
-
const
|
|
122
|
-
const
|
|
123
|
-
return `Dialogue: ${input.layer},${toAssTime(step.from)},${toAssTime(step.to)},${input.style},,0,0,0,,{${input.tags}${
|
|
205
|
+
const at = { isFirst: index === 0, isLast: index === input.steps.length - 1, ms: toMs(step.to - step.from) };
|
|
206
|
+
const { position, rest } = getMotionTags(input.motion, { ...at, pos: input.pos, part: "text" });
|
|
207
|
+
return `Dialogue: ${input.layer},${toAssTime(step.from)},${toAssTime(step.to)},${input.style},,0,0,0,,{${input.tags}${position}${rest}${getBlurTags(input.motion, at, 0)}}${step.text}`;
|
|
124
208
|
});
|
|
125
209
|
}
|
|
126
210
|
/**
|
|
@@ -159,14 +243,19 @@ function getOwnCardRadius(overlay, box, fontSize) {
|
|
|
159
243
|
return overlay.kind === "search_bar" ? box.height / 2 : fontSize * 0.42;
|
|
160
244
|
}
|
|
161
245
|
/**
|
|
162
|
-
* A card's drawn box on layer 3 with the overlay's
|
|
163
|
-
* fill and border (`getDraftBoxEvents`), at the brand style's corner or the overlay's own (`getDraftCardRadius`)
|
|
246
|
+
* A card's drawn box on layer 3 with the overlay's motion: one fill without a brand style, else the style's shadow,
|
|
247
|
+
* fill and border (`getDraftBoxEvents`), at the brand style's corner or the overlay's own (`getDraftCardRadius`); a
|
|
248
|
+
* wipe's accent panel over it.
|
|
164
249
|
*/
|
|
165
|
-
function getCardShapeEvents(overlay, box, fontSize, colors,
|
|
250
|
+
function getCardShapeEvents(overlay, box, fontSize, colors, motion, context) {
|
|
166
251
|
const radius = getDraftCardRadius(overlay, box, context, getOwnCardRadius(overlay, box, fontSize));
|
|
252
|
+
const drawing = getRoundedRectDrawing(box, radius);
|
|
253
|
+
const panel = getWipePanelEvent(overlay, drawing, colors.accent, motion);
|
|
167
254
|
if (context.style === undefined)
|
|
168
|
-
return [getShapeEvent(overlay,
|
|
169
|
-
|
|
255
|
+
return [getShapeEvent(overlay, drawing, colors.background, motion), ...panel];
|
|
256
|
+
const at = { isFirst: true, isLast: true, ms: toMs(overlay.end - overlay.start) };
|
|
257
|
+
const { position, rest } = getMotionTags(motion, { ...at, pos: { x: 0, y: 0 }, part: "card" });
|
|
258
|
+
const events = getDraftBoxEvents({
|
|
170
259
|
layer: 3,
|
|
171
260
|
at: `${toAssTime(overlay.start)},${toAssTime(overlay.end)}`,
|
|
172
261
|
styleName: "OverlayShape",
|
|
@@ -176,12 +265,42 @@ function getCardShapeEvents(overlay, box, fontSize, colors, entrance, context) {
|
|
|
176
265
|
accent: colors.accent,
|
|
177
266
|
style: context.style,
|
|
178
267
|
scale: context.scale,
|
|
179
|
-
motion:
|
|
268
|
+
motion: `${position.startsWith("\\move") ? position : ""}${rest}`,
|
|
269
|
+
blurTags: (own) => getBlurTags(motion, at, own),
|
|
180
270
|
});
|
|
271
|
+
return [...events, ...panel];
|
|
272
|
+
}
|
|
273
|
+
/** A wipe's accent panel: it grows over the card from the left, then slides off to the right, revealing the card and its text. */
|
|
274
|
+
function getWipePanelEvent(overlay, drawing, accent, motion) {
|
|
275
|
+
if (motion.entrance.kind !== "wipe")
|
|
276
|
+
return [];
|
|
277
|
+
const halves = getWipeHalves(motion.entrance.seconds);
|
|
278
|
+
const [grow, reveal] = [toMs(halves.grow), toMs(halves.reveal)];
|
|
279
|
+
const clip = getWipeClip(motion);
|
|
280
|
+
const tags = `${toClip({ ...clip, x1: clip.x0 })}\\t(0,${grow},${toClip(clip)})\\t(${grow},${grow + reveal},${toClip({ ...clip, x0: clip.x1 })})`;
|
|
281
|
+
return [`Dialogue: 3,${toAssTime(overlay.start)},${toAssTime(overlay.start + motion.entrance.seconds)},OverlayShape,,0,0,0,,{\\an7\\pos(0,0)${tags}\\1c${toTagColor(accent)}\\p1}${drawing}{\\p0}`];
|
|
282
|
+
}
|
|
283
|
+
/** A keyword's underline: an accent bar under its text, drawn from the left once the keyword is in. */
|
|
284
|
+
function getUnderlineEvent(overlay, card, colour, motion) {
|
|
285
|
+
if (overlay.underline !== true)
|
|
286
|
+
return [];
|
|
287
|
+
const pad = getOverlayPadding(overlay);
|
|
288
|
+
const height = Math.max(2, r0(overlay.fontSize * UNDERLINE_EM.height));
|
|
289
|
+
const bar = { left: card.left + pad.x, top: card.top + card.height - pad.y + r0(overlay.fontSize * UNDERLINE_EM.gap), width: card.width - 2 * pad.x, height };
|
|
290
|
+
const after = motion.entrance.kind === "none" ? 0 : motion.entrance.seconds;
|
|
291
|
+
const from = Math.min(overlay.end, overlay.start + after);
|
|
292
|
+
const drawMs = toMs(UNDERLINE_SECONDS);
|
|
293
|
+
const x0 = r0(bar.left);
|
|
294
|
+
const clip = `\\clip(${x0},${r0(bar.top - 4)},${x0},${r0(bar.top + bar.height + 4)})\\t(0,${drawMs},\\clip(${x0},${r0(bar.top - 4)},${r0(bar.left + bar.width)},${r0(bar.top + bar.height + 4)}))`;
|
|
295
|
+
const fade = motion.exit.kind === "none" ? "" : `\\fad(0,${motion.isSnappy ? r0(FADE_OUT_MS * 0.7) : FADE_OUT_MS})`;
|
|
296
|
+
// Under a wipe off, the bar leaves as the wipe starts: it is not clipped with the card.
|
|
297
|
+
const until = motion.exit.kind === "wipe" ? Math.max(from, overlay.end - motion.exit.seconds) : overlay.end;
|
|
298
|
+
return [`Dialogue: 4,${toAssTime(from)},${toAssTime(until)},OverlayShape,,0,0,0,,{\\an7\\pos(0,0)${fade}${clip}\\1c${toTagColor(colour)}\\p1}${getRoundedRectDrawing(bar, height / 2)}{\\p0}`];
|
|
181
299
|
}
|
|
182
300
|
/**
|
|
183
301
|
* A keyword, a lower third or a list: a drawn rounded card fitted to its text (`getDrawnOverlayCard`) on layer 3 and
|
|
184
|
-
* its text on layer 4, inset by the card's padding on its side (a lower third from its foot).
|
|
302
|
+
* its text on layer 4, inset by the card's padding on its side (a lower third from its foot). A staggered list's points
|
|
303
|
+
* come in one by one; a keyword's underline is drawn once it is in.
|
|
185
304
|
*/
|
|
186
305
|
function getSideTextEvents(overlay, context) {
|
|
187
306
|
const colors = getOverlayColors(overlay, context.brand);
|
|
@@ -195,40 +314,63 @@ function getSideTextEvents(overlay, context) {
|
|
|
195
314
|
const y = isFoot ? card.top + card.height - padY : card.top + padY;
|
|
196
315
|
// \an: 7 top left, 9 top right, 1 bottom left, 3 bottom right.
|
|
197
316
|
const align = isFoot ? (isRight ? 3 : 1) : isRight ? 9 : 7;
|
|
198
|
-
const
|
|
317
|
+
const motion = getDraftMotion(overlay, overlay.entrance === null || overlay.entrance === "type" ? "fade" : overlay.entrance, card, context);
|
|
199
318
|
const span = { start: overlay.start, end: overlay.end };
|
|
200
319
|
const tags = `\\an${align}\\fs${fontSize}${getTextTags(overlay, colors, context, OVERLAY_FONT_ROLES[overlay.kind])}`;
|
|
201
|
-
const text = (pos, steps) => getTextEvents({ layer: 4, style: "OverlayPlain", pos, tags, steps,
|
|
202
|
-
const shape = getCardShapeEvents(overlay, card, fontSize, colors,
|
|
320
|
+
const text = (pos, steps, own = motion) => getTextEvents({ layer: 4, style: "OverlayPlain", pos, tags, steps, motion: own });
|
|
321
|
+
const shape = getCardShapeEvents(overlay, card, fontSize, colors, motion, context);
|
|
203
322
|
if (overlay.kind === "list") {
|
|
204
|
-
// One event per point, on the render's line height (libass's own line spacing is tighter)
|
|
323
|
+
// One event per point, on the render's line height (libass's own line spacing is tighter); a staggered point from its second.
|
|
205
324
|
const step = fontSize * OVERLAY_LIST_LINE_HEIGHT;
|
|
206
325
|
const lead = (step - fontSize * OVERLAY_LINE_HEIGHT) / 2;
|
|
207
|
-
return [
|
|
326
|
+
return [
|
|
327
|
+
...shape,
|
|
328
|
+
...getSideTextLines(overlay).flatMap((line, index) => {
|
|
329
|
+
const from = overlay.itemStarts?.[index];
|
|
330
|
+
const pos = { x, y: y + lead + index * step };
|
|
331
|
+
return from === undefined ? text(pos, [{ from: span.start, to: span.end, text: toAssText(line) }]) : text(pos, [{ from, to: span.end, text: toAssText(line) }], withFadeEntrance(motion));
|
|
332
|
+
}),
|
|
333
|
+
];
|
|
208
334
|
}
|
|
209
335
|
// A keyword or a lower third types in only when its entrance says so.
|
|
210
|
-
|
|
336
|
+
const steps = overlay.entrance === null ? [{ from: span.start, to: span.end, text: toAssText(overlay.text) }] : getTypedSteps(overlay.text, span, overlay.typing);
|
|
337
|
+
return [...shape, ...text({ x, y }, steps), ...(overlay.kind === "keyword" ? getUnderlineEvent(overlay, card, colors.accent, motion) : [])];
|
|
211
338
|
}
|
|
212
339
|
/** Each card's own entrance when the overlay names none (a typed card fades its card in). */
|
|
213
340
|
const DEFAULT_ENTRANCES = { hook_title: "slide", search_bar: "fade", place_card: "slide", counter: "fade", date_stamp: "fade" };
|
|
214
|
-
/** A drawing event in the overlay's card colour (or accent), with the overlay's
|
|
215
|
-
function getShapeEvent(overlay, drawing, colour,
|
|
216
|
-
const
|
|
217
|
-
const
|
|
218
|
-
return `Dialogue:
|
|
341
|
+
/** A drawing event in the overlay's card colour (or accent), with the overlay's motion. */
|
|
342
|
+
function getShapeEvent(overlay, drawing, colour, motion, layer = 3) {
|
|
343
|
+
const at = { isFirst: true, isLast: true, ms: toMs(overlay.end - overlay.start) };
|
|
344
|
+
const { position, rest } = getMotionTags(motion, { ...at, pos: { x: 0, y: 0 }, part: "card" });
|
|
345
|
+
return `Dialogue: ${layer},${toAssTime(overlay.start)},${toAssTime(overlay.end)},OverlayShape,,0,0,0,,{\\an7${position}${rest}${getBlurTags(motion, at, 0)}\\1c${toTagColor(colour)}\\p1}${drawing}{\\p0}`;
|
|
346
|
+
}
|
|
347
|
+
/** A place card's pin above its title: there with the card, or dropping a little onto its place. */
|
|
348
|
+
function getPinEvents(overlay, at, colour, motion) {
|
|
349
|
+
if (overlay.pin === undefined)
|
|
350
|
+
return [];
|
|
351
|
+
const size = getPlaceCardPinSize(overlay.fontSize);
|
|
352
|
+
const drawing = getPinDrawing(at, size);
|
|
353
|
+
if (overlay.pin === "static")
|
|
354
|
+
return [getShapeEvent(overlay, drawing, colour, motion, 4)];
|
|
355
|
+
const drop = r0(size * PIN_DROP_SHARE);
|
|
356
|
+
const fade = motion.exit.kind === "none" ? 0 : motion.isSnappy ? r0(FADE_OUT_MS * 0.7) : FADE_OUT_MS;
|
|
357
|
+
return [
|
|
358
|
+
`Dialogue: 4,${toAssTime(overlay.start)},${toAssTime(overlay.end)},OverlayShape,,0,0,0,,{\\an7\\move(0,${-drop},0,0,0,${toMs(PIN_DROP_SECONDS)})\\fad(${r0(toMs(PIN_DROP_SECONDS) * 0.6)},${fade})\\1c${toTagColor(colour)}\\p1}${drawing}{\\p0}`,
|
|
359
|
+
];
|
|
219
360
|
}
|
|
220
361
|
/** A hook title, a search bar, a place card, a counter or a date stamp: a drawn rounded card and its text on layer 4. */
|
|
221
362
|
function getCardEvents(overlay, context) {
|
|
222
363
|
const colors = getOverlayColors(overlay, context.brand);
|
|
223
364
|
const { box, fontSize } = overlay;
|
|
224
|
-
const
|
|
225
|
-
const
|
|
365
|
+
const name = overlay.entrance === null || overlay.entrance === "type" ? (overlay.typing !== null ? "fade" : DEFAULT_ENTRANCES[overlay.kind]) : overlay.entrance;
|
|
366
|
+
const motion = getDraftMotion(overlay, name, box, context);
|
|
226
367
|
const span = { start: overlay.start, end: overlay.end };
|
|
227
|
-
const events = getCardShapeEvents(overlay, box, fontSize, colors,
|
|
368
|
+
const events = getCardShapeEvents(overlay, box, fontSize, colors, motion, context);
|
|
228
369
|
const { x: padX, y: padY } = getOverlayPadding(overlay);
|
|
229
370
|
const centerX = box.left + box.width / 2;
|
|
230
371
|
const tagsFor = (role) => getTextTags(overlay, colors, context, role);
|
|
231
|
-
const text = (pos, align, size, role, steps, own =
|
|
372
|
+
const text = (pos, align, size, role, steps, own = motion) => getTextEvents({ layer: 4, style: "OverlayPlain", pos, tags: `\\an${align}\\fs${r0(size)}${tagsFor(role)}`, steps, motion: own });
|
|
373
|
+
const plain = { ...motion, name: "none", entrance: { kind: "none" } };
|
|
232
374
|
if (overlay.kind === "hook_title" || overlay.kind === "place_card") {
|
|
233
375
|
// The text block sits in the card's middle; centred lines on its axis, left ones from its left edge (RV-131).
|
|
234
376
|
const content = getTitleContentBox(overlay);
|
|
@@ -241,32 +383,40 @@ function getCardEvents(overlay, context) {
|
|
|
241
383
|
const pin = Math.round(size * 1.05);
|
|
242
384
|
const rowWidth = pin + Math.round(size * 0.25) + estimateTextWidth(overlay.place, size);
|
|
243
385
|
const rowLeft = isLeft ? content.left : centerX - rowWidth / 2;
|
|
244
|
-
events.push(getShapeEvent(overlay, getPinDrawing({ x: rowLeft, y: y + (size * OVERLAY_LINE_HEIGHT - pin) / 2 }, pin), colors.accent,
|
|
386
|
+
events.push(getShapeEvent(overlay, getPinDrawing({ x: rowLeft, y: y + (size * OVERLAY_LINE_HEIGHT - pin) / 2 }, pin), colors.accent, motion, 4));
|
|
245
387
|
events.push(...text({ x: rowLeft + pin + Math.round(size * 0.25), y }, 7, size, OVERLAY_FONT_ROLES.date_stamp, [{ from: span.start, to: span.end, text: toAssText(overlay.place) }]));
|
|
246
388
|
y += size * 1.3 + fontSize * 0.12;
|
|
247
389
|
}
|
|
390
|
+
const times = overlay.kind === "place_card" ? getPlaceCardTimes(overlay) : { pin: null, title: span.start, subtitle: null };
|
|
391
|
+
if (overlay.kind === "place_card" && overlay.pin !== undefined) {
|
|
392
|
+
const size = getPlaceCardPinSize(fontSize);
|
|
393
|
+
events.push(...getPinEvents(overlay, { x: isLeft ? content.left : centerX - size / 2, y }, colors.accent, motion));
|
|
394
|
+
y += getPlaceCardPinRow(fontSize);
|
|
395
|
+
}
|
|
248
396
|
const lineHeight = overlay.kind === "hook_title" ? OVERLAY_LINE_HEIGHT : OVERLAY_TITLE_LINE_HEIGHT;
|
|
397
|
+
const titleMotion = times.title > span.start ? withFadeEntrance(motion) : motion;
|
|
249
398
|
let typedBefore = 0;
|
|
250
399
|
overlay.lines.forEach((line) => {
|
|
251
400
|
// The lines type one after the other, as the render's characters do; a left line holds its place transparent
|
|
252
401
|
// from the start, a centred one shows its typed part only (`getTypedSteps`).
|
|
253
|
-
const lineStart = overlay.typing === null ?
|
|
402
|
+
const lineStart = overlay.typing === null ? times.title : span.start + typedBefore / overlay.typing;
|
|
254
403
|
const steps = getTypedSteps(line, { start: lineStart, end: span.end }, overlay.typing, !isLeft);
|
|
255
404
|
// A centred typed line has no hidden first step to carry the entrance: its letters appear as typed, as the render's.
|
|
256
405
|
const isTypedCentre = !isLeft && overlay.typing !== null;
|
|
257
|
-
events.push(...text({ x: lineX, y }, lineAlign, fontSize, "heading", isLeft ? steps.map((step, index) => (index === 0 ? { ...step, from: span.start } : step)) : steps, isTypedCentre ?
|
|
406
|
+
events.push(...text({ x: lineX, y }, lineAlign, fontSize, "heading", isLeft ? steps.map((step, index) => (index === 0 ? { ...step, from: span.start } : step)) : steps, isTypedCentre ? plain : titleMotion));
|
|
258
407
|
typedBefore += [...line].length;
|
|
259
408
|
y += fontSize * lineHeight;
|
|
260
409
|
});
|
|
261
410
|
if (overlay.kind === "place_card" && overlay.subtitle !== null) {
|
|
262
|
-
|
|
411
|
+
const from = times.subtitle ?? span.start;
|
|
412
|
+
events.push(...text({ x: lineX, y: y + fontSize * 0.12 }, lineAlign, overlay.subtitleFontSize, "interface", [{ from, to: span.end, text: toAssText(overlay.subtitle) }], from > span.start ? withFadeEntrance(motion) : motion));
|
|
263
413
|
}
|
|
264
414
|
return events;
|
|
265
415
|
}
|
|
266
416
|
if (overlay.kind === "search_bar") {
|
|
267
417
|
const searchPadX = r0(fontSize * SEARCH_BAR_PADDING_EM.x);
|
|
268
418
|
const middle = box.top + box.height / 2;
|
|
269
|
-
events.push(getShapeEvent(overlay, getGlassDrawing({ x: box.left + searchPadX, y: middle - fontSize / 2 }, fontSize), colors.accent,
|
|
419
|
+
events.push(getShapeEvent(overlay, getGlassDrawing({ x: box.left + searchPadX, y: middle - fontSize / 2 }, fontSize), colors.accent, motion, 4));
|
|
270
420
|
events.push(...text({ x: box.left + searchPadX + Math.round(fontSize * SEARCH_BAR_ICON_EM), y: middle }, 4, fontSize, "interface", getTypedSteps(overlay.text, span, overlay.typing)));
|
|
271
421
|
return events;
|
|
272
422
|
}
|
|
@@ -279,8 +429,8 @@ function getCardEvents(overlay, context) {
|
|
|
279
429
|
steps.push({ from: span.start, to: count.start, text: show(overlay.from) });
|
|
280
430
|
for (let tick = 1; tick <= ticks; tick++) {
|
|
281
431
|
const progress = tick / ticks;
|
|
282
|
-
// power2.out, as the render's tween eases.
|
|
283
|
-
const eased =
|
|
432
|
+
// power2.out, as the render's tween eases: the count slows down to its value.
|
|
433
|
+
const eased = OVERLAY_EASES["power2.out"](progress);
|
|
284
434
|
const value = overlay.from + (overlay.value - overlay.from) * eased;
|
|
285
435
|
steps.push({ from: count.start + (tick - 1) * COUNT_STEP, to: tick === ticks ? span.end : count.start + tick * COUNT_STEP, text: show(value) });
|
|
286
436
|
}
|