From b3bc88f7df291d2e361beeb05196ca07cb1c0033 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sun, 19 Nov 2017 08:33:47 -0500 Subject: [PATCH] Adjust lights --- src/ABC.cpp | 4 ++-- src/DualAtenuverter.cpp | 4 ++-- src/Mixer.cpp | 6 +++--- src/Rampage.cpp | 18 +++++++++--------- src/SpringReverb.cpp | 16 ++++++++-------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ABC.cpp b/src/ABC.cpp index 8d5d2ce..65b3750 100644 --- a/src/ABC.cpp +++ b/src/ABC.cpp @@ -100,6 +100,6 @@ ABCWidget::ABCWidget() { addInput(createInput(Vec(7, 279), module, ABC::C2_INPUT)); addOutput(createOutput(Vec(7, 321), module, ABC::OUT2_OUTPUT)); - addChild(createLight>(Vec(38, 162), module, ABC::OUT1_POS_LIGHT)); - addChild(createLight>(Vec(38, 330), module, ABC::OUT2_POS_LIGHT)); + addChild(createLight>(Vec(37, 162), module, ABC::OUT1_POS_LIGHT)); + addChild(createLight>(Vec(37, 329), module, ABC::OUT2_POS_LIGHT)); } diff --git a/src/DualAtenuverter.cpp b/src/DualAtenuverter.cpp index 15967d5..b8c5924 100644 --- a/src/DualAtenuverter.cpp +++ b/src/DualAtenuverter.cpp @@ -73,6 +73,6 @@ DualAtenuverterWidget::DualAtenuverterWidget() { addInput(createInput(Vec(7, 319), module, DualAtenuverter::IN2_INPUT)); addOutput(createOutput(Vec(43, 319), module, DualAtenuverter::OUT2_OUTPUT)); - addChild(createLight>(Vec(33, 143), module, DualAtenuverter::OUT1_POS_LIGHT)); - addChild(createLight>(Vec(33, 311), module, DualAtenuverter::OUT2_POS_LIGHT)); + addChild(createLight>(Vec(33, 143), module, DualAtenuverter::OUT1_POS_LIGHT)); + addChild(createLight>(Vec(33, 311), module, DualAtenuverter::OUT2_POS_LIGHT)); } diff --git a/src/Mixer.cpp b/src/Mixer.cpp index f7827f7..c00d934 100644 --- a/src/Mixer.cpp +++ b/src/Mixer.cpp @@ -41,8 +41,8 @@ void Mixer::step() { float out = in1 + in2 + in3 + in4; outputs[OUT1_OUTPUT].value = out; outputs[OUT2_OUTPUT].value = -out; - lights[OUT_POS_LIGHT].value = fmaxf(0.0, out / 5.0); - lights[OUT_NEG_LIGHT].value = fmaxf(0.0, -out / 5.0); + lights[OUT_POS_LIGHT].setBrightnessSmooth(out / 5.0); + lights[OUT_NEG_LIGHT].setBrightnessSmooth(-out / 5.0); } @@ -75,5 +75,5 @@ MixerWidget::MixerWidget() { addOutput(createOutput(Vec(7, 324), module, Mixer::OUT1_OUTPUT)); addOutput(createOutput(Vec(43, 324), module, Mixer::OUT2_OUTPUT)); - addChild(createLight>(Vec(31, 309), module, Mixer::OUT_POS_LIGHT)); + addChild(createLight>(Vec(32.7, 310), module, Mixer::OUT_POS_LIGHT)); } diff --git a/src/Rampage.cpp b/src/Rampage.cpp index 109800b..ed8f340 100644 --- a/src/Rampage.cpp +++ b/src/Rampage.cpp @@ -228,13 +228,13 @@ RampageWidget::RampageWidget() { addOutput(createOutput(Vec(89, 157), module, Rampage::MIN_OUTPUT)); addOutput(createOutput(Vec(155, 157), module, Rampage::MAX_OUTPUT)); - addChild(createLight>(Vec(131, 167), module, Rampage::COMPARATOR_LIGHT)); - addChild(createLight>(Vec(122, 174), module, Rampage::MIN_LIGHT)); - addChild(createLight>(Vec(140, 174), module, Rampage::MAX_LIGHT)); - addChild(createLight>(Vec(125, 185), module, Rampage::OUT_A_LIGHT)); - addChild(createLight>(Vec(137, 185), module, Rampage::OUT_B_LIGHT)); - addChild(createLight>(Vec(17, 312), module, Rampage::RISING_A_LIGHT)); - addChild(createLight>(Vec(77, 312), module, Rampage::FALLING_A_LIGHT)); - addChild(createLight>(Vec(186, 312), module, Rampage::RISING_B_LIGHT)); - addChild(createLight>(Vec(246, 312), module, Rampage::FALLING_B_LIGHT)); + addChild(createLight>(Vec(132, 167), module, Rampage::COMPARATOR_LIGHT)); + addChild(createLight>(Vec(123, 174), module, Rampage::MIN_LIGHT)); + addChild(createLight>(Vec(141, 174), module, Rampage::MAX_LIGHT)); + addChild(createLight>(Vec(126, 185), module, Rampage::OUT_A_LIGHT)); + addChild(createLight>(Vec(138, 185), module, Rampage::OUT_B_LIGHT)); + addChild(createLight>(Vec(18, 312), module, Rampage::RISING_A_LIGHT)); + addChild(createLight>(Vec(78, 312), module, Rampage::FALLING_A_LIGHT)); + addChild(createLight>(Vec(187, 312), module, Rampage::RISING_B_LIGHT)); + addChild(createLight>(Vec(247, 312), module, Rampage::FALLING_B_LIGHT)); } diff --git a/src/SpringReverb.cpp b/src/SpringReverb.cpp index 85f3a88..ea21e8d 100644 --- a/src/SpringReverb.cpp +++ b/src/SpringReverb.cpp @@ -295,12 +295,12 @@ SpringReverbWidget::SpringReverbWidget() { addInput(createInput(Vec(47, 324), module, SpringReverb::MIX_CV_INPUT)); addOutput(createOutput(Vec(88, 317), module, SpringReverb::WET_OUTPUT)); - addChild(createLight>(Vec(56, 270), module, SpringReverb::PEAK_LIGHT)); - addChild(createLight>(Vec(56, 114), module, SpringReverb::VU1_LIGHT + 0)); - addChild(createLight>(Vec(56, 127), module, SpringReverb::VU1_LIGHT + 1)); - addChild(createLight>(Vec(56, 139), module, SpringReverb::VU1_LIGHT + 2)); - addChild(createLight>(Vec(56, 151), module, SpringReverb::VU1_LIGHT + 3)); - addChild(createLight>(Vec(56, 164), module, SpringReverb::VU1_LIGHT + 4)); - addChild(createLight>(Vec(56, 176), module, SpringReverb::VU1_LIGHT + 5)); - addChild(createLight>(Vec(56, 189), module, SpringReverb::VU1_LIGHT + 6)); + addChild(createLight>(Vec(55, 269), module, SpringReverb::PEAK_LIGHT)); + addChild(createLight>(Vec(55, 113), module, SpringReverb::VU1_LIGHT + 0)); + addChild(createLight>(Vec(55, 126), module, SpringReverb::VU1_LIGHT + 1)); + addChild(createLight>(Vec(55, 138), module, SpringReverb::VU1_LIGHT + 2)); + addChild(createLight>(Vec(55, 150), module, SpringReverb::VU1_LIGHT + 3)); + addChild(createLight>(Vec(55, 163), module, SpringReverb::VU1_LIGHT + 4)); + addChild(createLight>(Vec(55, 175), module, SpringReverb::VU1_LIGHT + 5)); + addChild(createLight>(Vec(55, 188), module, SpringReverb::VU1_LIGHT + 6)); }