Skip to content

Overlay Studio: pick many layers, zoom, lock, restack, and a smoother editor #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Soulhackzlol merged 1 commit into from
Oct 17, 2026
Merged

Overlay Studio: pick many layers, zoom, lock, restack, and a smoother editor #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
6 changes: 4 additions & 2 deletions scripts/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion src/web.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand All @@ -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!(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down
Loading
Loading