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
+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; }
|
||||
|
||||
Reference in new issue
Block a user