feat(overlay): TV graphics OBS layout with title plate, timing tower and start position (1.76.0)
This commit is contained in:
1 parent
50a99fe33f
commit
3d0ab0c4b7
11 files changed
+144
-8
No files matched your search
+11
-1
@@ -1299,6 +1299,8 @@ const TRANSLATIONS = {
|
||||
"timing.live_elsewhere": "Varv registreras just nu på \"{name}\", som pågår - inte på den valda sessionen.",
|
||||
"timing.show_live": "Visa den",
|
||||
"overlay.obs_show_position_change": "Placering sedan start (▲/▼) i race",
|
||||
"overlay.obs_show_start": "Startplats bredvid placeringen (TV-grafik)",
|
||||
"overlay.col_start": "Start",
|
||||
"overlay.position_change_title": "Placeringar vunna (▲) eller förlorade (▼) sedan starten",
|
||||
"settings.public_address_title": "Publik adress (domän / DynDNS)",
|
||||
"settings.public_address_hint": "Gäller alla förares mobilprofiler: länkar och QR-koder byggs med den här adressen, t.ex. https://klubben.dyndns.org eller https://klubben.se:8443. Lämna tomt för att använda datorns adress i det lokala nätverket (fungerar bara på samma wifi).",
|
||||
@@ -3236,6 +3238,7 @@ const TRANSLATIONS = {
|
||||
"overlay.obs_public_token": "Publik token",
|
||||
"overlay.obs_public_token_hint": "Valfri klienttoken som läggs i public-overlay-länken.",
|
||||
"overlay.obs_layout_leaderboard": "Leaderboard",
|
||||
"overlay.obs_layout_broadcast": "TV-grafik",
|
||||
"overlay.obs_layout_grid": "Startgrid",
|
||||
"overlay.obs_layout_lowerthird": "Lower third",
|
||||
"overlay.obs_theme_panel": "Panel",
|
||||
@@ -3434,6 +3437,8 @@ const TRANSLATIONS = {
|
||||
"timing.live_elsewhere": "Laps are being recorded on \"{name}\", which is running - not on the selected session.",
|
||||
"timing.show_live": "Show it",
|
||||
"overlay.obs_show_position_change": "Places since the start (▲/▼) in races",
|
||||
"overlay.obs_show_start": "Start position next to the place (TV graphics)",
|
||||
"overlay.col_start": "Start",
|
||||
"overlay.position_change_title": "Places gained (▲) or lost (▼) since the start",
|
||||
"settings.public_address_title": "Public address (domain / DynDNS)",
|
||||
"settings.public_address_hint": "Used for every driver's mobile profile: links and QR codes are built with this address, e.g. https://club.dyndns.org or https://club.example:8443. Leave empty to use this computer's local network address (works on the same wifi only).",
|
||||
@@ -5371,6 +5376,7 @@ const TRANSLATIONS = {
|
||||
"overlay.obs_public_token": "Public token",
|
||||
"overlay.obs_public_token_hint": "Optional client token appended to the public overlay URL.",
|
||||
"overlay.obs_layout_leaderboard": "Leaderboard",
|
||||
"overlay.obs_layout_broadcast": "TV graphics",
|
||||
"overlay.obs_layout_grid": "Start grid",
|
||||
"overlay.obs_layout_lowerthird": "Lower third",
|
||||
"overlay.obs_theme_panel": "Panel",
|
||||
@@ -5483,7 +5489,7 @@ let carBrandFilter = "";
|
||||
let raceFormatAdvanced = false;
|
||||
|
||||
function getObsLayouts() {
|
||||
return ["leaderboard", "grid", "lowerthird"];
|
||||
return ["leaderboard", "broadcast", "grid", "lowerthird"];
|
||||
}
|
||||
|
||||
function getObsThemes() {
|
||||
@@ -5504,6 +5510,7 @@ function createDefaultObsOverlaySettings() {
|
||||
showBest: true,
|
||||
showGap: true,
|
||||
showPositionChange: true,
|
||||
showStart: true,
|
||||
layout: "leaderboard",
|
||||
theme: "panel",
|
||||
publicToken: "",
|
||||
@@ -5530,6 +5537,7 @@ function normalizeObsOverlaySettings(raw = {}) {
|
||||
showBest: raw?.showBest !== false,
|
||||
showGap: raw?.showGap !== false,
|
||||
showPositionChange: raw?.showPositionChange !== false,
|
||||
showStart: raw?.showStart !== false,
|
||||
layout,
|
||||
theme,
|
||||
publicToken: String(raw?.publicToken || "").trim(),
|
||||
@@ -5639,6 +5647,7 @@ function getObsOverlayConfig() {
|
||||
showBest: parseOverlayBooleanParam("showBest", base.showBest),
|
||||
showGap: parseOverlayBooleanParam("showGap", base.showGap),
|
||||
showPositionChange: parseOverlayBooleanParam("showPositionChange", base.showPositionChange),
|
||||
showStart: parseOverlayBooleanParam("showStart", base.showStart),
|
||||
layout: getObsLayouts().includes(String(urlParams.get("layout") || "").toLowerCase()) ? String(urlParams.get("layout")).toLowerCase() : base.layout,
|
||||
theme: getObsThemes().includes(String(urlParams.get("obsTheme") || "").toLowerCase()) ? String(urlParams.get("obsTheme")).toLowerCase() : base.theme,
|
||||
publicToken: String(urlParams.get("token") || base.publicToken || "").trim(),
|
||||
@@ -5656,6 +5665,7 @@ function writeObsOverlayParams(url, config) {
|
||||
url.searchParams.set("showBest", normalized.showBest ? "1" : "0");
|
||||
url.searchParams.set("showGap", normalized.showGap ? "1" : "0");
|
||||
url.searchParams.set("showPositionChange", normalized.showPositionChange ? "1" : "0");
|
||||
url.searchParams.set("showStart", normalized.showStart ? "1" : "0");
|
||||
url.searchParams.set("layout", normalized.layout);
|
||||
url.searchParams.set("obsTheme", normalized.theme);
|
||||
if (normalized.publicToken) {
|
||||
|
||||
+60
-1
@@ -200,6 +200,61 @@ export function getPositionChange(session, startOrder, driverId, currentPosition
|
||||
return startPosition > 0 ? startPosition - currentPosition : null;
|
||||
}
|
||||
|
||||
// TV graphics: a title plate top left and a timing tower top right with real columns -
|
||||
// place / start position, driver, laps, time, best lap and gap - large enough to read on a phone.
|
||||
function renderObsBroadcast({ active, compactRows, startOrder, showStartGrid, fastestRow, elapsedOrRemaining, branding, obsConfig, positionChangeMarkup, deps }) {
|
||||
const { t, escapeHtml, formatLap, getEventName, getSessionGridEntries } = deps;
|
||||
const practice = PRACTICE_TYPES.has(String(active.type || ""));
|
||||
const showStart = obsConfig.showStart && !practice && !showStartGrid && compactRows.some((row) => startOrder.includes(row.driverId));
|
||||
const showResult = obsShowsResult(active, obsConfig);
|
||||
const columns = showStartGrid
|
||||
? [["pos", "2.4em"], ["name", "minmax(0, 1fr)"]]
|
||||
: [
|
||||
["pos", "2.4em"], showStart && ["start", "2.4em"], ["name", "minmax(6em, 1fr)"],
|
||||
obsConfig.showPositionChange && !practice && ["change", "2.6em"], obsConfig.showLaps && ["laps", "max-content"],
|
||||
showResult && ["result", "max-content"], obsConfig.showBest && ["best", "max-content"], obsConfig.showGap && ["gap", "max-content"],
|
||||
].filter(Boolean);
|
||||
const label = { pos: "#", start: t("overlay.col_start"), name: t("table.driver"), change: "", laps: t("table.laps"), result: t("table.result"), best: t("table.best_lap"), gap: t("table.gap") };
|
||||
const cell = (key, html) => `<span class="obs-tv-cell obs-tv-${key}">${html}</span>`;
|
||||
// With laps in their own column the result's "14/" prefix only repeats them.
|
||||
const timeOnly = (value) => (obsConfig.showLaps ? String(value || "").replace(/^\d+\//, "") : String(value || ""));
|
||||
const podium = (place) => (place <= 3 ? ` is-p${place}` : "");
|
||||
const rows = showStartGrid
|
||||
? getSessionGridEntries(active).slice(0, obsConfig.rows).map((entry, idx) => `
|
||||
<div class="obs-tv-row${podium(idx + 1)}">${cell("pos", entry.slot)}${cell("name", escapeHtml(entry.name))}</div>`)
|
||||
: compactRows.map((row, idx) => {
|
||||
const start = startOrder.indexOf(row.driverId) + 1;
|
||||
const values = {
|
||||
pos: idx + 1,
|
||||
start: start ? `<span class="obs-tv-slash">/</span>${start}` : "",
|
||||
name: `${escapeHtml(row.displayName || row.driverName)}${row.heatCarName ? ` <small>🚗 ${escapeHtml(row.heatCarName)}</small>` : ""}${row.suspectPending ? ' <span class="suspect-flag">⚠</span>' : ""}`,
|
||||
change: positionChangeMarkup(row, idx + 1),
|
||||
laps: row.laps ?? 0,
|
||||
result: escapeHtml(timeOnly(row.resultDisplay)),
|
||||
best: Number.isFinite(row.bestLapMs) ? escapeHtml(formatLap(row.bestLapMs)) : "-",
|
||||
gap: escapeHtml(idx === 0 ? "" : row.gapDisplay || row.gapAhead || ""),
|
||||
};
|
||||
return `<div class="obs-tv-row${podium(idx + 1)}${row.driverId === fastestRow?.driverId ? " is-fastest" : ""}">${columns.map(([key]) => cell(key, values[key])).join("")}</div>`;
|
||||
});
|
||||
const eventName = String(getEventName(active.eventId) || "").trim();
|
||||
return `
|
||||
<section class="obs-tv" style="--obs-tv-cols: ${columns.map(([, width]) => width).join(" ")}">
|
||||
<div class="obs-tv-plate">
|
||||
${eventName && eventName !== active.name ? `<p class="obs-tv-event">${escapeHtml(eventName)}</p>` : ""}
|
||||
<h2 class="obs-tv-session">${escapeHtml(active.name)}</h2>
|
||||
</div>
|
||||
<div class="obs-tv-tower">
|
||||
<header class="obs-tv-head">
|
||||
${branding.logoDataUrl ? `<img class="obs-tv-logo" src="${escapeHtml(branding.logoDataUrl)}" alt="logo" />` : `<span class="obs-tv-brand">${escapeHtml(branding.brandName || "RC RaceCore")}</span>`}
|
||||
${obsConfig.showClock ? `<strong class="obs-tv-clock" data-overlay-clock>${elapsedOrRemaining}</strong>` : ""}
|
||||
</header>
|
||||
<div class="obs-tv-row obs-tv-labels">${columns.map(([key]) => cell(key, escapeHtml(label[key]))).join("")}</div>
|
||||
${rows.join("") || `<p class="obs-tv-empty">${t("timing.no_laps")}</p>`}
|
||||
${!showStartGrid && obsConfig.showFastest && fastestRow ? `<footer class="obs-tv-foot">${t("overlay.fastest_lap")}: <strong>${escapeHtml(formatLap(fastestRow.bestLapMs))}</strong> · ${escapeHtml(fastestRow.displayName || fastestRow.driverName || "")}</footer>` : ""}
|
||||
</div>
|
||||
</section>`;
|
||||
}
|
||||
|
||||
// In practice the ranking value *is* the best lap, so "result" and "best" would print the
|
||||
// same time twice - show it once.
|
||||
function obsShowsResult(session, obsConfig) {
|
||||
@@ -224,7 +279,7 @@ export function renderObsOverlay(active, leaderboard, result, sessionTiming, bra
|
||||
formatTeamActiveMemberLabel,
|
||||
} = deps;
|
||||
const obsConfig = getObsOverlayConfig();
|
||||
const startOrder = active && obsConfig.showPositionChange ? getSessionGridOrder(active) : [];
|
||||
const startOrder = active && (obsConfig.showPositionChange || obsConfig.showStart) ? getSessionGridOrder(active) : [];
|
||||
const positionChangeMarkup = (row, position) => {
|
||||
const change = obsConfig.showPositionChange ? getPositionChange(active, startOrder, row.driverId, position) : null;
|
||||
if (!change) return "";
|
||||
@@ -243,6 +298,10 @@ export function renderObsOverlay(active, leaderboard, result, sessionTiming, bra
|
||||
? formatCountdownLocal(sessionTiming?.followUpRemainingMs ?? 0)
|
||||
: formatCountdownLocal(sessionTiming?.remainingMs ?? 0);
|
||||
|
||||
if (obsConfig.layout === "broadcast") {
|
||||
return renderObsBroadcast({ active, compactRows, startOrder, showStartGrid, fastestRow, elapsedOrRemaining, branding, obsConfig, positionChangeMarkup, deps });
|
||||
}
|
||||
|
||||
if (obsConfig.layout === "grid") {
|
||||
return `
|
||||
<section class="overlay-obs-layout overlay-obs-layout-grid">
|
||||
|
||||
@@ -389,6 +389,7 @@ export function renderSettings(deps) {
|
||||
<label class="toggle"><input id="obsShowBest" type="checkbox" ${normalizeObsOverlaySettings(state.settings.obsOverlay).showBest ? "checked" : ""} /><span>${t("overlay.obs_show_best")}</span></label>
|
||||
<label class="toggle"><input id="obsShowGap" type="checkbox" ${normalizeObsOverlaySettings(state.settings.obsOverlay).showGap ? "checked" : ""} /><span>${t("overlay.obs_show_gap")}</span></label>
|
||||
<label class="toggle"><input id="obsShowPositionChange" type="checkbox" ${normalizeObsOverlaySettings(state.settings.obsOverlay).showPositionChange ? "checked" : ""} /><span>${t("overlay.obs_show_position_change")}</span></label>
|
||||
<label class="toggle"><input id="obsShowStart" type="checkbox" ${normalizeObsOverlaySettings(state.settings.obsOverlay).showStart ? "checked" : ""} /><span>${t("overlay.obs_show_start")}</span></label>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -776,6 +777,7 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
["obsShowBest", "showBest", (value, el) => Boolean(el?.checked)],
|
||||
["obsShowGap", "showGap", (value, el) => Boolean(el?.checked)],
|
||||
["obsShowPositionChange", "showPositionChange", (value, el) => Boolean(el?.checked)],
|
||||
["obsShowStart", "showStart", (value, el) => Boolean(el?.checked)],
|
||||
].forEach(([id, key, mapper]) => {
|
||||
const el = document.getElementById(id);
|
||||
if (!el) {
|
||||
|
||||
@@ -4899,3 +4899,36 @@ tr:has(> td > .medal-1) { background: linear-gradient(90deg, rgba(240, 197, 63,
|
||||
tr:has(> td > .medal-2) { background: linear-gradient(90deg, rgba(190, 199, 210, 0.26), rgba(190, 199, 210, 0) 70%); }
|
||||
tr:has(> td > .medal-1) > td, tr:has(> td > .medal-2) > td, tr:has(> td > .medal-3) > td { background: transparent; }
|
||||
tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60, 0.26), rgba(205, 127, 60, 0) 70%); }
|
||||
|
||||
/* OBS TV graphics: title plate top left, timing tower top right. No backdrop of its own,
|
||||
so the camera image shows through (chroma keeps its green). */
|
||||
.overlay-shell-obs-layout-broadcast:not(.overlay-shell-obs-theme-chroma) { background: transparent; }
|
||||
.overlay-shell-obs-layout-broadcast { padding: 0; }
|
||||
.obs-tv { position: relative; min-height: 100vh; font-family: "Barlow Condensed", Barlow, "Arial Narrow", sans-serif; color: #fff; text-transform: uppercase; font-size: clamp(16px, 1.45vw, 30px); }
|
||||
.obs-tv-plate { position: absolute; top: 1.2em; left: 1.2em; max-width: 46vw; filter: drop-shadow(0 0.15em 0.4em rgb(0 0 0 / 45%)); }
|
||||
.obs-tv-event { margin: 0; padding: 0.15em 1.6em 0.1em 0.6em; background: #15181f; font-size: 1.35em; font-weight: 800; letter-spacing: 0.01em; clip-path: polygon(0 0, 100% 0, calc(100% - 0.8em) 100%, 0 100%); }
|
||||
.obs-tv-session { margin: 0; padding: 0.1em 1.8em 0.1em 0.6em; background: linear-gradient(90deg, var(--accent), color-mix(in srgb, var(--accent) 70%, #fff)); color: #fff; font-size: 1.8em; font-weight: 800; line-height: 1.15; clip-path: polygon(0 0, 100% 0, calc(100% - 0.9em) 100%, 0 100%); text-shadow: 0 0.05em 0.1em rgb(0 0 0 / 35%); }
|
||||
.obs-tv-tower { position: absolute; top: 1em; right: 1em; min-width: clamp(320px, 26vw, 560px); max-width: 52vw; filter: drop-shadow(0 0.15em 0.5em rgb(0 0 0 / 50%)); }
|
||||
.obs-tv-head { display: flex; align-items: center; justify-content: space-between; gap: 0.6em; padding: 0.2em 0.5em; background: linear-gradient(90deg, #15181f 55%, var(--accent)); }
|
||||
.obs-tv-logo { max-height: 1.9em; max-width: 50%; object-fit: contain; }
|
||||
.obs-tv-brand { font-weight: 800; font-size: 1.05em; letter-spacing: 0.04em; }
|
||||
.obs-tv-clock { font-size: 1.75em; font-weight: 800; font-variant-numeric: tabular-nums; letter-spacing: 0.02em; }
|
||||
.obs-tv-row { display: grid; grid-template-columns: var(--obs-tv-cols); align-items: center; column-gap: 0.45em; padding: 0 0.45em 0 0; min-height: 1.6em; background: rgb(17 21 30 / 88%); border-bottom: 1px solid rgb(255 255 255 / 10%); font-weight: 700; font-variant-numeric: tabular-nums; }
|
||||
.obs-tv-row:nth-child(even of .obs-tv-row:not(.obs-tv-labels)) { background: rgb(27 33 45 / 88%); }
|
||||
.obs-tv-labels { min-height: 1.15em; background: rgb(10 12 18 / 92%); color: rgb(255 255 255 / 60%); font-size: 0.62em; letter-spacing: 0.08em; }
|
||||
.obs-tv-cell { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; text-align: right; }
|
||||
.obs-tv-pos { align-self: stretch; display: grid; place-items: center; text-align: center; background: rgb(255 255 255 / 14%); font-weight: 800; }
|
||||
.obs-tv-labels .obs-tv-pos { background: none; }
|
||||
.obs-tv-start { text-align: left; color: #9fd3ff; }
|
||||
.obs-tv-slash { margin-right: 0.12em; opacity: 0.55; }
|
||||
.obs-tv-name { text-align: left; letter-spacing: 0.01em; }
|
||||
.obs-tv-name small { font-size: 0.7em; opacity: 0.75; text-transform: none; }
|
||||
.obs-tv-change { text-align: center; font-size: 0.8em; }
|
||||
.obs-tv-gap { color: rgb(255 255 255 / 75%); }
|
||||
.obs-tv-row.is-p1 .obs-tv-pos { background: linear-gradient(180deg, #ffe27a, #d4a017); color: #3b2a00; }
|
||||
.obs-tv-row.is-p2 .obs-tv-pos { background: linear-gradient(180deg, #f1f3f6, #a9b1bc); color: #22262d; }
|
||||
.obs-tv-row.is-p3 .obs-tv-pos { background: linear-gradient(180deg, #f0b27a, #a8642c); color: #2e1606; }
|
||||
.obs-tv-row.is-fastest .obs-tv-best { color: #d39bff; }
|
||||
.obs-tv-foot { padding: 0.15em 0.5em; background: rgb(10 12 18 / 92%); font-size: 0.7em; font-weight: 600; letter-spacing: 0.04em; }
|
||||
.obs-tv-foot strong { color: #d39bff; }
|
||||
.obs-tv-empty { margin: 0; padding: 0.4em 0.6em; background: rgb(17 21 30 / 88%); }
|
||||
Reference in new issue
Block a user