feat(overlay): size setting for the OBS graphics, carried in the OBS URL (1.89.22)
This commit is contained in:
1 parent
b4a6381f82
commit
80f8402971
10 files changed
+50
-12
No files matched your search
@@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm
|
||||
|
||||
No changes recorded yet.
|
||||
|
||||
## 1.89.22 - 2026-11-13
|
||||
|
||||
### Added
|
||||
|
||||
- **Size** setting for the OBS overlay (Settings → OBS, 50-150 %): makes the TV tower, title plate and the other OBS layouts smaller or larger to fit the stream. It is part of the copied OBS URL (`?scale=80`), so different streams can use different sizes.
|
||||
|
||||
## 1.89.21 - 2026-11-13
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -285,11 +285,12 @@ The **Overlay** menu has leaderboard, speaker, results, TV and team modes, plus
|
||||
- Columns: laps, **last lap**, result, best, gap, and **places since the start** (▲/▼ in heats and finals).
|
||||
- **Last lap** changes at every passing. In Open Practice, where the result is just the best lap, the leaderboard shows the last lap instead of the result.
|
||||
- A session ranked on the **best N laps** (Open Practice on N laps in a row or X minutes, or a practice or qualifier seeded on the best N laps) shows only what the rule ranks on, the same in every session type: position, driver, result (for example "3 laps 55.123"), gap and best lap (the next-lap bar stays). Heats on laps and time, like most qualifiers and every final, keep the full columns.
|
||||
- **TV graphics:** a title plate top left (event and heat) and a timing tower top right with the clock on top and real columns: place / **start position** (e.g. "2 / 3"), driver, laps, time, best and gap, in large bold type with podium colours for the top three. No backdrop of its own, so the camera image shows through. The start position can be turned off and is not shown in practice.
|
||||
- **TV graphics:** a title plate top left (event and heat) and a timing tower top right with the clock on top and real columns: place / **start position** (e.g. "2 / 3"), driver, laps, time, best and gap, in clear type with podium colours for the top three. No backdrop of its own, so the camera image shows through. The start position can be turned off and is not shown in practice.
|
||||
- **Live marks** in the leaderboard and the TV tower: a driver's row flashes briefly on a new time, a fuel pump badge with a ticking clock shows while the car is in the pits (then the stop time for 5 s), and a new split shows for 4 s with ± against the previous one. They run on the overlay computer's clock, and a freshly opened overlay never flashes every row.
|
||||
- The TV title plate has the RaceCore look: the club logo or a red RC mark, the event in small capitals and the heat in Orbitron.
|
||||
- The TV title plate has the RaceCore look: the club logo or a red RC mark, the event in small capitals and the heat in Barlow (a soft font; overlays use it instead of the app's squared Orbitron).
|
||||
- **Click a driver** in RaceCore's own overlay to open that driver's training stats (the stand-alone overlay window opens them in a new tab). The public overlay has no such links.
|
||||
- **Copy OBS URL** gives a browser-source link; the chosen columns are part of the link.
|
||||
- **Size** (50-150 %) makes the OBS graphics smaller or larger to fit the stream; the TV tower, plate and every OBS layout scale together.
|
||||
- **Copy OBS URL** gives a browser-source link; the chosen columns and the size are part of the link (`?scale=80`), so two streams can use different sizes.
|
||||
- **Overlay windows are read-only:** they do not connect to the decoder and never save, so an overlay on another computer (or in OBS) cannot disturb the race run from Race Day. No admin PIN is needed for that. Run Race Day in one browser at a time.
|
||||
- Public overlays live at `/public-overlay/<mode>` and can require a token: set `PUBLIC_OVERLAY_TOKEN` and add `?token=...`. Publish only `/public-overlay/*` through your reverse proxy.
|
||||
- Club branding (name, logo, PDF theme) is applied to the sidebar, overlays, mobile profiles and PDFs; branding can also be set per event.
|
||||
|
||||
+4
-3
@@ -298,11 +298,12 @@ Menyn **Overlay** har lägena leaderboard, speaker, resultat, TV och lag, plus e
|
||||
- Kolumner: varv, **senaste varv**, resultat, bästa, gap och **placering sedan start** (▲/▼ i heat och finaler).
|
||||
- **Senaste varv** byts vid varje passering. I Open Practice, där resultatet bara är bästa varvet, visar leaderboarden senaste varv i stället för resultat.
|
||||
- En session som rankas på **bästa N varv** (Open Practice på N varv i rad eller X minuter, eller träning eller kval med seeding på bästa N varv) visar bara det regeln rankar på, likadant i alla sessionstyper: placering, förare, resultat (t.ex. "3 varv 55,123"), gap och bästa varv (stapeln för nästa varv finns kvar). Heat på varv och tid, som de flesta kval och alla finaler, behåller alla kolumner.
|
||||
- **TV-grafik:** rubrikskylt uppe till vänster (event och heat) och en topplista uppe till höger med klockan överst och raka kolumner: placering / **startplats** (t.ex. "2 / 3"), förare, varv, tid, bästa och gap, i stor fet text och medaljfärger för topp 3. Ingen egen bakgrund, så kamerabilden syns igenom. Startplatsen kan stängas av och visas inte i träning.
|
||||
- **TV-grafik:** rubrikskylt uppe till vänster (event och heat) och en topplista uppe till höger med klockan överst och raka kolumner: placering / **startplats** (t.ex. "2 / 3"), förare, varv, tid, bästa och gap, i tydlig text och medaljfärger för topp 3. Ingen egen bakgrund, så kamerabilden syns igenom. Startplatsen kan stängas av och visas inte i träning.
|
||||
- **Livemarkeringar** i leaderboard och TV-topplistan: förarens rad blinkar kort vid en ny tid, en bränslepump med tickande klocka visas medan bilen är i depå (sedan stopptiden i 5 s), och en ny mellantid visas i 4 s med ± mot förra. De går på overlay-datorns klocka, och en nyöppnad overlay blinkar aldrig alla rader.
|
||||
- TV-rubrikskylten har RaceCore-utseende: klubbens logga eller ett rött RC-märke, eventet i små versaler och heatet i Orbitron.
|
||||
- TV-rubrikskylten har RaceCore-utseende: klubbens logga eller ett rött RC-märke, eventet i små versaler och heatet i Barlow (ett mjukt typsnitt; overlayerna använder det i stället för appens kantiga Orbitron).
|
||||
- **Klicka på en förare** i RaceCores egen overlay för att öppna förarens träningsstatistik (det fristående overlay-fönstret öppnar den i en ny flik). Den publika overlayn har inga sådana länkar.
|
||||
- **Kopiera OBS-URL** ger en länk för browser source; valda kolumner ingår i länken.
|
||||
- **Storlek** (50–150 %) gör OBS-grafiken mindre eller större så att den passar streamen; TV-topplistan, skylten och alla OBS-layouter skalas tillsammans.
|
||||
- **Kopiera OBS-URL** ger en länk för browser source; valda kolumner och storleken ingår i länken (`?scale=80`), så två streams kan ha olika storlek.
|
||||
- **Overlay-fönster är skrivskyddade:** de kopplar inte upp sig mot decodern och sparar aldrig, så en overlay på en annan dator (eller i OBS) kan inte störa racet som körs från Race Day. Ingen admin-PIN behövs för det. Kör bara Race Day i en webbläsare åt gången.
|
||||
- Publika overlays finns på `/public-overlay/<läge>` och kan kräva en nyckel: sätt `PUBLIC_OVERLAY_TOKEN` och lägg till `?token=...`. Publicera bara `/public-overlay/*` via din reverse proxy.
|
||||
- Klubbprofilen (namn, logga, PDF-tema) används i menyn, overlays, mobilprofiler och PDF; den kan även sättas per tävling.
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.21",
|
||||
"version": "1.89.22",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.21",
|
||||
"version": "1.89.22",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"better-sqlite3": "^12.11.1",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.21",
|
||||
"version": "1.89.22",
|
||||
"private": true,
|
||||
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
|
||||
"engines": {
|
||||
|
||||
+11
@@ -3512,6 +3512,8 @@ const TRANSLATIONS = {
|
||||
"overlay.col_last": "Senaste",
|
||||
"overlay.obs_show_gap": "Visa gap",
|
||||
"overlay.obs_show_flags": "Visa flaggor",
|
||||
"overlay.obs_scale": "Storlek",
|
||||
"overlay.obs_scale_hint": "Gör OBS-grafiken mindre eller större så att den passar din stream. Följer med i OBS-url:en (?scale=80).",
|
||||
"overlay.obs_copy_url": "Kopiera OBS-url",
|
||||
"overlay.obs_layout": "OBS-layout",
|
||||
"overlay.obs_theme": "OBS-tema",
|
||||
@@ -5816,6 +5818,8 @@ const TRANSLATIONS = {
|
||||
"overlay.col_last": "Last",
|
||||
"overlay.obs_show_gap": "Show gap",
|
||||
"overlay.obs_show_flags": "Show flags",
|
||||
"overlay.obs_scale": "Size",
|
||||
"overlay.obs_scale_hint": "Makes the OBS graphics smaller or larger to fit your stream. Carried in the OBS URL (?scale=80).",
|
||||
"overlay.obs_copy_url": "Copy OBS URL",
|
||||
"overlay.obs_layout": "OBS layout",
|
||||
"overlay.obs_theme": "OBS theme",
|
||||
@@ -5978,6 +5982,7 @@ function createDefaultObsOverlaySettings() {
|
||||
showFlags: true,
|
||||
showPositionChange: true,
|
||||
showStart: true,
|
||||
scale: 100,
|
||||
layout: "leaderboard",
|
||||
theme: "panel",
|
||||
publicToken: "",
|
||||
@@ -5994,6 +5999,9 @@ function normalizeObsOverlaySettings(raw = {}) {
|
||||
const themeOptions = getObsThemes();
|
||||
const layout = layoutOptions.includes(String(raw?.layout || "").toLowerCase()) ? String(raw.layout).toLowerCase() : defaults.layout;
|
||||
const theme = themeOptions.includes(String(raw?.theme || "").toLowerCase()) ? String(raw.theme).toLowerCase() : defaults.theme;
|
||||
// Size of the OBS graphics in percent (50-150, steps of 5) so they fit the stream.
|
||||
const scaleValue = Number(raw?.scale);
|
||||
const scale = Number.isFinite(scaleValue) && scaleValue > 0 ? Math.max(50, Math.min(150, Math.round(scaleValue / 5) * 5)) : defaults.scale;
|
||||
return {
|
||||
rows,
|
||||
showClock: raw?.showClock !== false,
|
||||
@@ -6007,6 +6015,7 @@ function normalizeObsOverlaySettings(raw = {}) {
|
||||
showFlags: raw?.showFlags !== false,
|
||||
showPositionChange: raw?.showPositionChange !== false,
|
||||
showStart: raw?.showStart !== false,
|
||||
scale,
|
||||
layout,
|
||||
theme,
|
||||
publicToken: String(raw?.publicToken || "").trim(),
|
||||
@@ -6121,6 +6130,7 @@ function getObsOverlayConfig() {
|
||||
showFlags: parseOverlayBooleanParam("showFlags", base.showFlags),
|
||||
showPositionChange: parseOverlayBooleanParam("showPositionChange", base.showPositionChange),
|
||||
showStart: parseOverlayBooleanParam("showStart", base.showStart),
|
||||
scale: urlParams.get("scale") ?? base.scale,
|
||||
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(),
|
||||
@@ -6141,6 +6151,7 @@ function writeObsOverlayParams(url, config) {
|
||||
url.searchParams.set("showFlags", normalized.showFlags ? "1" : "0");
|
||||
url.searchParams.set("showPositionChange", normalized.showPositionChange ? "1" : "0");
|
||||
url.searchParams.set("showStart", normalized.showStart ? "1" : "0");
|
||||
url.searchParams.set("scale", String(normalized.scale));
|
||||
url.searchParams.set("layout", normalized.layout);
|
||||
url.searchParams.set("obsTheme", normalized.theme);
|
||||
if (normalized.publicToken) {
|
||||
|
||||
+1
-1
@@ -246,7 +246,7 @@ export function renderOverlayPageView(deps) {
|
||||
</div>
|
||||
</section>
|
||||
`}
|
||||
<section class="overlay-shell ${overlayViewMode === "tv" ? "overlay-shell-tv" : ""} ${overlayViewMode === "obs" ? "overlay-shell-obs" : ""} ${overlayViewMode === "obs" && obsConfig ? `overlay-shell-obs-theme-${obsConfig.theme}` : ""} ${overlayViewMode === "obs" && obsConfig ? `overlay-shell-obs-layout-${obsConfig.layout}` : ""} ${denseOverlay ? "overlay-shell-dense" : ""} ${publicOverlayMode ? "overlay-shell-public" : ""}">
|
||||
<section class="overlay-shell ${overlayViewMode === "tv" ? "overlay-shell-tv" : ""} ${overlayViewMode === "obs" ? "overlay-shell-obs" : ""} ${overlayViewMode === "obs" && obsConfig ? `overlay-shell-obs-theme-${obsConfig.theme}` : ""} ${overlayViewMode === "obs" && obsConfig ? `overlay-shell-obs-layout-${obsConfig.layout}` : ""} ${denseOverlay ? "overlay-shell-dense" : ""} ${publicOverlayMode ? "overlay-shell-public" : ""}"${obsConfig ? ` style="--obs-scale: ${Number(obsConfig.scale || 100) / 100}"` : ""}>
|
||||
${active ? `
|
||||
${overlayViewMode === "obs" ? "" : `<header class="overlay-header">
|
||||
<div class="overlay-header-main">
|
||||
|
||||
@@ -379,6 +379,11 @@ export function renderSettings(deps) {
|
||||
${OBS_THEMES.map((theme) => `<option value="${theme}" ${normalizeObsOverlaySettings(state.settings.obsOverlay).theme === theme ? "selected" : ""}>${t(`overlay.obs_theme_${theme}`)}</option>`).join("")}
|
||||
</select>
|
||||
</label>
|
||||
<label>
|
||||
${t("overlay.obs_scale")} <output id="obsScaleValue" for="obsScale">${normalizeObsOverlaySettings(state.settings.obsOverlay).scale} %</output>
|
||||
<input id="obsScale" type="range" min="50" max="150" step="5" value="${normalizeObsOverlaySettings(state.settings.obsOverlay).scale}" />
|
||||
<small>${t("overlay.obs_scale_hint")}</small>
|
||||
</label>
|
||||
<label>
|
||||
${t("overlay.obs_public_token")}
|
||||
<input id="obsPublicToken" value="${escapeHtml(normalizeObsOverlaySettings(state.settings.obsOverlay).publicToken)}" placeholder="optional" />
|
||||
@@ -796,6 +801,7 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
["obsRows", "rows", (value) => Math.max(3, Math.min(12, Number(value) || DEFAULT_OBS_OVERLAY_SETTINGS.rows))],
|
||||
["obsLayout", "layout", (value) => OBS_LAYOUTS.includes(String(value || "").toLowerCase()) ? String(value).toLowerCase() : DEFAULT_OBS_OVERLAY_SETTINGS.layout],
|
||||
["obsTheme", "theme", (value) => OBS_THEMES.includes(String(value || "").toLowerCase()) ? String(value).toLowerCase() : DEFAULT_OBS_OVERLAY_SETTINGS.theme],
|
||||
["obsScale", "scale", (value) => Number(value) || DEFAULT_OBS_OVERLAY_SETTINGS.scale],
|
||||
["obsPublicToken", "publicToken", (value) => String(value || "").trim()],
|
||||
["obsShowClock", "showClock", (value, el) => Boolean(el?.checked)],
|
||||
["obsShowFastest", "showFastest", (value, el) => Boolean(el?.checked)],
|
||||
@@ -810,6 +816,8 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
["obsShowStart", "showStart", (value, el) => Boolean(el?.checked)],
|
||||
].forEach(([id, key, mapper]) => {
|
||||
const el = document.getElementById(id);
|
||||
// The size slider shows its value while dragging; it is saved when released.
|
||||
if (id === "obsScale") el?.addEventListener("input", () => { document.getElementById("obsScaleValue").textContent = `${el.value} %`; });
|
||||
if (!el) {
|
||||
return;
|
||||
}
|
||||
|
||||
+6
-2
@@ -4912,7 +4912,11 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
|
||||
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; font-size: clamp(13px, 1.1vw, 23px); }
|
||||
.obs-tv { position: relative; min-height: 100vh; font-family: "Barlow Condensed", Barlow, "Arial Narrow", sans-serif; color: #fff; font-size: calc(clamp(13px, 1.1vw, 23px) * var(--obs-scale, 1)); }
|
||||
/* The OBS size setting (--obs-scale): the TV graphics above scale through their font size (all em),
|
||||
the other OBS layouts are zoomed as a whole. */
|
||||
.overlay-shell-obs:not(.overlay-shell-obs-layout-broadcast) > * { zoom: var(--obs-scale, 1); }
|
||||
.overlay-shell-obs .overlay-obs-lowerthird { min-height: calc((100vh - 32px) / var(--obs-scale, 1)); }
|
||||
/* Session plate in RaceCore style: the red RC mark (or the club logo), a navy panel and Orbitron. */
|
||||
.obs-tv-plate { position: absolute; top: 1.1em; left: 1.1em; display: flex; align-items: stretch; max-width: 46vw; border: 1px solid rgb(255 255 255 / 12%); border-radius: 0.55em; overflow: hidden; background: linear-gradient(180deg, rgb(20 31 52 / 94%), rgb(9 15 28 / 94%)); box-shadow: 0 0.3em 1.2em rgb(0 0 0 / 45%); text-transform: none; }
|
||||
.obs-tv-plate::after { content: ""; position: absolute; left: 0; right: 0; bottom: 0; height: 0.14em; background: linear-gradient(90deg, var(--accent), color-mix(in srgb, var(--accent) 40%, transparent)); }
|
||||
@@ -4921,7 +4925,7 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
|
||||
.obs-tv-plate-text { display: flex; flex-direction: column; justify-content: center; min-width: 0; padding: 0.4em 1.1em 0.5em 0.8em; }
|
||||
.obs-tv-event { margin: 0; color: #9aa9c4; font-size: 0.85em; font-weight: 700; letter-spacing: 0.14em; text-transform: uppercase; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||
.obs-tv-session { margin: 0; color: #fff; font-family: var(--overlay-font); font-size: 1.45em; font-weight: 700; line-height: 1.15; letter-spacing: 0.01em; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||
.obs-tv-tower { position: absolute; top: 1em; right: 1em; min-width: clamp(300px, 22vw, 480px); max-width: 46vw; border-radius: 0.5em; overflow: hidden; filter: drop-shadow(0 0.15em 0.5em rgb(0 0 0 / 50%)); }
|
||||
.obs-tv-tower { position: absolute; top: 1em; right: 1em; min-width: 20em; max-width: 46vw; border-radius: 0.5em; overflow: hidden; 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, rgb(12 20 36 / 96%) 55%, var(--accent)); }
|
||||
.obs-tv-logo { max-height: 1.9em; max-width: 50%; object-fit: contain; }
|
||||
.obs-tv-brand { font-family: var(--overlay-font); font-weight: 700; font-size: 0.95em; letter-spacing: 0.02em; }
|
||||
|
||||
@@ -134,6 +134,13 @@ export async function runObsPopupSmoke({ evaluate, navigate, fill, savedState, w
|
||||
return clock === (await clockAt());
|
||||
}, "popup clock stops advancing once the session is paused");
|
||||
|
||||
// The size setting: 100 % by default, and the URL's ?scale= zooms the OBS graphics.
|
||||
const zoomOf = () => popup.evaluate('getComputedStyle(document.querySelector(".overlay-shell-obs > *")).zoom');
|
||||
assert.ok(new URL(target.url).searchParams.get("scale") === "100", "the OBS url carries the size");
|
||||
assert.equal(await zoomOf(), "1", "default size: no zoom");
|
||||
await popup.evaluate(`(() => { const url = new URL(location.href); url.searchParams.set("scale", "70"); location.replace(url.toString()); return true; })()`);
|
||||
await popup.waitFor(async () => (await zoomOf()) === "0.7", "?scale=70 zooms the OBS graphics to 70 %");
|
||||
|
||||
assert.equal(dialogs.length, dialogsBefore, "no unexpected native dialog while opening or reading the obs popup");
|
||||
console.log("PASS obs overlay opens as a real popup with the compact layout and live-updates independently of the admin page");
|
||||
} finally {
|
||||
|
||||
Reference in new issue
Block a user