WIP

Author: cmaughan

app/demo.cpp

@@ -215,6 +215,8 @@ void demo_cleanup()
     */
 
     spCanvas.reset();
+
+    spOsc.reset();
 }
 /*
 

app/nodes/node_oscillator.cpp

@@ -7,6 +7,8 @@
 
 #include <zest/logger/logger.h>
 
+#include <zing/audio/audio.h>
+
 #include <earlevel/el_wavetable.h>
 #include <earlevel/el_wavetable_utils.h>
 
@@ -30,38 +32,9 @@ using namespace Zest;
 namespace {
 const int NumWaves = 4;
 
-struct SetterWave : public ISliderCB
-{
-    SliderValue myVal;
-    virtual void UpdateSlider(Slider* pSlider, SliderOp op, SliderValue& val)
-    {
-        myVal.type = SliderType::Mark;
-        myVal.step = 0.33f;
-        if (op == SliderOp::Get)
-        {
-            myVal.name = pSlider->GetLabel();
-            myVal.valueText = fmt::format("{:1.2f}", myVal.value);
-            myVal.units = "dB";
-            myVal.valueFlags = WidgetValueFlags::NoQuantization;
-            val = myVal;
-        }
-        else
-        {
-            myVal = val;
-        }
-    }
-};
 
 } // Namespace
 
-struct AudioSettings
-{
-    uint32_t sampleRate = 22000;
-    sp_data* pSP = nullptr;
-};
-
-AudioSettings maud;
-
 Oscillator::~Oscillator()
 {
     // CleanUp();
@@ -81,18 +54,21 @@ void Oscillator::BuildNode(Canvas& canvas)
     sliderVal.step = 0.333f;
     sliderVal.type = SliderType::Mark;
 
-    auto spWaveSlider = std::make_shared<WaveSlider>("Wave", sliderVal);
-    spWaveSlider->SetRect(NRectf(0.0f, 0.0f, 0.0f, 50.0f));
-    spWaveSlider->SetConstraints(glm::uvec2(LayoutConstraint::Expanding, LayoutConstraint::Preferred));
+    m_spWaveSlider = std::make_shared<WaveSlider>("Wave", sliderVal);
+    m_spWaveSlider->SetRect(NRectf(0.0f, 0.0f, 0.0f, 50.0f));
+    m_spWaveSlider->SetConstraints(glm::uvec2(LayoutConstraint::Expanding, LayoutConstraint::Preferred));
+    m_spWaveSlider->AddValueUpdatedCB([=]() {
+        UpdateWave();
+    });
 
-    spRootLayout->AddChild(spWaveSlider);
+    spRootLayout->AddChild(m_spWaveSlider);
 
     // Keep same height, expand the width
     auto spCustom = std::make_shared<Widget>("Custom");
     spCustom->SetConstraints(glm::uvec2(LayoutConstraint::Expanding, LayoutConstraint::Preferred));
     spCustom->SetRect(NRectf(0.0f, 0.0f, 0.0f, 50.0f));
     spCustom->AddPostDrawCB([=](Canvas& canvas, const NRectf& rect) {
-        spWaveSlider->DrawGeneratedWave(canvas, rect);
+        m_spWaveSlider->DrawGeneratedWave(canvas, rect);
     });
     spRootLayout->AddChild(spCustom);
 
@@ -128,6 +104,47 @@ void Oscillator::BuildNode(Canvas& canvas)
     spSocket->SetRect(NRectf(0.0f, 0.0f, 30.0f, 30.0f));
     spSocket->SetConstraints(glm::uvec2(LayoutConstraint::Preferred, LayoutConstraint::Expanding));
     spHorzLayout->AddChild(spSocket);
+
+    Reset();
+
+    UpdateWave();
+}
+
+void Oscillator::UpdateWave()
+{
+    auto& ctx = Zing::GetAudioContext();
+
+    sp_oscmorph2d* pOsc = nullptr;
+    sp_oscmorph2d_create(&pOsc);
+
+    // Setup the oscillator
+    sp_oscmorph2d_init(ctx.pSP, pOsc, &m_vecTables[0], NumWaves, m_numBandLimitedTables, &m_vecTableFrequencies[0], 0);
+    pOsc->freq = 0;
+    pOsc->amp = 0;
+    pOsc->wtpos = 0;
+    pOsc->enableBandlimit = 1;
+    pOsc->bandlimitIndexOverride = -1;
+
+    SliderValue val;
+    m_spWaveSlider->GetCB()->UpdateSlider(m_spWaveSlider.get(), SliderOp::Get, val);
+
+    pOsc->wtpos = val.value;
+
+    pOsc->amp = 1.0;
+    pOsc->iphs = 0;
+
+    pOsc->freq = 100;
+
+    std::vector<float> wave;
+    wave.resize(1000);
+    for (size_t i = 0; i < wave.size(); i++)
+    {
+        sp_oscmorph2d_compute(ctx.pSP, pOsc, nullptr, &wave[i]);
+    }
+
+    sp_oscmorph2d_destroy(&pOsc);
+
+    m_spWaveSlider->SetWave(wave);
 }
 
 void Oscillator::CleanUp()
@@ -248,6 +265,8 @@ void Oscillator::Reset()
 {
     CleanUp();
 
+    auto& ctx = Zing::GetAudioContext();
+
     int tableLen = 2048;
 
     // The wave table to use
@@ -287,7 +306,7 @@ void Oscillator::Reset()
             m_vecTableFrequencies.resize(m_numBandLimitedTables);
             for (int table = 0; table < m_numBandLimitedTables; table++)
             {
-                m_vecTableFrequencies[table] = float(osc->GetTables()[table].topFreq * maud.sampleRate);
+                m_vecTableFrequencies[table] = float(osc->GetTables()[table].topFreq * ctx.outputState.sampleRate);
             }
         }
         // Ensure all have the same table size
@@ -306,7 +325,7 @@ void Oscillator::Reset()
 
             // Create the wave table and copy in the data
             sp_ftbl* pTable = nullptr;
-            sp_ftbl_create(maud.pSP, &pTable, sourceTable.waveTableLen);
+            sp_ftbl_create(ctx.pSP, &pTable, sourceTable.waveTableLen);
 
             // Create our wavetable for the oscillator
             for (size_t i = 0; i < sourceTable.waveTableLen; i++)

app/nodes/node_oscillator.h

@@ -17,6 +17,7 @@ namespace NodeGraph
 {
 class Node;
 class Canvas;
+class WaveSlider;
 }
 
 class Oscillator
@@ -25,6 +26,7 @@ class Oscillator
     Oscillator(const std::string& strName, AudioUtils::WaveTableType type, float frequency = 440.0f, float phase = 0.0f);
     virtual ~Oscillator();
 
+    void UpdateWave();
     void Reset();
     void CleanUp(); 
     /*
@@ -69,5 +71,6 @@ class Oscillator
     int m_numBandLimitedTables = 0;
 
     std::shared_ptr<NodeGraph::Node> m_spNode;
+    std::shared_ptr<NodeGraph::WaveSlider> m_spWaveSlider;
 };
 

include/nodegraph/theme.h

@@ -83,5 +83,9 @@ DECLARE_THEME_SETTING_VALUE(b_debugShowLayout);
 DECLARE_THEME_SETTING_VALUE(c_socketColor);
 DECLARE_THEME_SETTING_VALUE(c_socketShadowColor);
 
+// Wave slider
+DECLARE_THEME_SETTING_VALUE(c_waveSliderCenterColor);
+DECLARE_THEME_SETTING_VALUE(c_waveSliderBorderColor);
+
 } // namespace Nodegraph
 

include/nodegraph/widgets/widget.h

@@ -84,7 +84,10 @@ class TipTimer
 
     ~TipTimer()
     {
-        ActiveTips.erase(m_pOwner);
+        if (ActiveTips.find(m_pOwner) != ActiveTips.end())
+        {
+            ActiveTips.erase(m_pOwner);
+        }
     }
     TipState Update()
     {
@@ -217,6 +220,7 @@ class Widget;
 using WidgetList = std::vector<std::shared_ptr<Widget>>;
 
 using fnPostDraw = std::function<void(Canvas& canvas, const Zest::NRectf& hintRect)>;
+using fnValueUpdated = std::function<void()>;
 class Widget
 {
 public:
@@ -230,6 +234,7 @@ class Widget
 
     // Post Draw
     virtual void AddPostDrawCB(const fnPostDraw& fnCB);
+    virtual void AddValueUpdatedCB(const fnValueUpdated& fnCB);
 
     virtual const Zest::NRectf& GetRect() const;
     virtual void SetRect(const Zest::NRectf& sz);
@@ -280,6 +285,8 @@ class Widget
 
     void Visit(const std::function<void(Widget*)>& fnVisit);
 
+    void SendValueUpdated();
+
 protected:
     Zest::NRectf m_rect;
     Widget* m_pParent = nullptr;
@@ -290,6 +297,7 @@ class Widget
     uint64_t m_flags = 0;
     glm::vec2 m_sizeHint = glm::vec2(0.0f);
     fnPostDraw m_postDrawCB;
+    fnValueUpdated m_valueUpdatedCB;
     TipTimer m_tipTimer;
 };
 

include/nodegraph/widgets/widget_slider.h

@@ -54,6 +54,7 @@ class Slider : public Widget
 
     virtual const NRectf& GetSliderRangeArea() const;
 
+    ISliderCB* GetCB() const { return m_pCB.get(); }
 protected:
     std::shared_ptr<ISliderCB> m_pCB;
     NRectf m_sliderRangeArea;

include/nodegraph/widgets/widget_waveslider.h

@@ -18,6 +18,11 @@ class WaveSlider : public Slider
     WaveSlider(const std::string& label, const SliderValue& value);
     virtual void PostDraw(Canvas& canvas, const NRectf& rc);
     virtual void DrawGeneratedWave(Canvas& canvas, const NRectf& rc);
+
+    void SetWave(const std::vector<float>& vals);
+
+private:
+    std::vector<float> m_wave;
 };
 
 }

settings.toml

@@ -19,13 +19,15 @@ c_nodeTitleShadowColor = [ 0.19596540927886963, 0.19596540927886963, 0.195965409
 c_sliderBorderColor = [ 0.29971182346343994, 0.29971182346343994, 0.29971182346343994, 1.0 ]
 c_sliderCenterColor = [ 0.10662823915481567, 0.0845036432147026, 0.0845036432147026, 1.0 ]
 c_sliderShadowColor = [ 0.33717578649520874, 0.3264872133731842, 0.3264872133731842, 1.0 ]
-c_sliderThumbColor = [ 0.8443803787231445, 0.2920047342777252, 0.2920047342777252, 1.0 ]
+c_sliderThumbColor = [ 0.7608069181442261, 0.13374416530132294, 0.13374416530132294, 1.0 ]
 c_sliderThumbShadowColor = [ 0.5446685552597046, 0.4096786677837372, 0.4096786677837372, 1.0 ]
 c_sliderTipBorderColor = [ 0.7665705680847168, 0.7665705680847168, 0.7665705680847168, 1.0 ]
 c_sliderTipCenterColor = [ 0.23054754734039307, 0.23054754734039307, 0.23054754734039307, 1.0 ]
 c_sliderTipFontColor = [ 0.6791103482246399, 0.7655288577079773, 0.8386167287826538, 1.0 ]
 c_sliderTipShadowColor = [ 0.10951006412506104, 0.10951006412506104, 0.10951006412506104, 1.0 ]
 c_socketColor = [ 0.0, 0.0, 0.0, 0.0 ]
+c_waveSliderBorderColor = [ 1.0, 1.0, 1.0, 1.0 ]
+c_waveSliderCenterColor = [ 1.0, 1.0, 1.0, 0.0 ]
 s_gridLineSize = 2.0
 s_knobChannelGap = 3.0
 s_knobChannelWidth = 8.0
@@ -54,4 +56,4 @@ s_sliderTipBorderSize = 0.0
 s_sliderTipFontPad = 7.0
 s_sliderTipFontSize = 36.0
 s_sliderTipShadowSize = 4.0
-s_windowSize = [ 3840.0, 2224.0 ]
+s_windowSize = [ 3840.0, 2036.0 ]

src/widgets/widget.cpp

@@ -24,6 +24,11 @@ void Widget::AddPostDrawCB(const fnPostDraw& fnCB)
     m_postDrawCB = fnCB;
 }
 
+void Widget::AddValueUpdatedCB(const fnValueUpdated& fnCB)
+{
+    m_valueUpdatedCB = fnCB;
+}
+
 Widget* Widget::GetParent() const
 {
     return m_pParent;
@@ -378,5 +383,13 @@ void Widget::DrawTip(Canvas& canvas, const glm::vec2& widgetTopCenter, const Wid
             fontSize);
     }
 }
+    
+void Widget::SendValueUpdated()
+{
+    if (m_valueUpdatedCB)
+    {
+        m_valueUpdatedCB();
+    }
+}
 
 } // Nodegraph

src/widgets/widget_slider.cpp

@@ -32,6 +32,7 @@ void DefaultSliderCB::UpdateSlider(Slider* pSlider, SliderOp op, SliderValue& va
     else
     {
         myVal = val;
+        pSlider->SendValueUpdated();
     }
 }