Rescaler in place for many depth-like knobs (#64)

baconpaul · Jan 2, 2025 · ec08ccc · ec08ccc
1 parent 18c4ca5
commit ec08ccc
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 30 deletions.
diff --git a/libs/sst/sst-jucegui b/libs/sst/sst-jucegui
diff --git a/src/ui/finetune-sub-panel.cpp b/src/ui/finetune-sub-panel.cpp
@@ -28,13 +28,13 @@ FineTuneSubPanel::FineTuneSubPanel(SixSinesEditor &e) : HasEditor(e)
     depTitle->setText("Tune");
     addAndMakeVisible(*depTitle);
 
-    createComponent(editor, *this, on.envDepth, envDepth, envDepthD);
+    createRescaledComponent(editor, *this, on.envDepth, envDepth, envDepthDA);
     addAndMakeVisible(*envDepth);
     envDepthLL = std::make_unique<jcmp::Label>();
     envDepthLL->setText(std::string() + "Env " + u8"\U00002192");
     addAndMakeVisible(*envDepthLL);
 
-    createComponent(editor, *this, on.lfoDepth, lfoDep, lfoDepD);
+    createRescaledComponent(editor, *this, on.lfoDepth, lfoDep, lfoDepDA);
     addAndMakeVisible(*lfoDep);
     lfoDepL = std::make_unique<jcmp::Label>();
     lfoDepL->setText(std::string() + "LFO " + u8"\U00002192");

diff --git a/src/ui/finetune-sub-panel.h b/src/ui/finetune-sub-panel.h
@@ -37,11 +37,11 @@ struct FineTuneSubPanel : juce::Component,
     void beginEdit() {}
 
     std::unique_ptr<jcmp::Knob> envDepth;
-    std::unique_ptr<PatchContinuous> envDepthD;
+    std::unique_ptr<PatchContinuous::cubic_t> envDepthDA;
     std::unique_ptr<jcmp::Label> envDepthLL;
 
     std::unique_ptr<jcmp::Knob> lfoDep;
-    std::unique_ptr<PatchContinuous> lfoDepD;
+    std::unique_ptr<PatchContinuous::cubic_t> lfoDepDA;
     std::unique_ptr<jcmp::Label> lfoDepL;
 
     std::unique_ptr<RuledLabel> depTitle;

diff --git a/src/ui/main-sub-panel.cpp b/src/ui/main-sub-panel.cpp
@@ -37,7 +37,7 @@ MainSubPanel::MainSubPanel(SixSinesEditor &e)
     velSenL->setText("Vel Sens");
     addAndMakeVisible(*velSenL);
 
-    createComponent(editor, *this, on.lfoDepth, lfoDep, lfoDepD);
+    createRescaledComponent(editor, *this, on.lfoDepth, lfoDep, lfoDepDA);
     addAndMakeVisible(*lfoDep);
     lfoDepL = std::make_unique<jcmp::Label>();
     lfoDepL->setText(std::string() + "LFO " + u8"\U00002192");

diff --git a/src/ui/main-sub-panel.h b/src/ui/main-sub-panel.h
@@ -49,7 +49,8 @@ struct MainSubPanel : juce::Component,
     std::unique_ptr<jcmp::Label> velSenL;
 
     std::unique_ptr<jcmp::Knob> lfoDep;
-    std::unique_ptr<PatchContinuous> lfoDepD;
+    std::unique_ptr<PatchContinuous::cubic_t> lfoDepDA;
+
     std::unique_ptr<jcmp::Label> lfoDepL;
 
     std::unique_ptr<RuledLabel> velTitle;

diff --git a/src/ui/mainpan-sub-panel.cpp b/src/ui/mainpan-sub-panel.cpp
@@ -28,13 +28,13 @@ MainPanSubPanel::MainPanSubPanel(SixSinesEditor &e) : HasEditor(e)
     depTitle->setText("Pan");
     addAndMakeVisible(*depTitle);
 
-    createComponent(editor, *this, on.envDepth, envDepth, envDepthD);
+    createRescaledComponent(editor, *this, on.envDepth, envDepth, envDepthDA);
     addAndMakeVisible(*envDepth);
     envDepthLL = std::make_unique<jcmp::Label>();
     envDepthLL->setText(std::string() + "Env " + u8"\U00002192");
     addAndMakeVisible(*envDepthLL);
 
-    createComponent(editor, *this, on.lfoDepth, lfoDep, lfoDepD);
+    createRescaledComponent(editor, *this, on.lfoDepth, lfoDep, lfoDepDA);
     addAndMakeVisible(*lfoDep);
     lfoDepL = std::make_unique<jcmp::Label>();
     lfoDepL->setText(std::string() + "LFO " + u8"\U00002192");

diff --git a/src/ui/mainpan-sub-panel.h b/src/ui/mainpan-sub-panel.h
@@ -37,11 +37,11 @@ struct MainPanSubPanel : juce::Component,
     void beginEdit() {}
 
     std::unique_ptr<jcmp::Knob> envDepth;
-    std::unique_ptr<PatchContinuous> envDepthD;
+    std::unique_ptr<PatchContinuous::cubic_t> envDepthDA;
     std::unique_ptr<jcmp::Label> envDepthLL;
 
     std::unique_ptr<jcmp::Knob> lfoDep;
-    std::unique_ptr<PatchContinuous> lfoDepD;
+    std::unique_ptr<PatchContinuous::cubic_t> lfoDepDA;
     std::unique_ptr<jcmp::Label> lfoDepL;
 
     std::unique_ptr<RuledLabel> depTitle;

diff --git a/src/ui/matrix-panel.cpp b/src/ui/matrix-panel.cpp
@@ -26,7 +26,7 @@ MatrixPanel::MatrixPanel(SixSinesEditor &e) : jcmp::NamedPanel("Matrix"), HasEdi
     auto &mn = editor.patchCopy.selfNodes;
     for (auto i = 0U; i < numOps; ++i)
     {
-        createComponent(editor, *this, mn[i].fbLevel, Sknobs[i], SknobsData[i], i, true);
+        createRescaledComponent(editor, *this, mn[i].fbLevel, Sknobs[i], SknobsData[i], i, true);
         Sknobs[i]->setDrawLabel(false);
         addAndMakeVisible(*Sknobs[i]);
 
@@ -39,7 +39,7 @@ MatrixPanel::MatrixPanel(SixSinesEditor &e) : jcmp::NamedPanel("Matrix"), HasEdi
         Slabels[i]->setText("Op " + std::to_string(i + 1) + " " + u8"\U000021A9");
         addAndMakeVisible(*Slabels[i]);
 
-        SknobsData[i]->onPullFromMin = [i, w = juce::Component::SafePointer(this)]()
+        SknobsData[i]->under->onPullFromMin = [i, w = juce::Component::SafePointer(this)]()
         {
             if (!w)
                 return;
@@ -54,7 +54,7 @@ MatrixPanel::MatrixPanel(SixSinesEditor &e) : jcmp::NamedPanel("Matrix"), HasEdi
     auto &mx = editor.patchCopy.matrixNodes;
     for (auto i = 0U; i < matrixSize; ++i)
     {
-        createComponent(editor, *this, mx[i].level, Mknobs[i], MknobsData[i], i, false);
+        createRescaledComponent(editor, *this, mx[i].level, Mknobs[i], MknobsData[i], i, false);
         Mknobs[i]->setDrawLabel(false);
         addAndMakeVisible(*Mknobs[i]);
 
@@ -76,7 +76,7 @@ MatrixPanel::MatrixPanel(SixSinesEditor &e) : jcmp::NamedPanel("Matrix"), HasEdi
         Mlabels[i]->setText("Op " + std::to_string(si + 1) + " " + glyph);
         addAndMakeVisible(*Mlabels[i]);
 
-        MknobsData[i]->onPullFromMin = [i, si, w = juce::Component::SafePointer(this)]()
+        MknobsData[i]->under->onPullFromMin = [i, si, w = juce::Component::SafePointer(this)]()
         {
             if (!w)
                 return;

diff --git a/src/ui/matrix-panel.h b/src/ui/matrix-panel.h
@@ -42,13 +42,13 @@ struct MatrixPanel : jcmp::NamedPanel, HasEditor
     }
 
     std::array<std::unique_ptr<jcmp::Knob>, numOps> Sknobs;
-    std::array<std::unique_ptr<PatchContinuous>, numOps> SknobsData;
+    std::array<std::unique_ptr<PatchContinuous::cubic_t>, numOps> SknobsData;
     std::array<std::unique_ptr<jcmp::ToggleButton>, numOps> Spower;
     std::array<std::unique_ptr<PatchDiscrete>, numOps> SpowerData;
     std::array<std::unique_ptr<jcmp::Label>, numOps> Slabels;
 
     std::array<std::unique_ptr<jcmp::Knob>, matrixSize> Mknobs;
-    std::array<std::unique_ptr<PatchContinuous>, matrixSize> MknobsData;
+    std::array<std::unique_ptr<PatchContinuous::cubic_t>, matrixSize> MknobsData;
     std::array<std::unique_ptr<jcmp::ToggleButton>, matrixSize> Mpower;
     std::array<std::unique_ptr<PatchDiscrete>, matrixSize> MpowerData;
     std::array<std::unique_ptr<jcmp::MultiSwitch>, matrixSize> Mpmrm;

diff --git a/src/ui/matrix-sub-panel.cpp b/src/ui/matrix-sub-panel.cpp
@@ -30,13 +30,13 @@ void MatrixSubPanel::setSelectedIndex(int idx)
     setupLFO(editor, m);
     setupModulation(editor, m);
 
-    createComponent(editor, *this, m.lfoToDepth, lfoToDepth, lfoToDepthD);
+    createRescaledComponent(editor, *this, m.lfoToDepth, lfoToDepth, lfoToDepthDA);
     addAndMakeVisible(*lfoToDepth);
     lfoToDepthL = std::make_unique<jcmp::Label>();
     lfoToDepthL->setText("Depth");
     addAndMakeVisible(*lfoToDepthL);
 
-    createComponent(editor, *this, m.envToLevel, envToLev, envToLevD);
+    createRescaledComponent(editor, *this, m.envToLevel, envToLev, envToLevDA);
     addAndMakeVisible(*envToLev);
     envToLevL = std::make_unique<jcmp::Label>();
     envToLevL->setText("Level");

diff --git a/src/ui/matrix-sub-panel.h b/src/ui/matrix-sub-panel.h
@@ -41,12 +41,12 @@ struct MatrixSubPanel : juce::Component,
     void setSelectedIndex(int idx);
 
     std::unique_ptr<jcmp::Knob> lfoToDepth;
-    std::unique_ptr<PatchContinuous> lfoToDepthD;
+    std::unique_ptr<PatchContinuous::cubic_t> lfoToDepthDA;
     std::unique_ptr<jcmp::Label> lfoToDepthL;
 
     std::unique_ptr<RuledLabel> modLabelE, modLabelL;
     std::unique_ptr<jcmp::Knob> envToLev;
-    std::unique_ptr<PatchContinuous> envToLevD;
+    std::unique_ptr<PatchContinuous::cubic_t> envToLevDA;
     std::unique_ptr<jcmp::Label> envToLevL;
 
     std::unique_ptr<jcmp::MultiSwitch> envMul;

diff --git a/src/ui/mixer-sub-panel.cpp b/src/ui/mixer-sub-panel.cpp
@@ -32,19 +32,19 @@ void MixerSubPanel::setSelectedIndex(int idx)
     setupLFO(editor, sn);
     setupModulation(editor, sn);
 
-    createComponent(editor, *this, sn.lfoToLevel, lfoToLevel, lfoToLevelD);
+    createRescaledComponent(editor, *this, sn.lfoToLevel, lfoToLevel, lfoToLevelDA);
     addAndMakeVisible(*lfoToLevel);
     lfoToLevelL = std::make_unique<jcmp::Label>();
     lfoToLevelL->setText("Level");
     addAndMakeVisible(*lfoToLevelL);
 
-    createComponent(editor, *this, sn.lfoToPan, lfoToPan, lfoToPanD);
+    createRescaledComponent(editor, *this, sn.lfoToPan, lfoToPan, lfoToPanDA);
     addAndMakeVisible(*lfoToPan);
     lfoToPanL = std::make_unique<jcmp::Label>();
     lfoToPanL->setText("Pan");
     addAndMakeVisible(*lfoToPanL);
 
-    createComponent(editor, *this, sn.envToLevel, envToLev, envToLevD);
+    createRescaledComponent(editor, *this, sn.envToLevel, envToLev, envToLevDA);
     addAndMakeVisible(*envToLev);
     envToLevL = std::make_unique<jcmp::Label>();
     envToLevL->setText("Level");

diff --git a/src/ui/mixer-sub-panel.h b/src/ui/mixer-sub-panel.h
@@ -41,16 +41,18 @@ struct MixerSubPanel : juce::Component,
     void setSelectedIndex(int i);
 
     std::unique_ptr<jcmp::Knob> lfoToLevel;
-    std::unique_ptr<PatchContinuous> lfoToLevelD;
+    std::unique_ptr<PatchContinuous::cubic_t> lfoToLevelDA;
+
     std::unique_ptr<jcmp::Label> lfoToLevelL;
 
     std::unique_ptr<jcmp::Knob> lfoToPan;
     std::unique_ptr<PatchContinuous> lfoToPanD;
+    std::unique_ptr<PatchContinuous::cubic_t> lfoToPanDA;
     std::unique_ptr<jcmp::Label> lfoToPanL;
 
     std::unique_ptr<RuledLabel> modLabelE, modLabelL;
     std::unique_ptr<jcmp::Knob> envToLev;
-    std::unique_ptr<PatchContinuous> envToLevD;
+    std::unique_ptr<PatchContinuous::cubic_t> envToLevDA;
     std::unique_ptr<jcmp::Label> envToLevL;
 
     std::unique_ptr<jcmp::MultiSwitch> envMul;

diff --git a/src/ui/patch-data-bindings.h b/src/ui/patch-data-bindings.h
@@ -19,6 +19,8 @@
 #include <cstdint>
 #include "sst/jucegui/data/Continuous.h"
 #include "sst/jucegui/data/Discrete.h"
+#include <sst/jucegui/component-adapters/ThrowRescaler.h>
+
 #include "sst/jucegui/components/Knob.h"
 #include "sst/jucegui/components/DraggableTextEditableValue.h"
 
@@ -103,6 +105,8 @@ struct PatchContinuous : jdat::Continuous
     void setTemposyncPowerPartner(jdat::Discrete *d) { tsPowerPartner = d; }
 
     std::function<void()> onPullFromMin{nullptr};
+
+    using cubic_t = sst::jucegui::component_adapters::CubicThrowRescaler<PatchContinuous>;
 };
 
 struct PatchDiscrete : jdat::Discrete
@@ -197,5 +201,40 @@ void createComponent(SixSinesEditor &e, P &panel, const Param &parm, std::unique
     e.componentByID[id] = juce::Component::SafePointer<juce::Component>(cm.get());
 }
 
+template <typename P, typename T, typename Rescaler, typename... Args>
+void createRescaledComponent(SixSinesEditor &e, P &panel, const Param &parm, std::unique_ptr<T> &cm,
+                             std::unique_ptr<Rescaler> &rc, Args... args)
+{
+    auto id = parm.meta.id;
+    auto pc = std::make_unique<PatchContinuous>(e, id);
+    rc = std::make_unique<Rescaler>(std::move(pc));
+    cm = std::make_unique<T>();
+
+    if constexpr (!std::is_same_v<T, jcmp::DraggableTextEditableValue>) // hack
+    {
+        cm->onPopupMenu = [&e, ptr = cm.get()](auto &mods)
+        {
+            e.hideTooltip();
+            e.popupMenuForContinuous(ptr);
+        };
+    }
+    cm->onBeginEdit = [&e, &cm, &rc, args..., id, &panel]()
+    {
+        e.uiToAudio.push({Synth::UIToAudioMsg::Action::BEGIN_EDIT, id});
+        e.updateTooltip(rc.get());
+        e.showTooltipOn(cm.get());
+
+        panel.beginEdit(args...);
+    };
+    cm->onEndEdit = [&e, id, &panel]()
+    {
+        e.uiToAudio.push({Synth::UIToAudioMsg::Action::END_EDIT, id});
+        e.hideTooltip();
+    };
+    cm->setSource(rc.get());
+
+    e.componentByID[id] = juce::Component::SafePointer<juce::Component>(cm.get());
+}
+
 } // namespace baconpaul::six_sines::ui
 #endif // PATCH_CONTINUOUS_H
diff --git a/src/ui/self-sub-panel.cpp b/src/ui/self-sub-panel.cpp
@@ -32,13 +32,13 @@ void SelfSubPanel::setSelectedIndex(int idx)
     setupLFO(editor, editor.patchCopy.selfNodes[idx]);
     setupModulation(editor, editor.patchCopy.selfNodes[idx]);
 
-    createComponent(editor, *this, n.lfoToFB, lfoToFb, lfoToFbD);
+    createRescaledComponent(editor, *this, n.lfoToFB, lfoToFb, lfoToFbDA);
     addAndMakeVisible(*lfoToFb);
     lfoToFbL = std::make_unique<jcmp::Label>();
     lfoToFbL->setText("Depth");
     addAndMakeVisible(*lfoToFbL);
 
-    createComponent(editor, *this, n.envToFB, envToLev, envToLevD);
+    createRescaledComponent(editor, *this, n.envToFB, envToLev, envToLevDA);
     addAndMakeVisible(*envToLev);
     envToLevL = std::make_unique<jcmp::Label>();
     envToLevL->setText("Level");

diff --git a/src/ui/self-sub-panel.h b/src/ui/self-sub-panel.h
@@ -40,12 +40,12 @@ struct SelfSubPanel : juce::Component,
     void setSelectedIndex(int idx);
 
     std::unique_ptr<jcmp::Knob> lfoToFb;
-    std::unique_ptr<PatchContinuous> lfoToFbD;
+    std::unique_ptr<PatchContinuous::cubic_t> lfoToFbDA;
     std::unique_ptr<jcmp::Label> lfoToFbL;
 
     std::unique_ptr<RuledLabel> modLabelE, modLabelL;
     std::unique_ptr<jcmp::Knob> envToLev;
-    std::unique_ptr<PatchContinuous> envToLevD;
+    std::unique_ptr<PatchContinuous::cubic_t> envToLevDA;
     std::unique_ptr<jcmp::Label> envToLevL;
 
     std::unique_ptr<jcmp::MultiSwitch> envMul;