diff --git a/build.rs b/build.rs index 6010b44..0e09dae 100644 --- a/build.rs +++ b/build.rs @@ -31,6 +31,8 @@ fn main() { ("overlay-runtime.js", false), // Integrations UI: template-literal heavy like the dock. ("integrations.js", false), + // The Overlay Studio editor, the same way. + ("studio.js", false), ] { let src_path = web_dir.join(name); println!("cargo:rerun-if-changed={}", src_path.display()); diff --git a/scripts/e2e.sh b/scripts/e2e.sh index 53b7bcd..fa0baed 100644 --- a/scripts/e2e.sh +++ b/scripts/e2e.sh @@ -268,7 +268,9 @@ scenario_d() { scenario_e() { write_config "e2e|Sink|custom|rtmp://127.0.0.1:1936/live|stream" - local sink ic ff before after accepts + # ffmpeg only starts once the rest is up: cleared, so the stop below + # works (under set -u) when an earlier step already failed. + local sink ic ff="" before after accepts sink=$(start_sink 1936 E.sink.log) ic=$(start_ic E.ic.log) wait_port 1936 15; assert $? "sink never opened :1936" @@ -301,7 +303,7 @@ scenario_e() { scenario_f() { write_config "e2e|Sink|custom|rtmp://127.0.0.1:1936/live|stream" - local sink ic ff code r s accepts + local sink ic ff="" code r s accepts sink=$(start_sink 1936 F.sink.log) ic=$(start_ic F.ic.log) wait_port 1936 15; assert $? "sink never opened :1936" diff --git a/src/web.rs b/src/web.rs index 6351a2f..0f36b51 100644 --- a/src/web.rs +++ b/src/web.rs @@ -290,7 +290,8 @@ async fn serve( if method == "GET" && (bare_path == "/overlay-runtime.js" || bare_path == "/dock.js" - || bare_path == "/integrations.js") + || bare_path == "/integrations.js" + || bare_path == "/studio.js") { if !accept_gzip { let body = b"this build serves gzip-encoded JS; \ @@ -307,6 +308,7 @@ async fn serve( let blob: &'static [u8] = match bare_path { "/dock.js" => DOCK_JS_GZ, "/integrations.js" => INTEGRATIONS_JS_GZ, + "/studio.js" => STUDIO_JS_GZ, _ => OVERLAY_RUNTIME_JS_GZ, }; let r = format!( @@ -5480,6 +5482,8 @@ static INDEX_HTML_GZ: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/index.ht /// The dashboard's Integrations tab; source in `web/integrations.js`, /// build-time gzipped like the dock script. static INTEGRATIONS_JS_GZ: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/integrations.js.gz")); +/// The Overlay Studio editor; source in `web/studio.js`, gzipped the same way. +static STUDIO_JS_GZ: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/studio.js.gz")); /// Overlay Studio author-time runtime + baker. Loaded only by the /// dashboard (never by a live overlay in OBS). Source lives in @@ -8007,6 +8011,7 @@ user-agent: Mozilla/5.0 Chrome/141.0 Safari/537.36 ("GET", "/dock.js", Access::Control), ("GET", "/overlay-runtime.js", Access::Admin), ("GET", "/integrations.js", Access::Admin), + ("GET", "/studio.js", Access::Admin), ("GET", "/obs/vod-script/download", Access::Admin), ("GET", "/events", Access::Control), ("GET", "/overlay-events", Access::Public), diff --git a/web/index.html b/web/index.html index 702deb2..190e096 100644 --- a/web/index.html +++ b/web/index.html @@ -1974,7 +1974,7 @@ .st-modal{position:fixed;inset:0;z-index:400;display:flex;align-items:center;justify-content:center; padding:18px;background:rgba(4,6,10,.8);backdrop-filter:blur(7px)} .st-modal[hidden]{display:none} -.st-modal-card{width:98vw;height:96vh;display:flex;flex-direction:column; +.st-modal-card{position:relative;width:98vw;height:96vh;display:flex;flex-direction:column; background:var(--bg-2);border:1px solid var(--line-2);border-radius:16px;box-shadow:var(--shadow-2);overflow:hidden} .st-modal-head{display:flex;align-items:center;gap:12px;padding:12px 16px;border-bottom:1px solid var(--line);flex-wrap:nowrap} .st-head-title{flex:1;min-width:0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis} @@ -1991,6 +1991,36 @@ font-size:12.5px;padding:8px 11px;border-radius:7px;cursor:pointer} .st-menu-pop button:hover{background:rgba(255,255,255,.06);color:var(--fg)} .st-menu-pop button.st-danger:hover{background:color-mix(in oklch,var(--danger) 14%,transparent)} +/* The canvas's right-click menu: the overflow menu's look, at the pointer. */ +.st-ctx{position:fixed;right:auto;top:0;left:0;z-index:20;min-width:220px} +.st-ctx button{display:flex;align-items:center;justify-content:space-between;gap:18px} +.st-ctx button:disabled{opacity:.4;cursor:default;background:transparent} +.st-ctx kbd,.st-keys kbd,.st-foot-keys kbd{font:600 10px/1 'JetBrains Mono',monospace;color:var(--fg-4)} +.st-ctx hr{border:0;border-top:1px solid var(--line);margin:3px 4px} +/* Zoom: out, the size shown (a click fits it again), in. */ +.st-zoom{position:absolute;right:10px;bottom:10px;z-index:7;display:flex;align-items:center;gap:2px;padding:3px; + background:color-mix(in oklch,var(--surface-2) 92%,transparent);border:1px solid var(--line-2);border-radius:9px;box-shadow:var(--shadow-2)} +.st-zoom button{appearance:none;background:transparent;border:0;color:var(--fg-2);cursor:pointer;border-radius:6px; + min-width:30px;height:28px;padding:0 7px;font-weight:600;font-size:13px;line-height:1;font-family:inherit;font-variant-numeric:tabular-nums;transition:background .14s,color .14s,scale .12s} +.st-zoom button:hover{background:rgba(255,255,255,.07);color:var(--fg)} +.st-zoom button:active{scale:.96} +#st-zoom-level{min-width:52px;font-size:11.5px} +.st-canvas-frame.st-grab .st-hit,.st-canvas-frame.st-grab .st-hit *{cursor:grab} +.st-canvas-frame.st-panning .st-hit,.st-canvas-frame.st-panning .st-hit *{cursor:grabbing} +/* Every shortcut, on ? or from the menu. */ +.st-keys{position:absolute;inset:0;z-index:30;display:grid;place-items:center;padding:24px;background:rgba(4,6,10,.6)} +.st-keys[hidden]{display:none} +.st-keys-card{width:min(860px,100%);max-height:100%;overflow:auto;background:var(--surface-2);border:1px solid var(--line-2); + border-radius:14px;box-shadow:var(--shadow-2);padding:16px 18px 18px} +.st-keys-head{display:flex;align-items:center;justify-content:space-between;margin-bottom:10px;font-size:14px} +.st-keys-head .st-layer-btn{display:inline-block} +.st-keys-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(270px,1fr));gap:16px 26px} +.st-keys h4{margin:0 0 6px;font-size:10.5px;letter-spacing:.08em;text-transform:uppercase;color:var(--fg-3)} +.st-keys dl{margin:0;display:grid;grid-template-columns:minmax(0,9.5em) 1fr;gap:6px 12px;font-size:12px} +.st-keys dt{font:600 11px/1.5 'JetBrains Mono',monospace;color:var(--fg)} +.st-keys dd{margin:0;color:var(--fg-2);text-wrap:pretty} +.st-foot-keys{appearance:none;background:transparent;border:0;padding:0;color:inherit;font:inherit;cursor:pointer;text-decoration:underline;text-underline-offset:2px} +.st-foot-keys:hover{color:var(--fg)} .st-modal-body{flex:1;min-height:0;padding:12px;display:grid; grid-template-columns:224px minmax(0,1fr) 300px;grid-template-rows:minmax(0,1fr);gap:12px} @media (max-width:1120px){.st-modal-body{grid-template-columns:180px minmax(0,1fr) 250px}} @@ -2048,6 +2078,12 @@ .st-layer .st-layer-btn{display:none;opacity:1} .st-layer:hover .st-layer-btn,.st-layer.sel .st-layer-btn,.st-layer:focus-within .st-layer-btn{display:inline-block} @media (hover:none){.st-layer .st-layer-btn{display:inline-block}} +.st-layer.locked .st-lock{display:inline-block;color:var(--fg-2)} +.st-layer.locked .st-layer-name{font-style:italic} +.st-layer.hot{border-color:var(--line-2)} +.st-layer.st-dragging{opacity:.45} +.st-layer.st-drop-above{box-shadow:inset 0 2px 0 var(--accent)} +.st-layer.st-drop-below{box-shadow:inset 0 -2px 0 var(--accent)} .st-layer-btn:hover{color:var(--fg);background:rgba(255,255,255,.07)} .st-empty-hint{padding:18px 12px;text-align:center;color:var(--fg-4);font-size:12px;line-height:1.6} @@ -2089,7 +2125,7 @@ .st-amprow{display:flex;align-items:center;gap:8px;margin-top:5px;font-size:11px;color:var(--fg-3)} .st-amprow span{white-space:nowrap} .st-amprow input{flex:1;min-width:0} -.st-amprow b{min-width:30px;text-align:right;color:var(--fg)} +.st-amprow output{min-width:30px;text-align:right;color:var(--fg)} .st-range input{flex:1;min-width:0} .st-range output{min-width:2.6em;text-align:right;font:500 11.5px 'JetBrains Mono',monospace;color:var(--fg-2);font-variant-numeric:tabular-nums} .st-mini{padding:5px 10px;font-size:11.5px} @@ -2106,6 +2142,14 @@ color:var(--fg-4);padding:5px;cursor:pointer;transition:border-color .12s,color .12s} .st-alignb i{width:7px;height:7px;border-radius:2px;background:currentColor} .st-alignb:hover{border-color:var(--accent);color:var(--accent)} +/* Several layers picked: line them up, or spread them out. */ +.st-lineup{display:grid;grid-template-columns:repeat(6,minmax(0,1fr));gap:4px;margin-bottom:6px} +.st-lineup.st-spread{grid-template-columns:repeat(2,minmax(0,1fr))} +.st-lineb{appearance:none;display:grid;place-items:center;height:30px;background:var(--surface);border:1px solid var(--line);border-radius:6px; + color:var(--fg-3);cursor:pointer;transition:border-color .12s,color .12s,scale .12s} +.st-lineb svg{width:16px;height:16px} +.st-lineb:hover{border-color:var(--accent);color:var(--accent)} +.st-lineb:active{scale:.96} .st-chip{appearance:none;background:color-mix(in oklch,var(--accent) 12%,transparent);border:1px solid color-mix(in oklch,var(--accent) 30%,transparent); color:var(--accent);font-family:'JetBrains Mono',monospace;font-size:10px;padding:2px 6px;border-radius:5px;cursor:pointer;margin:2px 3px 0 0} .st-chip:hover{background:color-mix(in oklch,var(--accent) 22%,transparent)} @@ -2150,18 +2194,39 @@ /* gentle fade when panels re-render */ @keyframes st-fade-in{from{opacity:0;transform:translateY(4px)}to{opacity:1;transform:none}} .st-canvas-scale iframe{width:1920px;height:1080px;border:0;background:transparent;display:block;pointer-events:none;color-scheme:normal} -.st-hit{position:absolute;inset:0} -.st-hit .st-box{position:absolute;border:2px solid transparent;cursor:move;border-radius:4px} +/* The canvas's pick layer, in canvas px (scaled with it). --st-inv undoes + the scale, so outlines and handles keep their size on screen. */ +.st-canvas-scale{--px:calc(1px * var(--st-inv,1))} +.st-hit{position:absolute;inset:0;touch-action:none} +.st-hit .st-box{position:absolute;border:calc(2 * var(--px)) solid transparent;cursor:move;border-radius:calc(4 * var(--px))} .st-hit .st-box:hover{border-color:color-mix(in oklch,var(--accent) 45%,transparent)} -.st-hit .st-box.sel{border-color:var(--accent);box-shadow:0 0 0 1px var(--accent)} -.st-hit .st-resize{position:absolute;right:-7px;bottom:-7px;width:14px;height:14px;border-radius:50%; - background:var(--accent);border:2px solid var(--bg-2);cursor:nwse-resize;display:none} -.st-hit .st-box.sel .st-resize{display:block} -/* centre snapping guidelines (in canvas space, scaled with the canvas) */ +.st-hit .st-box.sel{border-color:var(--accent);box-shadow:0 0 0 var(--px) var(--accent)} +.st-hit .st-box.locked{pointer-events:none} +.st-hit .st-box.hover:not(.sel){border-color:color-mix(in oklch,var(--accent) 45%,transparent)} +.st-hit .st-box.locked.sel{border-style:dashed;box-shadow:none} +/* The picked layer's handles, over every box: a layer on top never covers them. */ +.st-hit .st-handles{position:absolute;pointer-events:none} +.st-hit .st-handle{pointer-events:auto;position:absolute;box-sizing:border-box;width:calc(12 * var(--px));height:calc(12 * var(--px)); + margin:calc(-6 * var(--px)) 0 0 calc(-6 * var(--px));border-radius:50%;background:var(--accent);border:calc(2 * var(--px)) solid var(--bg-2)} +/* a grip bigger than it looks */ +.st-hit .st-handle::before{content:'';position:absolute;inset:calc(-6 * var(--px))} +.st-hit .st-handle[data-handle="nw"]{left:0;top:0;cursor:nwse-resize} +.st-hit .st-handle[data-handle="n"]{left:50%;top:0;cursor:ns-resize} +.st-hit .st-handle[data-handle="ne"]{left:100%;top:0;cursor:nesw-resize} +.st-hit .st-handle[data-handle="e"]{left:100%;top:50%;cursor:ew-resize} +.st-hit .st-handle[data-handle="se"]{left:100%;top:100%;cursor:nwse-resize} +.st-hit .st-handle[data-handle="s"]{left:50%;top:100%;cursor:ns-resize} +.st-hit .st-handle[data-handle="sw"]{left:0;top:100%;cursor:nesw-resize} +.st-hit .st-handle[data-handle="w"]{left:0;top:50%;cursor:ew-resize} +/* several picked: the box around them all; a drag on empty canvas: the band */ +.st-hit .st-group{position:absolute;pointer-events:none;border:var(--px) dashed var(--accent);border-radius:calc(4 * var(--px))} +.st-hit .st-band{position:absolute;pointer-events:none;border:var(--px) solid var(--accent); + background:color-mix(in oklch,var(--accent) 12%,transparent)} +/* snapping guidelines: where an edge or a middle lines up (canvas space) */ .st-guide{position:absolute;background:var(--accent);pointer-events:none;opacity:0;transition:opacity .1s;z-index:6; box-shadow:0 0 10px var(--accent)} -.st-guide.v{left:960px;top:0;bottom:0;width:2px;margin-left:-1px} -.st-guide.h{top:540px;left:0;right:0;height:2px;margin-top:-1px} +.st-guide.v{left:960px;top:0;bottom:0;width:var(--px)} +.st-guide.h{top:540px;left:0;right:0;height:var(--px)} .st-guide.on{opacity:.9} .st-simbar{display:flex;align-items:center;gap:6px;flex-wrap:wrap; background:var(--bg-2);border:1px solid var(--line);border-radius:10px;padding:8px 10px} @@ -2171,6 +2236,7 @@ .st-props-head{padding:12px 14px;border-bottom:1px solid var(--line);display:flex;align-items:center;gap:10px} .st-props-title{font-size:13px;font-weight:600;color:var(--fg)} .st-props-sub{font-size:11px;color:var(--fg-4);font-family:'JetBrains Mono',monospace} +.st-props-sub.st-props-note{font-family:inherit;letter-spacing:0} .st-props-body{overflow-y:auto;padding:12px 14px;flex:1;display:flex;flex-direction:column;gap:11px; animation:st-fade-in .2s var(--ease-out)} /* Redrawn for the same widget (a toggle, a swatch): it stays put, no fade. */ @@ -5062,13 +5128,13 @@
select an overlay
- save to get a URL · Esc to close.
+ Editing the Active state · URL: save to get a URL · Esc to close · {{delay}}, {{bitrate}}, {{bufferPct}}, {{phase}}.ic.onUpdate(s => ...), ic.delay, ic.phase, ic.bind(sel,key).{{delay}}, {{bitrate}}, {{bufferPct}}, {{phase}}.ic.onUpdate(s => ...), ic.delay, ic.phase, ic.bind(sel,key).