daniel-c-harvey
14f3af41e4
Adds CoerceTheaterMode() to WaveformVisualizerControlState; ToggleLava/ToggleWaveform call it before NotifyChanged so all observers see consistent state in one Changed cycle. Covers the dead-end escape route bug (Phase 20 review finding).
288 lines
16 KiB
Plaintext
288 lines
16 KiB
Plaintext
@namespace DeepDrftPublic.Client.Controls
|
|
@using DeepDrftShared.Client.Common
|
|
@using DeepDrftPublic.Client.Services
|
|
@inject WaveformVisualizerControlState ControlState
|
|
|
|
@* The waveform visualizer control PANEL (Phase 12 §3d-revised → Phase 15 re-layout → Phase 15 polish).
|
|
The control deck for the lava-lamp visualizer: a deterministic THREE-ROW, sectioned layout that encodes
|
|
what the visualizer composes — a LAVA field and a WAVEFORM ribbon, each independently toggleable (§3):
|
|
|
|
Row 1 (MODE, always): lava lamp-toggle, waveform toggle (new waveform glyph), [collisions knob — only
|
|
when BOTH on], then the color knob pinned far-right (applies to the whole field, always visible).
|
|
Row 2 (LAVA, only when lava on): "LAVA:" label + gravity / heat / fluid-amount / fluid-viscosity.
|
|
Row 3 (WAVE, only when waveform on): "WAVE:" label + scroll RadialKnob + width RadialKnob (far-right).
|
|
|
|
The two toggles have STRONG ACTIVE-STATE styling: when ON the toggle chip has a green-accent background
|
|
(unmistakably active); when OFF it is muted/dim. The lava toggle keeps the lava-lamp glyph; the waveform
|
|
toggle uses a new distinct waveform-bars glyph (DDIcons.Waveform / WaveformFilled). Green = interactive
|
|
(§5 colour principle); light = non-interactive. All colours are token-sourced — no hardcoded hex.
|
|
|
|
This is the PANEL CONTENT hosted inside WaveformVisualizerControlPopover, now a screen-centered tinted
|
|
MudOverlay (Phase 15 §4). Because the overlay PORTALS its content out of this component's DOM subtree,
|
|
Blazor CSS isolation does not reach the rendered panel — so panel chrome AND the row/section layout live
|
|
in the GLOBAL deepdrft-styles.css (.waveform-visualizer-control-panel*), not the scoped .razor.css. The
|
|
scoped .razor.css carries only the legacy inline-bar fallback (Mix's old non-portaled mount), which may
|
|
now be dead post-Phase-12 but is left in place — flagged, not cut (out of Phase 15 scope).
|
|
|
|
It owns NO JS interop: it mutates the shared, session-scoped WaveformVisualizerControlState and raises
|
|
its Changed event. The visualizer bridge (WaveformVisualizer) subscribes and pushes the affected dial /
|
|
subsystem-enable to the WebGL module. RadialKnob has no icon slot (its Label renders as SVG text) and no
|
|
aria capture, so each control's Material icon rides beside its knob as a caption and the accessible name
|
|
rides on the wrapping group div (§7); the playful MudTooltip rides alongside for sighted hover. *@
|
|
|
|
<div class="@($"{_panelChromeClass} mix-visualizer-controls-bar".TrimStart())">
|
|
|
|
@if (Visible)
|
|
{
|
|
<MudGrid>
|
|
@* ── Row 1 — MODE (always visible). ── *@
|
|
<MudItem xs="2" Class="d-flex align-center">
|
|
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.FlexStart">
|
|
<span class="wvc-section-label">MODE:</span>
|
|
</MudStack>
|
|
</MudItem>
|
|
|
|
<MudItem xs="10">
|
|
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.Center" Class="mx-auto" Spacing="4">
|
|
<MudTooltip Text="Show the sound, or hide the ribbon.">
|
|
<div class="wvc-toggle @(ControlState.WaveformEnabled ? "wvc-toggle-on" : "wvc-toggle-off")" role="group" aria-label="Waveform ribbon on or off">
|
|
<MudIconButton Icon="@(ControlState.WaveformEnabled ? DDIcons.WaveformFilled : DDIcons.Waveform)"
|
|
Color="Color.Primary"
|
|
OnClick="@ToggleWaveform"
|
|
aria-label="Waveform ribbon on or off"
|
|
aria-pressed="@ControlState.WaveformEnabled"/>
|
|
</div>
|
|
</MudTooltip>
|
|
|
|
@* Collisions are the interaction BETWEEN the two subsystems — meaningless with only one
|
|
present, so visible only when BOTH are on (§3 truth table). *@
|
|
@if (ControlState.LavaEnabled && ControlState.WaveformEnabled)
|
|
{
|
|
<MudTooltip Text="How hard the blobs body-check the beat.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Collision strength">
|
|
<RadialKnob Value="@ControlState.CollisionStrength"
|
|
ValueChanged="@OnCollisionStrengthChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.Compress"
|
|
Size="Size.Small"
|
|
Color="Color.Primary"
|
|
Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
}
|
|
|
|
@if (ControlState.LavaEnabled && ControlState.WaveformEnabled)
|
|
{
|
|
<MudTooltip Text="How fast the lamp drifts through its colors.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Color gradient rotation speed">
|
|
<RadialKnob Value="@ControlState.GradientRotationSpeed"
|
|
ValueChanged="@OnGradientRotationSpeedChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.Palette" Size="Size.Small" Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
}
|
|
|
|
<MudTooltip Text="Light the lamp — or let it go cold.">
|
|
<div class="wvc-toggle @(ControlState.LavaEnabled ? "wvc-toggle-on" : "wvc-toggle-off")" role="group" aria-label="Lava field on or off">
|
|
<MudIconButton Icon="@(ControlState.LavaEnabled ? DDIcons.LavaLampFilled : DDIcons.LavaLamp)"
|
|
Color="Color.Primary"
|
|
OnClick="@ToggleLava"
|
|
aria-label="Lava field on or off"
|
|
aria-pressed="@ControlState.LavaEnabled"/>
|
|
</div>
|
|
</MudTooltip>
|
|
</MudStack>
|
|
</MudItem>
|
|
|
|
@* ── Row 2 — WAVE section (only when waveform on). ── *@
|
|
@if (ControlState.WaveformEnabled)
|
|
{
|
|
<MudItem xs="2" Class="d-flex align-center">
|
|
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.FlexStart">
|
|
<span class="wvc-section-label">WAVE:</span>
|
|
</MudStack>
|
|
</MudItem>
|
|
|
|
<MudItem xs="10">
|
|
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.Center" Class="mx-auto" Spacing="4">
|
|
<MudTooltip Text="How fast the sound rolls by.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Waveform scroll speed">
|
|
<RadialKnob Value="@ControlState.ScrollSpeed"
|
|
ValueChanged="@OnScrollSpeedChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.Speed" Size="Size.Small" Color="Color.Surface" Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
|
|
<MudTooltip Text="How wide the ribbon spreads across the lamp.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Waveform width">
|
|
<RadialKnob Value="@ControlState.WaveformWidth"
|
|
ValueChanged="@OnWaveformWidthChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.SettingsEthernet" Size="Size.Small" Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
</MudStack>
|
|
</MudItem>
|
|
}
|
|
|
|
@if (ControlState.LavaEnabled)
|
|
{
|
|
<MudItem xs="2" Class="d-flex align-center">
|
|
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.FlexStart">
|
|
<span class="wvc-section-label">LAVA:</span>
|
|
</MudStack>
|
|
</MudItem>
|
|
|
|
<MudItem xs="10" Class="d-flex align-center">
|
|
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.Center" Class="mx-auto" Spacing="4">
|
|
<MudTooltip Text="How heavy the wax feels — float, or sink.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Lava gravity">
|
|
<RadialKnob Value="@ControlState.LavaGravity"
|
|
ValueChanged="@OnLavaGravityChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.ArrowDownward" Size="Size.Small" Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
|
|
<MudTooltip Text="Crank the burner. More heat, more rolling boil.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Lava heat">
|
|
<RadialKnob Value="@ControlState.LavaHeat"
|
|
ValueChanged="@OnLavaHeatChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.LocalFireDepartment" Size="Size.Small" Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
|
|
<MudTooltip Text="How much wax is in the lamp.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Fluid amount">
|
|
<RadialKnob Value="@ControlState.FluidAmount"
|
|
ValueChanged="@OnFluidAmountChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.BubbleChart" Size="Size.Small" Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
|
|
<MudTooltip Text="Runny and gooey, or tight little globes.">
|
|
<div class="waveform-visualizer-control mix-visualizer-control" role="group" aria-label="Fluid viscosity">
|
|
<RadialKnob Value="@ControlState.FluidViscosity"
|
|
ValueChanged="@OnFluidViscosityChanged"
|
|
Min="0" Max="1" Step="0.001"
|
|
Size="64"
|
|
Color="Color.Primary"/>
|
|
<MudIcon Icon="@Icons.Material.Filled.Opacity" Size="Size.Small" Class="waveform-visualizer-control-icon mix-visualizer-control-icon"/>
|
|
</div>
|
|
</MudTooltip>
|
|
</MudStack>
|
|
</MudItem>
|
|
}
|
|
</MudGrid>
|
|
}
|
|
|
|
</div>
|
|
|
|
@code {
|
|
/// <summary>
|
|
/// Whether the control deck is shown. The overlay host shows the panel whenever it is open, so the
|
|
/// default is <c>true</c>. Mix's legacy inline mount (if it survives) still feeds its lava-lamp toggle
|
|
/// into this — that mount always renders the component, and THIS component decides deck visibility
|
|
/// (Phase 10 §4): when false the rows are @if-gated out but the container holds its reserved height
|
|
/// (CSS min-height) so content below the inline bar never pops. Inside the overlay the host owns
|
|
/// open/closed, so the default keeps the panel populated.
|
|
/// </summary>
|
|
[Parameter] public bool Visible { get; set; } = true;
|
|
|
|
/// <summary>
|
|
/// When <c>true</c>, applies the <c>waveform-visualizer-control-panel</c> class to the root element,
|
|
/// enabling the global panel-chrome rules (NowPlayingCard chrome — square corners, lighter-navy
|
|
/// ground, thin light border — plus the row/section layout and pinned palette tokens). Set by
|
|
/// <see cref="WaveformVisualizerControlPopover"/>; Mix's inline mount leaves this <c>false</c> so the
|
|
/// chrome never leaks onto the inline bar.
|
|
/// </summary>
|
|
[Parameter] public bool PanelChrome { get; set; } = false;
|
|
|
|
private string _panelChromeClass => PanelChrome ? "waveform-visualizer-control-panel" : string.Empty;
|
|
|
|
// Each handler mutates its own dedicated property then raises Changed — the bridge re-reads and pushes
|
|
// the affected dial / subsystem-enable. All dial values are already normalized [0,1]; the bridge maps
|
|
// scroll speed to a visible time-span and routes the rest straight to the lava/colour dials. The two
|
|
// toggles flip a boolean (no value), driving the genuine per-subsystem draw-skip in the module (§6).
|
|
|
|
private void ToggleLava()
|
|
{
|
|
ControlState.LavaEnabled = !ControlState.LavaEnabled;
|
|
ControlState.CoerceTheaterMode();
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void ToggleWaveform()
|
|
{
|
|
ControlState.WaveformEnabled = !ControlState.WaveformEnabled;
|
|
ControlState.CoerceTheaterMode();
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnScrollSpeedChanged(double value)
|
|
{
|
|
ControlState.ScrollSpeed = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnGradientRotationSpeedChanged(double value)
|
|
{
|
|
ControlState.GradientRotationSpeed = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnLavaGravityChanged(double value)
|
|
{
|
|
ControlState.LavaGravity = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnLavaHeatChanged(double value)
|
|
{
|
|
ControlState.LavaHeat = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnFluidAmountChanged(double value)
|
|
{
|
|
ControlState.FluidAmount = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnFluidViscosityChanged(double value)
|
|
{
|
|
ControlState.FluidViscosity = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnCollisionStrengthChanged(double value)
|
|
{
|
|
ControlState.CollisionStrength = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
|
|
private void OnWaveformWidthChanged(double value)
|
|
{
|
|
ControlState.WaveformWidth = value;
|
|
ControlState.NotifyChanged();
|
|
}
|
|
}
|