commit 57a07a8db7332627f38e41cd32d15e97ccbcf604
parent 31030511cda2e947cb015319e35163388d04bfc1
Author: Matt Demanett <matt@demanett.net>
Date: Mon, 25 Dec 2017 12:46:19 -0600
Custom switch widget.
Diffstat:
18 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/res/Analyzer-src.svg b/res/Analyzer-src.svg
Binary files differ.
diff --git a/res/DADSRH-src.svg b/res/DADSRH-src.svg
Binary files differ.
diff --git a/res/DADSRH.svg b/res/DADSRH.svg
Binary files differ.
diff --git a/res/DADSRHPlus-src.svg b/res/DADSRHPlus-src.svg
Binary files differ.
diff --git a/res/DADSRHPlus.svg b/res/DADSRHPlus.svg
Binary files differ.
diff --git a/res/Shaper-src.svg b/res/Shaper-src.svg
Binary files differ.
diff --git a/res/Shaper.svg b/res/Shaper.svg
Binary files differ.
diff --git a/res/ShaperPlus-src.svg b/res/ShaperPlus-src.svg
Binary files differ.
diff --git a/res/ShaperPlus.svg b/res/ShaperPlus.svg
Binary files differ.
diff --git a/res/slider_switch_2_14px_0-src.svg b/res/slider_switch_2_14px_0-src.svg
Binary files differ.
diff --git a/res/slider_switch_2_14px_0.svg b/res/slider_switch_2_14px_0.svg
Binary files differ.
diff --git a/res/slider_switch_2_14px_1-src.svg b/res/slider_switch_2_14px_1-src.svg
Binary files differ.
diff --git a/res/slider_switch_2_14px_1.svg b/res/slider_switch_2_14px_1.svg
Binary files differ.
diff --git a/src/BogaudioModules.hpp b/src/BogaudioModules.hpp
@@ -87,3 +87,10 @@ struct Port24 : SVGPort {
box.size = Vec(24, 24);
}
};
+
+struct SliderSwitch2State14 : SVGSwitch, ToggleSwitch {
+ SliderSwitch2State14() {
+ addFrame(SVG::load(assetPlugin(plugin, "res/slider_switch_2_14px_0.svg")));
+ addFrame(SVG::load(assetPlugin(plugin, "res/slider_switch_2_14px_1.svg")));
+ }
+};
diff --git a/src/DADSRH.cpp b/src/DADSRH.cpp
@@ -147,10 +147,10 @@ DADSRHWidget::DADSRHWidget() {
auto decayShapeParamPosition = Vec(77.02, 180.52);
auto releaseShapeParamPosition = Vec(77.02, 292.52);
auto triggerParamPosition = Vec(90.04, 43.04);
- auto modeParamPosition = Vec(119.9, 96.9);
- auto loopParamPosition = Vec(119.9, 146.9);
- auto speedParamPosition = Vec(19.9, 322.9);
- auto retriggerParamPosition = Vec(54.9, 322.9);
+ auto modeParamPosition = Vec(120.0, 95.0);
+ auto loopParamPosition = Vec(120.0, 145.0);
+ auto speedParamPosition = Vec(20.0, 321.0);
+ auto retriggerParamPosition = Vec(55.0, 321.0);
auto triggerInputPosition = Vec(115.0, 40.0);
@@ -184,10 +184,10 @@ DADSRHWidget::DADSRHWidget() {
addParam(createParam<Button9Toggle3>(decayShapeParamPosition, module, DADSRH::DECAY_SHAPE_PARAM, 1.0, 3.0, 1.0));
addParam(createParam<Button9Toggle3>(releaseShapeParamPosition, module, DADSRH::RELEASE_SHAPE_PARAM, 1.0, 3.0, 1.0));
addParam(createParam<Button18>(triggerParamPosition, module, DADSRH::TRIGGER_PARAM, 0.0, 1.0, 0.0));
- addParam(createParam<CKSS>(modeParamPosition, module, DADSRH::MODE_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(loopParamPosition, module, DADSRH::LOOP_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(speedParamPosition, module, DADSRH::SPEED_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(retriggerParamPosition, module, DADSRH::RETRIGGER_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(modeParamPosition, module, DADSRH::MODE_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, DADSRH::LOOP_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, DADSRH::SPEED_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(retriggerParamPosition, module, DADSRH::RETRIGGER_PARAM, 0.0, 1.0, 1.0));
addInput(createInput<Port24>(triggerInputPosition, module, DADSRH::TRIGGER_INPUT));
diff --git a/src/DADSRHPlus.cpp b/src/DADSRHPlus.cpp
@@ -157,10 +157,10 @@ DADSRHPlusWidget::DADSRHPlusWidget() {
auto decayShapeParamPosition = Vec(77.02, 180.52);
auto releaseShapeParamPosition = Vec(77.02, 292.52);
auto triggerParamPosition = Vec(90.04, 43.04);
- auto modeParamPosition = Vec(119.9, 96.9);
- auto loopParamPosition = Vec(119.9, 146.9);
- auto speedParamPosition = Vec(19.9, 322.9);
- auto retriggerParamPosition = Vec(54.9, 322.9);
+ auto modeParamPosition = Vec(120.0, 95.0);
+ auto loopParamPosition = Vec(120.0, 145.0);
+ auto speedParamPosition = Vec(20.0, 321.0);
+ auto retriggerParamPosition = Vec(55.0, 321.0);
auto delayInputPosition = Vec(152.0, 40.0);
auto attackInputPosition = Vec(152.0, 96.0);
@@ -205,10 +205,10 @@ DADSRHPlusWidget::DADSRHPlusWidget() {
addParam(createParam<Button9Toggle3>(decayShapeParamPosition, module, DADSRHPlus::DECAY_SHAPE_PARAM, 1.0, 3.0, 1.0));
addParam(createParam<Button9Toggle3>(releaseShapeParamPosition, module, DADSRHPlus::RELEASE_SHAPE_PARAM, 1.0, 3.0, 1.0));
addParam(createParam<Button18>(triggerParamPosition, module, DADSRHPlus::TRIGGER_PARAM, 0.0, 1.0, 0.0));
- addParam(createParam<CKSS>(modeParamPosition, module, DADSRHPlus::MODE_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(loopParamPosition, module, DADSRHPlus::LOOP_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(speedParamPosition, module, DADSRHPlus::SPEED_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(retriggerParamPosition, module, DADSRHPlus::RETRIGGER_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(modeParamPosition, module, DADSRHPlus::MODE_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, DADSRHPlus::LOOP_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, DADSRHPlus::SPEED_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(retriggerParamPosition, module, DADSRHPlus::RETRIGGER_PARAM, 0.0, 1.0, 1.0));
addInput(createInput<Port24>(delayInputPosition, module, DADSRHPlus::DELAY_INPUT));
addInput(createInput<Port24>(attackInputPosition, module, DADSRHPlus::ATTACK_INPUT));
diff --git a/src/Shaper.cpp b/src/Shaper.cpp
@@ -113,9 +113,9 @@ ShaperWidget::ShaperWidget() {
auto attackParamPosition = Vec(29.08, 33.08);
auto triggerParamPosition = Vec(89.04, 43.04);
auto onParamPosition = Vec(29.08, 89.08);
- auto speedParamPosition = Vec(118.9, 97.9);
+ auto speedParamPosition = Vec(119.0, 96.0);
auto decayParamPosition = Vec(29.08, 145.08);
- auto loopParamPosition = Vec(118.9, 153.9);
+ auto loopParamPosition = Vec(119.0, 152.0);
auto offParamPosition = Vec(29.08, 201.08);
auto envParamPosition = Vec(82.38, 257.08);
auto signalParamPosition = Vec(82.38, 313.08);
@@ -144,8 +144,8 @@ ShaperWidget::ShaperWidget() {
addParam(createParam<Button18>(triggerParamPosition, module, Shaper::TRIGGER_PARAM, 0.0, 1.0, 0.0));
addInput(createInput<Port24>(triggerInputPosition, module, Shaper::TRIGGER_INPUT));
- addParam(createParam<CKSS>(speedParamPosition, module, Shaper::SPEED_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(loopParamPosition, module, Shaper::LOOP_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, Shaper::SPEED_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, Shaper::LOOP_PARAM, 0.0, 1.0, 1.0));
addOutput(createOutput<Port24>(triggerOutputPosition, module, Shaper::TRIGGER_OUTPUT));
addOutput(createOutput<Port24>(envOutputPosition, module, Shaper::ENV_OUTPUT));
diff --git a/src/ShaperPlus.cpp b/src/ShaperPlus.cpp
@@ -119,9 +119,9 @@ ShaperPlusWidget::ShaperPlusWidget() {
auto attackParamPosition = Vec(29.08, 33.08);
auto triggerParamPosition = Vec(89.04, 43.04);
auto onParamPosition = Vec(29.08, 89.08);
- auto speedParamPosition = Vec(118.9, 97.9);
+ auto speedParamPosition = Vec(119.0, 96.0);
auto decayParamPosition = Vec(29.08, 145.08);
- auto loopParamPosition = Vec(118.9, 153.9);
+ auto loopParamPosition = Vec(119.0, 152.0);
auto offParamPosition = Vec(29.08, 201.08);
auto envParamPosition = Vec(82.38, 257.08);
auto signalParamPosition = Vec(82.38, 313.08);
@@ -160,8 +160,8 @@ ShaperPlusWidget::ShaperPlusWidget() {
addParam(createParam<Button18>(triggerParamPosition, module, ShaperPlus::TRIGGER_PARAM, 0.0, 1.0, 0.0));
addInput(createInput<Port24>(triggerInputPosition, module, ShaperPlus::TRIGGER_INPUT));
- addParam(createParam<CKSS>(speedParamPosition, module, ShaperPlus::SPEED_PARAM, 0.0, 1.0, 1.0));
- addParam(createParam<CKSS>(loopParamPosition, module, ShaperPlus::LOOP_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(speedParamPosition, module, ShaperPlus::SPEED_PARAM, 0.0, 1.0, 1.0));
+ addParam(createParam<SliderSwitch2State14>(loopParamPosition, module, ShaperPlus::LOOP_PARAM, 0.0, 1.0, 1.0));
addOutput(createOutput<Port24>(triggerOutputPosition, module, ShaperPlus::TRIGGER_OUTPUT));
addOutput(createOutput<Port24>(envOutputPosition, module, ShaperPlus::ENV_OUTPUT));
