Signals

Author: cmaughan

.gitmodules

@@ -7,3 +7,6 @@
 	url = https://github.com/Rezonality/zing
 [submodule "zing"]
 	branch = main
+[submodule "libs/signals"]
+	path = libs/signals
+	url = https://github.com/TheWisp/signals.git

app/nodes/node_oscillator.cpp

@@ -57,17 +57,17 @@ void Oscillator::BuildNode(Canvas& canvas)
     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([=]() {
+    m_connections.push_back(m_spWaveSlider->ValueUpdatedSignal.connect([=]() {
         UpdateWave();
-    });
+    }));
 
     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) {
+    spCustom->PostDrawSignal.connect([=](Canvas& canvas, const NRectf& rect) {
         m_spWaveSlider->DrawGeneratedWave(canvas, rect);
     });
     spRootLayout->AddChild(spCustom);

app/nodes/node_oscillator.h

@@ -8,6 +8,8 @@
 
 #include <utils/wavetable.h>
 
+#include <signals/signals.hpp>
+
 extern "C"
 {
 #include <soundpipe_extensions/soundpipeextension.h>
@@ -44,6 +46,9 @@ class Oscillator
     virtual void BuildNode(NodeGraph::Canvas& canvas);
 
 protected:
+
+    std::vector<fteng::connection> m_connections;
+
     // Inputs
     /*
     NodeGraph::Pin* m_pWave;

include/nodegraph/widgets/widget.h

@@ -7,6 +7,8 @@
 #include <zest/math/math_utils.h>
 #include <zest/time/timer.h>
 
+#include <signals/signals.hpp>
+
 namespace NodeGraph {
 
 class Canvas;
@@ -219,8 +221,6 @@ class Layout;
 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:
@@ -232,10 +232,6 @@ class Widget
     virtual Widget* GetParent() const;
     virtual void SetParent(Widget* pParent);
 
-    // 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);
     virtual const glm::uvec2& GetConstraints() const;
@@ -285,7 +281,8 @@ class Widget
 
     void Visit(const std::function<void(Widget*)>& fnVisit);
 
-    void SendValueUpdated();
+    fteng::signal<void()> ValueUpdatedSignal;
+    fteng::signal<void(Canvas& canvas, const Zest::NRectf& hintRect)> PostDrawSignal;
 
 protected:
     Zest::NRectf m_rect;
@@ -296,8 +293,6 @@ class Widget
     std::shared_ptr<Layout> m_spLayout;
     uint64_t m_flags = 0;
     glm::vec2 m_sizeHint = glm::vec2(0.0f);
-    fnPostDraw m_postDrawCB;
-    fnValueUpdated m_valueUpdatedCB;
     TipTimer m_tipTimer;
 };
 

libs/signals

@@ -69,6 +69,7 @@ PRIVATE
     ${CMAKE_BINARY_DIR}
 PUBLIC
     $<BUILD_INTERFACE:${NODEGRAPH_ROOT}/include>
+    $<BUILD_INTERFACE:${NODEGRAPH_ROOT}/libs>
     $<INSTALL_INTERFACE:include>
 )
 

src/CMakeLists.txt

@@ -19,16 +19,6 @@ Widget::Widget(const std::string& label)
 {
 }
 
-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;
@@ -99,10 +89,7 @@ void Widget::Draw(Canvas& canvas)
 
 void Widget::PostDraw(Canvas& canvas, const NRectf& hintRect)
 {
-    if (m_postDrawCB)
-    {
-        m_postDrawCB(canvas, hintRect);
-    }
+    PostDrawSignal(canvas, hintRect);
 }
 
 Widget* Widget::MouseDown(CanvasInputState& input)
@@ -383,13 +370,5 @@ void Widget::DrawTip(Canvas& canvas, const glm::vec2& widgetTopCenter, const Wid
             fontSize);
     }
 }
-    
-void Widget::SendValueUpdated()
-{
-    if (m_valueUpdatedCB)
-    {
-        m_valueUpdatedCB();
-    }
-}
 
 } // Nodegraph

src/widgets/widget.cpp

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