Add Amp slider

Author: cmaughan

app/nodes/node_oscillator.cpp

@@ -84,20 +84,22 @@ void Oscillator::BuildNode(Canvas& canvas)
     spSocket->SetConstraints(glm::uvec2(LayoutConstraint::Preferred, LayoutConstraint::Expanding));
     spHorzLayout->AddChild(spSocket);
 
-    sliderVal.step = 0.2f;
-    sliderVal.units = "dB";
+    sliderVal.step = 0.1f;
+    sliderVal.units = "";
     sliderVal.valueFlags = WidgetValueFlags::Default;
+    sliderVal.value = 1.0f;
 
-    auto spSlider = std::make_shared<Slider>("Amp", sliderVal);
-    spSlider->SetRect(NRectf(0.0f, 0.0f, 0.0f, 0.0f));
-    spHorzLayout->AddChild(spSlider);
+    m_spAmplitude = std::make_shared<Slider>("Amp", sliderVal);
+    spHorzLayout->AddChild(m_spAmplitude);
+    m_connections.push_back(m_spAmplitude->ValueUpdatedSignal.connect([=]() {
+        UpdateWave();
+    }));
 
     sliderVal.units = "Hz";
     sliderVal.name = "Freq";
     sliderVal.valueText = "Freq";
 
-    spSlider = std::make_shared<Slider>("Freq", sliderVal);
-    spSlider->SetRect(NRectf(0.0f, 0.0f, 0.0f, 0.0f));
+    auto spSlider = std::make_shared<Slider>("Freq", sliderVal);
     spHorzLayout->AddChild(spSlider);
 
     spSocket = std::make_shared<Socket>("Amp", SocketType::Right);
@@ -125,12 +127,15 @@ void Oscillator::UpdateWave()
     pOsc->enableBandlimit = 1;
     pOsc->bandlimitIndexOverride = -1;
 
-    SliderValue val;
-    m_spWaveSlider->GetCB()->UpdateSlider(m_spWaveSlider.get(), SliderOp::Get, val);
+    SliderValue sliderType;
+    m_spWaveSlider->GetCB()->UpdateSlider(m_spWaveSlider.get(), SliderOp::Get, sliderType);
+    
+    SliderValue amplitude;
+    m_spAmplitude->GetCB()->UpdateSlider(m_spAmplitude.get(), SliderOp::Get, amplitude);
 
-    pOsc->wtpos = val.value;
+    pOsc->wtpos = sliderType.value;
 
-    pOsc->amp = 1.0;
+    pOsc->amp = amplitude.value;
     pOsc->iphs = 0;
 
     pOsc->freq = 100;

app/nodes/node_oscillator.h

@@ -20,6 +20,7 @@ namespace NodeGraph
 class Node;
 class Canvas;
 class WaveSlider;
+class Slider;
 }
 
 class Oscillator
@@ -77,5 +78,6 @@ class Oscillator
 
     std::shared_ptr<NodeGraph::Node> m_spNode;
     std::shared_ptr<NodeGraph::WaveSlider> m_spWaveSlider;
+    std::shared_ptr<NodeGraph::Slider> m_spAmplitude;
 };
 

submit.bat commit_all.batsubmit.bat renamed to commit_all.bat

@@ -56,4 +56,4 @@ s_sliderTipBorderSize = 0.0
 s_sliderTipFontPad = 7.0
 s_sliderTipFontSize = 36.0
 s_sliderTipShadowSize = 4.0
-s_windowSize = [ 3840.0, 2036.0 ]
+s_windowSize = [ 3840.0, 2224.0 ]