From: Steinar H. Gunderson Date: Thu, 26 Apr 2018 19:36:56 +0000 (+0200) Subject: Wrap up the state as an upvalue in the prepare function. X-Git-Url: https://git.sesse.net/?p=ultimatescore;a=commitdiff_plain;h=a5e8345fcfe628521d5d6e1e359456c9cb7e8ec0 Wrap up the state as an upvalue in the prepare function. --- diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua index e4cc821..6308737 100644 --- a/nageru/ultimate.lua +++ b/nageru/ultimate.lua @@ -1,29 +1,31 @@ -- Nageru theme for ultimate productions, based on the default theme. -local transition_start = -2.0 -local transition_end = -1.0 -local transition_type = 0 -local transition_src_signal = 0 -local transition_dst_signal = 0 - -local neutral_colors = { - {0.5, 0.5, 0.5}, -- Input 0. - {0.5, 0.5, 0.5}, -- Input 1. - {0.5, 0.5, 0.5}, -- Input 2. - {0.5, 0.5, 0.5}, -- Input 3. - {0.5, 0.5, 0.5}, -- Input 4. - {0.5, 0.5, 0.5} -- Input 5. - -- Will also be filled with VIDEO_SIGNAL_NUM below. +local state = { + transition_start = -2.0, + transition_end = -1.0, + transition_type = 0, + transition_src_signal = 0, + transition_dst_signal = 0, + + neutral_colors = { + {0.5, 0.5, 0.5}, -- Input 0. + {0.5, 0.5, 0.5}, -- Input 1. + {0.5, 0.5, 0.5}, -- Input 2. + {0.5, 0.5, 0.5}, -- Input 3. + {0.5, 0.5, 0.5}, -- Input 4. + {0.5, 0.5, 0.5} -- Input 5. + -- Will also be filled with VIDEO_SIGNAL_NUM below. + }, + + overlay_transition_start = -2.0, + overlay_transition_end = -1.0, + overlay_alpha_src = 0.0, + overlay_alpha_dst = 1.0, + overlay_enabled = false, + + live_signal_num = 0, + preview_signal_num = 1 } - -local overlay_transition_start = -2.0 -local overlay_transition_end = -1.0 -local overlay_alpha_src = 0.0 -local overlay_alpha_dst = 1.0 -local overlay_enabled = false - -local live_signal_num = 0 -local preview_signal_num = 1 local NUM_CAMERAS = 6 -- Remember to update neutral_colors, too. -- Valid values for live_signal_num and preview_signal_num. @@ -37,7 +39,7 @@ local SBS_SIGNAL_NUM = NUM_CAMERAS local STATIC_SIGNAL_NUM = NUM_CAMERAS + 1 local VIDEO_SIGNAL_NUM = NUM_CAMERAS + 2 -neutral_colors[VIDEO_SIGNAL_NUM - INPUT0_SIGNAL_NUM + 1] = {0.5, 0.5, 0.5}; +state.neutral_colors[VIDEO_SIGNAL_NUM - INPUT0_SIGNAL_NUM + 1] = {0.5, 0.5, 0.5}; -- Preview-only signal showing the current signal with the overlay. -- Not valid for live_signal_num! @@ -472,17 +474,17 @@ end -- "transparent" is allowed. -- Will never be called for live (0) or preview (1). function channel_color(channel) - if transition_type ~= NO_TRANSITION then - if channel_involved_in(channel, transition_src_signal) or - channel_involved_in(channel, transition_dst_signal) then + if state.transition_type ~= NO_TRANSITION then + if channel_involved_in(channel, state.transition_src_signal) or + channel_involved_in(channel, state.transition_dst_signal) then return "#f00" end else - if channel_involved_in(channel, live_signal_num) then + if channel_involved_in(channel, state.live_signal_num) then return "#f00" end end - if channel_involved_in(channel, preview_signal_num) then + if channel_involved_in(channel, state.preview_signal_num) then return "#0f0" end return "transparent" @@ -516,25 +518,25 @@ end -- The color is in linear light (not sRGB gamma). function set_wb(channel, red, green, blue) if is_plain_signal(channel - 2) then - neutral_colors[channel - 2 + 1] = { red, green, blue } + state.neutral_colors[channel - 2 + 1] = { red, green, blue } end end function finish_transitions(t) - if transition_type ~= NO_TRANSITION and t >= transition_end then - live_signal_num = transition_dst_signal - transition_type = NO_TRANSITION + if state.transition_type ~= NO_TRANSITION and t >= state.transition_end then + state.live_signal_num = state.transition_dst_signal + state.transition_type = NO_TRANSITION end -- Disable the overlay if it is no longer visible. - if overlay_enabled and t > overlay_transition_end and overlay_alpha_dst == 0.0 then - overlay_enabled = false + if state.overlay_enabled and t > state.overlay_transition_end and state.overlay_alpha_dst == 0.0 then + state.overlay_enabled = false print("Turning off overlay") end end function in_transition(t) - return t >= transition_start and t <= transition_end + return t >= state.transition_start and t <= state.transition_end end function is_sbs_participating_signal(signal_num) @@ -549,12 +551,12 @@ end -- API ENTRY POINT -- Called every frame. function get_transitions(t) - if preview_signal_num == OVERLAY_SIGNAL_NUM then - if t < overlay_transition_end then + if state.preview_signal_num == OVERLAY_SIGNAL_NUM then + if t < state.overlay_transition_end then -- Fade in progress. return {} end - if overlay_enabled then + if state.overlay_enabled then return {"Overlay off", "", "Fade ovl out"} else return {"Overlay on", "", "Fade ovl in"} @@ -567,20 +569,20 @@ function get_transitions(t) return {"Cut"} end - if live_signal_num == preview_signal_num then + if state.live_signal_num == state.preview_signal_num then -- No transitions possible. return {} end - if (is_plain_signal(live_signal_num) or live_signal_num == STATIC_SIGNAL_NUM) and - (is_plain_signal(preview_signal_num) or preview_signal_num == STATIC_SIGNAL_NUM) then + if (is_plain_signal(state.live_signal_num) or state.live_signal_num == STATIC_SIGNAL_NUM) and + (is_plain_signal(state.preview_signal_num) or state.preview_signal_num == STATIC_SIGNAL_NUM) then return {"Cut", "", "Fade"} end -- Various zooms. - if live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(preview_signal_num) then + if state.live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(state.preview_signal_num) then return {"Cut", "Zoom in"} - elseif is_sbs_participating_signal(live_signal_num) and preview_signal_num == SBS_SIGNAL_NUM then + elseif is_sbs_participating_signal(state.live_signal_num) and state.preview_signal_num == SBS_SIGNAL_NUM then return {"Cut", "Zoom out"} end @@ -588,49 +590,49 @@ function get_transitions(t) end function swap_preview_live() - local temp = live_signal_num - live_signal_num = preview_signal_num - preview_signal_num = temp + local temp = state.live_signal_num + state.live_signal_num = state.preview_signal_num + state.preview_signal_num = temp end function start_transition(type_, t, duration) - transition_start = t - transition_end = t + duration - transition_type = type_ - transition_src_signal = live_signal_num - transition_dst_signal = preview_signal_num + state.transition_start = t + state.transition_end = t + duration + state.transition_type = type_ + state.transition_src_signal = state.live_signal_num + state.transition_dst_signal = state.preview_signal_num swap_preview_live() end -- API ENTRY POINT -- Called when the user clicks a transition button. function transition_clicked(num, t) - if preview_signal_num == OVERLAY_SIGNAL_NUM then + if state.preview_signal_num == OVERLAY_SIGNAL_NUM then if num == 0 then -- Cut. - overlay_transition_start = -2.0 - overlay_transition_end = -1.0 - if overlay_enabled then - overlay_enabled = false - overlay_alpha_src = 0.0 - overlay_alpha_dst = 0.0 + state.overlay_transition_start = -2.0 + state.overlay_transition_end = -1.0 + if state.overlay_enabled then + state.overlay_enabled = false + state.overlay_alpha_src = 0.0 + state.overlay_alpha_dst = 0.0 else - overlay_enabled = true - overlay_alpha_src = 1.0 - overlay_alpha_dst = 1.0 + state.overlay_enabled = true + state.overlay_alpha_src = 1.0 + state.overlay_alpha_dst = 1.0 end elseif num == 2 then -- Fade. - overlay_transition_start = t - overlay_transition_end = t + 1.0 - if overlay_enabled then - overlay_alpha_src = 1.0 - overlay_alpha_dst = 0.0 + state.overlay_transition_start = t + state.overlay_transition_end = t + 1.0 + if state.overlay_enabled then + state.overlay_alpha_src = 1.0 + state.overlay_alpha_dst = 0.0 else - overlay_alpha_src = 0.0 - overlay_alpha_dst = 1.0 + state.overlay_alpha_src = 0.0 + state.overlay_alpha_dst = 1.0 end - overlay_enabled = true + state.overlay_enabled = true end return end @@ -639,7 +641,7 @@ function transition_clicked(num, t) -- Cut. if in_transition(t) then -- Ongoing transition; finish it immediately before the cut. - finish_transitions(transition_end) + finish_transitions(state.transition_end) end swap_preview_live() @@ -647,31 +649,31 @@ function transition_clicked(num, t) -- Zoom. finish_transitions(t) - if live_signal_num == preview_signal_num then + if state.live_signal_num == state.preview_signal_num then -- Nothing to do. return end - if is_plain_signal(live_signal_num) and is_plain_signal(preview_signal_num) then + if is_plain_signal(state.live_signal_num) and is_plain_signal(state.preview_signal_num) then -- We can't zoom between these. Just make a cut. - io.write("Cutting from " .. live_signal_num .. " to " .. live_signal_num .. "\n") + io.write("Cutting from " .. state.live_signal_num .. " to " .. state.live_signal_num .. "\n") swap_preview_live() return end - if (live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(preview_signal_num)) or - (preview_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(live_signal_num)) then + if (state.live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(state.preview_signal_num)) or + (state.preview_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(state.live_signal_num)) then start_transition(ZOOM_TRANSITION, t, 1.0) end elseif num == 2 then finish_transitions(t) -- Fade. - if (live_signal_num ~= preview_signal_num) and - (is_plain_signal(live_signal_num) or - live_signal_num == STATIC_SIGNAL_NUM) and - (is_plain_signal(preview_signal_num) or - preview_signal_num == STATIC_SIGNAL_NUM) then + if (state.live_signal_num ~= state.preview_signal_num) and + (is_plain_signal(state.live_signal_num) or + state.live_signal_num == STATIC_SIGNAL_NUM) and + (is_plain_signal(state.preview_signal_num) or + state.preview_signal_num == STATIC_SIGNAL_NUM) then start_transition(FADE_TRANSITION, t, 1.0) else -- Fades involving SBS are ignored (we have no chain for it). @@ -681,55 +683,55 @@ end -- API ENTRY POINT function channel_clicked(num) - preview_signal_num = num + state.preview_signal_num = num end -function get_fade_chain(signals, t, width, height, input_resolution) - local input0_type = get_input_type(signals, transition_src_signal) - local input0_scale = needs_scale(signals, transition_src_signal, width, height) - local input1_type = get_input_type(signals, transition_dst_signal) - local input1_scale = needs_scale(signals, transition_dst_signal, width, height) - local chain = fade_chains[input0_type][input0_scale][input1_type][input1_scale][overlay_enabled][true] +function get_fade_chain(state, signals, t, width, height, input_resolution) + local input0_type = get_input_type(signals, state.transition_src_signal) + local input0_scale = needs_scale(signals, state.transition_src_signal, width, height) + local input1_type = get_input_type(signals, state.transition_dst_signal) + local input1_scale = needs_scale(signals, state.transition_dst_signal, width, height) + local chain = fade_chains[input0_type][input0_scale][input1_type][input1_scale][state.overlay_enabled][true] local prepare = function() if input0_type == "live" or input0_type == "livedeint" then - chain.input0.input:connect_signal(transition_src_signal) + chain.input0.input:connect_signal(state.transition_src_signal) end if input0_type ~= "static" then - set_neutral_color_from_signal(chain.input0.wb_effect, transition_src_signal) + set_neutral_color_from_signal(state, chain.input0.wb_effect, state.transition_src_signal) end set_scale_parameters_if_needed(chain.input0, width, height) if input1_type == "live" or input1_type == "livedeint" then - chain.input1.input:connect_signal(transition_dst_signal) + chain.input1.input:connect_signal(state.transition_dst_signal) end if input1_type ~= "static" then - set_neutral_color_from_signal(chain.input1.wb_effect, transition_dst_signal) + set_neutral_color_from_signal(state, chain.input1.wb_effect, state.transition_dst_signal) end set_scale_parameters_if_needed(chain.input1, width, height) - local tt = calc_fade_progress(t, transition_start, transition_end) + local tt = calc_fade_progress(t, state.transition_start, state.transition_end) chain.mix_effect:set_float("strength_first", 1.0 - tt) chain.mix_effect:set_float("strength_second", tt) -- The commentator output has no overlay on it. local extra_alpha_factor = 1.0 - if not simple_signal_has_overlay(transition_src_signal) and - not simple_signal_has_overlay(transition_dst_signal) then + if not simple_signal_has_overlay(state.transition_src_signal) and + not simple_signal_has_overlay(state.transition_dst_signal) then extra_alpha_factor = 0.0 - elseif not simple_signal_has_overlay(transition_src_signal) then + elseif not simple_signal_has_overlay(state.transition_src_signal) then extra_alpha_factor = tt - elseif not simple_signal_has_overlay(transition_dst_signal) then + elseif not simple_signal_has_overlay(state.transition_dst_signal) then extra_alpha_factor = 1.0 - tt end - prepare_overlay_live(chain, t, extra_alpha_factor) + prepare_overlay_live(state, chain, t, extra_alpha_factor) end return chain.chain, prepare end -- SBS code (live_signal_num == SBS_SIGNAL_NUM, or in a transition to/from it). -function get_sbs_chain(signals, t, width, height, input_resolution) +function get_sbs_chain(state, signals) local input0_type = get_input_type(signals, INPUT0_SIGNAL_NUM) local input1_type = get_input_type(signals, INPUT4_SIGNAL_NUM) - return sbs_chains[input0_type][overlay_enabled][input1_type][true] + return sbs_chains[input0_type][state.overlay_enabled][input1_type][true] end local last_rate = 0.0 @@ -786,11 +788,21 @@ function get_chain(num, t, width, height, signals) end last_resolution = input_resolution + -- Make a (semi-shallow) copy of the current state, so that the returned prepare function + -- is unaffected by state changes made by the UI before it is rendered. + local state_copy = {} + for key, value in pairs(state) do + state_copy[key] = value + end + for key, value in pairs(state.neutral_colors) do + state_copy.neutral_colors[key] = value + end + -- Save some CPU time if we're not having SBS on live. local new_rate - if live_signal_num == SBS_SIGNAL_NUM or - preview_signal_num == SBS_SIGNAL_NUM or - transition_type == ZOOM_TRANSITION then + if state.live_signal_num == SBS_SIGNAL_NUM or + state.preview_signal_num == SBS_SIGNAL_NUM or + state.transition_type == ZOOM_TRANSITION then new_rate = 1.0 else new_rate = 0.0001 @@ -804,42 +816,42 @@ function get_chain(num, t, width, height, signals) if num == 0 then -- Live. -- See if we're in a transition. finish_transitions(t) - if transition_type == ZOOM_TRANSITION then + if state.transition_type == ZOOM_TRANSITION then -- Transition in or out of SBS. - local chain = get_sbs_chain(signals, t, width, height, input_resolution) + local chain = get_sbs_chain(state_copy, signals) local prepare = function() - prepare_sbs_chain(chain, calc_zoom_progress(t), transition_type, transition_src_signal, transition_dst_signal, width, height, input_resolution) - prepare_overlay_live(chain, t, 1.0) + prepare_sbs_chain(state_copy, chain, calc_zoom_progress(t), state_copy.transition_type, state_copy.transition_src_signal, state.transition_dst_signal, width, height, input_resolution) + prepare_overlay_live(state_copy, chain, t, 1.0) end return chain.chain, prepare - elseif transition_type == NO_TRANSITION and live_signal_num == SBS_SIGNAL_NUM then + elseif state.transition_type == NO_TRANSITION and state.live_signal_num == SBS_SIGNAL_NUM then -- Static SBS view. - local chain = get_sbs_chain(signals, t, width, height, input_resolution) + local chain = get_sbs_chain(state_copy, signals) local prepare = function() - prepare_sbs_chain(chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) - prepare_overlay_live(chain, t, 1.0) + prepare_sbs_chain(state_copy, chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) + prepare_overlay_live(state_copy, chain, t, 1.0) end return chain.chain, prepare - elseif transition_type == FADE_TRANSITION then - return get_fade_chain(signals, t, width, height, input_resolution) - elseif is_plain_signal(live_signal_num) then - local input_type = get_input_type(signals, live_signal_num) - local input_scale = needs_scale(signals, live_signal_num, width, height) - local overlay_really_enabled = overlay_enabled and simple_signal_has_overlay(live_signal_num) + elseif state.transition_type == FADE_TRANSITION then + return get_fade_chain(state_copy, signals, t, width, height, input_resolution) + elseif is_plain_signal(state.live_signal_num) then + local input_type = get_input_type(signals, state.live_signal_num) + local input_scale = needs_scale(signals, state.live_signal_num, width, height) + local overlay_really_enabled = state_copy.overlay_enabled and simple_signal_has_overlay(state.live_signal_num) local chain = simple_chains[input_type][input_scale][overlay_really_enabled][true] local prepare = function() if input_type ~= "video" then - chain.input:connect_signal(live_signal_num) + chain.input:connect_signal(state.live_signal_num) end - set_neutral_color_from_signal(chain.wb_effect, live_signal_num) + set_neutral_color_from_signal(state_copy, chain.wb_effect, state.live_signal_num) set_scale_parameters_if_needed(chain, width, height) - prepare_overlay_live(chain, t, 1.0) + prepare_overlay_live(state_copy, chain, t, 1.0) end return chain.chain, prepare - elseif live_signal_num == STATIC_SIGNAL_NUM then -- Static picture. + elseif state.live_signal_num == STATIC_SIGNAL_NUM then -- Static picture. local chain = static_chains[true] local prepare = function() - prepare_overlay_live(chain, t, 1.0) -- FIXME: Should this ever be here? + prepare_overlay_live(state_copy, chain, t, 1.0) -- FIXME: Should this ever be here? end return chain.chain, prepare else @@ -851,16 +863,16 @@ function get_chain(num, t, width, height, signals) -- The M/E preview matches what we'd put live by doing a transition, as always. local show_overlay = false if num == 1 then -- Preview. - if preview_signal_num == OVERLAY_SIGNAL_NUM then - num = live_signal_num + 2 - show_overlay = not overlay_enabled + if state.preview_signal_num == OVERLAY_SIGNAL_NUM then + num = state.live_signal_num + 2 + show_overlay = not state.overlay_enabled - if transition_type ~= NO_TRANSITION then - num = transition_dst_signal + 2 + if state.transition_type ~= NO_TRANSITION then + num = state.transition_dst_signal + 2 end else - num = preview_signal_num + 2 - show_overlay = overlay_enabled and simple_signal_has_overlay(preview_signal_num) + num = state.preview_signal_num + 2 + show_overlay = state.overlay_enabled and simple_signal_has_overlay(state.preview_signal_num) end end @@ -874,7 +886,7 @@ function get_chain(num, t, width, height, signals) if input_type ~= "video" then chain.input:connect_signal(signal_num) end - set_neutral_color(chain.wb_effect, neutral_colors[signal_num + 1]) + set_neutral_color(chain.wb_effect, state_copy.neutral_colors[signal_num + 1]) set_scale_parameters_if_needed(chain, width, height) prepare_overlay_static(chain, t) end @@ -885,7 +897,7 @@ function get_chain(num, t, width, height, signals) local input1_type = get_input_type(signals, INPUT4_SIGNAL_NUM) local chain = sbs_chains[input0_type][show_overlay][input1_type][false] local prepare = function() - prepare_sbs_chain(chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) + prepare_sbs_chain(state_copy, chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) end return chain.chain, prepare end @@ -933,11 +945,11 @@ function pos_from_top_left(x, y, width, height, screen_width, screen_height) } end -function prepare_sbs_chain(chain, t, transition_type, src_signal, dst_signal, screen_width, screen_height, input_resolution) +function prepare_sbs_chain(state, chain, t, transition_type, src_signal, dst_signal, screen_width, screen_height, input_resolution) chain.input0.input:connect_signal(0) chain.input1.input:connect_signal(4) - set_neutral_color(chain.input0.wb_effect, neutral_colors[1]) - set_neutral_color(chain.input1.wb_effect, neutral_colors[5]) + set_neutral_color(chain.input0.wb_effect, state.neutral_colors[1]) + set_neutral_color(chain.input1.wb_effect, state.neutral_colors[5]) -- Both inputs are the same size (true side-by-side). local pos0 = pos_from_top_left(1280 - 616 - 16, 186, 616, 347, screen_width, screen_height) @@ -1084,14 +1096,14 @@ function place_rectangle(resample_effect, resize_effect, padding_effect, x0, y0, end end -function prepare_overlay_live(chain, t, extra_alpha_factor) +function prepare_overlay_live(state, chain, t, extra_alpha_factor) if chain.overlay then - local tt = calc_fade_progress(t, overlay_transition_start, overlay_transition_end) - local overlay_alpha = overlay_alpha_src + tt * (overlay_alpha_dst - overlay_alpha_src) + local tt = calc_fade_progress(t, state.overlay_transition_start, state.overlay_transition_end) + local overlay_alpha = state.overlay_alpha_src + tt * (state.overlay_alpha_dst - state.overlay_alpha_src) overlay_alpha = overlay_alpha * extra_alpha_factor - --print("overlay_alpha=" .. overlay_alpha .. " [" .. overlay_alpha_src .. "," .. overlay_alpha_dst .. "]@" .. tt) - if t > overlay_transition_end and overlay_alpha_dst == 0.0 then - overlay_enabled = false -- Takes effect next frame. + --print("overlay_alpha=" .. overlay_alpha .. " [" .. state.overlay_alpha_src .. "," .. state.overlay_alpha_dst .. "]@" .. tt) + if t > state.overlay_transition_end and state.overlay_alpha_dst == 0.0 then + state.overlay_enabled = false -- Takes effect next frame. -- print("Turning off overlay") end chain.overlay.multiply_effect:set_vec4("factor", overlay_alpha, overlay_alpha, overlay_alpha, overlay_alpha) @@ -1108,19 +1120,19 @@ function set_neutral_color(effect, color) effect:set_vec3("neutral_color", color[1], color[2], color[3]) end -function set_neutral_color_from_signal(effect, signal) +function set_neutral_color_from_signal(state, effect, signal) if is_plain_signal(signal) then - set_neutral_color(effect, neutral_colors[signal - INPUT0_SIGNAL_NUM + 1]) + set_neutral_color(effect, state.neutral_colors[signal - INPUT0_SIGNAL_NUM + 1]) end end function calc_zoom_progress(t) - if t < transition_start then + if t < state.transition_start then return 0.0 - elseif t > transition_end then + elseif t > state.transition_end then return 1.0 else - local tt = (t - transition_start) / (transition_end - transition_start) + local tt = (t - state.transition_start) / (state.transition_end - state.transition_start) -- Smooth it a bit. return math.sin(tt * 3.14159265358 * 0.5) end