FUG-110: FX blending — dual FX decks + crossfade, Show Mode, device surface - #82
Open
issuefleet[bot] wants to merge 7 commits into
Open
FUG-110: FX blending — dual FX decks + crossfade, Show Mode, device surface#82issuefleet[bot] wants to merge 7 commits into
issuefleet[bot] wants to merge 7 commits into
Conversation
Add the wire contract for running two effect decks concurrently and
blending between them:
- SubmitEffect/SetEffect/SetUniforms/GetEffectUniforms gain a uint32
deck field (0=A default/legacy, 1=B), so the app can cue two effects.
- New SetCrossfade{position, mode} global (like SetBrightness): position
0..1 blends deck A->B, mode 0=linear RGB / 1=linear HSV. Echoed in
Welcome for parity. deck represented as uint32 (not a proto enum) to
match SetTexture.format and dodge the enum-JSON-name pitfall the proto
header warns about.
- Regenerated web/src/gen protobuf bindings; added the flat effect-arm
shapes + set_crossfade arm in web/src/net/proto.ts; new client methods
setCrossfade() + deck params on the effect methods.
Firmware micropb types regenerate from the proto at build time; the new
fields are all scalar (no capacity-table changes).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Run two effect programs concurrently and blend their per-LED output: - ffi.rs: per-deck state (bytes/len/vm/active) is now a [_; 2] array; the 24 KB fx arena splits into two 12 KB halves so total static RAM stays flat (no new TLS heap pressure, FUG-71). New deck-aware FFI (lm_fx_load_deck / clear / set_active / set_uniform_deck / deck_active / any_active) with the bare lm_fx_* kept as deck-A wrappers. The topology graph now binds to both decks' VMs. Effect arms read the deck field (submit=4, set/uniforms/get=2). - lm_fx_update runs update() for every active deck; lm_fx_shade_blended shades the active decks and blends via fx_vm::blend_rgb8, short- circuiting a fully-faded-out deck at the endpoints. Perf/Tier-1 attribution tracks deck A. - fx_vm::blend_rgb8: pure, unit-tested blend — mode 0 linear RGB per- channel lerp, mode 1 linear HSV (shortest-hue path); exact at t=0/1. - Session core stores crossfade position+mode+gen like brightness (set_crossfade -> welcome), exposed via lm_crossfade_*; main.cpp polls it and feeds lm_fx_shade_blended in the render loop. - Persistence resumes only the deck-A effect on boot (crossfade resets to 0 -> deck A visible), gated by lm_fx_frame_deck. esp32c6 image builds -c opt; all firmware tests green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
- New per-device sent-effect store (web/src/store/deviceEffects.ts, localStorage keyed by device id): tracks which library effects the app has pushed to each device. - Editor 'Send to device' now records the effect on the connected device. - Effects browser shows a green 'on device' badge on any library effect present on the connected device, plus an ephemeral 'On <device>' section listing them (most-recently-cued first). Repaints live on connection / on-device-set changes; deleting an effect forgets it everywhere. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
New /show workspace to run a two-deck crossfade show: - Left/right FX deck cards (cue an effect -> compile -> submit_effect on deck A/B), a crossfade fader, an RGB/HSV blend-mode toggle, per-deck play/pause (set_effect id/""), and a focusable effect list to pick what to cue. Reached from the Effects tab ... menu. - Every transport control is MIDI-mappable: new show-action binding layer in midiStore (crossfade, blend-mode, per-deck play/pause, list prev/next, cue A/B) + a pure resolver (midi/showRouter.ts). A learn sheet binds a control per action; the screen routes hardware MIDI into the transport (fader -> value, buttons -> rising-edge triggers). - Cueing marks the effect on the connected device (green badge + On-device section update live). Tests: showRouter (resolve/kind/coverage), deviceEffects store, midiStore show bindings, and proto round-trips for set_crossfade + the deck selector on the effect arms. All 62 web unit tests pass; full app typechecks. showMode.ts joins the browser-only bundle-entry exclude list (it statically imports the worker compiler, like effectEditor/acidMode). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Show-Mode play/pause sends set_effect("", deck) to pause and
set_effect(id, deck) to resume. Clearing the deck dropped the VM so
resume had nothing to re-activate; parking (set inactive, keep the loaded
effect + VM state) makes pause/resume round-trip. A parked deck isn't
drawn, so a legacy set_effect("off") still falls back to the built-in
idle. Adds the FUG-110 WORKLOG handoff entry.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
|
…-fx-blending # Conflicts: # WORKLOG.md
…-fx-blending # Conflicts: # web/src/net/client.ts # web/src/ui/screens/effectEditor.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
FUG-110: FX blending
Run two FX programs at once and crossfade between them, with a Show-Mode workspace to drive it live.
Protocol (
shared/protocol/proto/ledmapper.proto)SubmitEffect/SetEffect/SetUniforms/GetEffectUniformsgain auint32 deck(0 = A default/legacy, 1 = B);EffectUniformsechoes it.SetCrossfade{double position, uint32 mode}global (arm 32), echoed inWelcome(crossfade+crossfade_mode), handled in the session core likeset_brightness.deck/modeareuint32(not proto enums) to matchSetTexture.formatand avoid the enum-JSON-name pitfall the proto header warns about. TS bindings regenerated; firmware micropb types regen at build (all new fields scalar — no capacity-table changes).Firmware
firmware/player_app/ffi.rs: per-deck state is now a[_; 2]array, and the single 24 KB fx arena splits into two 12 KB halves so total static RAM stays flat (no new TLS heap pressure, FUG-71). Deck-aware FFI (lm_fx_*_deck); the barelm_fx_*stay as deck-A wrappers for backward compat. The topology graph binds to both decks.lm_fx_updateadvances every active deck;lm_fx_shade_blendedshades the active decks per-LED and blends via a new pure, unit-testedfx_vm::blend_rgb8— mode 0 = linear-RGB per-channel lerp, mode 1 = linear-HSV (shortest-hue path); exact at the crossfade endpoints, and it short-circuits a fully-faded-out deck so a single-deck show pays no second-deck cost.main.cpppolls it and feeds the render loop. Boot-resume persists deck A only (crossfade resets to 0 on reboot → deck A is the visible deck), gated bylm_fx_frame_deck.set_effect("", deck)parks a deck (keeps it cued, stops rendering) so Show-Mode play/pause round-trips; a parked deck falls back to the built-in idle exactly as a legacyset_effect("off")did.bazel build -c opt //firmware/player_app:esp32c6+ all firmware tests green.Web
store/deviceEffects.ts) record of which library effects the app has pushed. The effects browser shows a green "on device" badge and an ephemeral "On " section (label uses the device name; keyed by the stable device id for robustness). Editor "Send to device" + Show-Mode cue record it live./show, from the Effects ⋯ menu): left/right FX deck cards (cue → compile →submit_effecton a deck), a crossfade fader, an RGB/HSV blend-mode toggle, per-deck play/pause, and a focusable effect list.midiStoregains a show-action binding layer;midi/showRouter.tsis the pure resolver; a learn sheet binds a control per action. Actions: crossfade (fader), blend-mode, per-deck play/pause, effect-list prev/next, cue A/B (fader → value, buttons → rising-edge triggers).//web:unit_tests62/62 (incl. new showRouter / deviceEffects / midiStore-show / proto crossfade+deck tests); full app typechecks;//web:distbundles clean.Design notes / possible follow-ups
.fxbbytes to a deck — the device holds only the two live decks in RAM, not a browsable flash store, which is why the "on device" surface is app-side per-device tracking.🤖 Generated with Claude Code
Closes-Linear: FUG-110 (https://linear.app/fughilli/issue/FUG-110/feature-fx-blending)