diff --git a/src/8vert.cpp b/src/8vert.cpp index e8e4913..9aa95f6 100644 --- a/src/8vert.cpp +++ b/src/8vert.cpp @@ -37,44 +37,44 @@ _8vertWidget::_8vertWidget() { box.size = Vec(8 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT); setPanel(SVG::load(assetPlugin(plugin, "res/8vert.svg"))); - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x - 30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x - 30, 365))); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x - 30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x - 30, 365))); - addParam(createParam(Vec(45.308, 47.753), module, 0, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(45.308, 86.198), module, 1, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(45.308, 124.639), module, 2, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(45.308, 163.084), module, 3, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(45.308, 201.529), module, 4, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(45.308, 239.974), module, 5, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(45.308, 278.415), module, 6, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(45.308, 316.86), module, 7, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 47.753), module, 0, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 86.198), module, 1, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 124.639), module, 2, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 163.084), module, 3, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 201.529), module, 4, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 239.974), module, 5, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 278.415), module, 6, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(45.308, 316.86), module, 7, -1.0f, 1.0f, 0.0f)); - addInput(createInput(Vec(9.507, 50.397), module, 0)); - addInput(createInput(Vec(9.507, 88.842), module, 1)); - addInput(createInput(Vec(9.507, 127.283), module, 2)); - addInput(createInput(Vec(9.507, 165.728), module, 3)); - addInput(createInput(Vec(9.507, 204.173), module, 4)); - addInput(createInput(Vec(9.507, 242.614), module, 5)); - addInput(createInput(Vec(9.507, 281.059), module, 6)); - addInput(createInput(Vec(9.507, 319.504), module, 7)); + addInput(Port::create(Vec(9.507, 50.397), Port::INPUT, module, 0)); + addInput(Port::create(Vec(9.507, 88.842), Port::INPUT, module, 1)); + addInput(Port::create(Vec(9.507, 127.283), Port::INPUT, module, 2)); + addInput(Port::create(Vec(9.507, 165.728), Port::INPUT, module, 3)); + addInput(Port::create(Vec(9.507, 204.173), Port::INPUT, module, 4)); + addInput(Port::create(Vec(9.507, 242.614), Port::INPUT, module, 5)); + addInput(Port::create(Vec(9.507, 281.059), Port::INPUT, module, 6)); + addInput(Port::create(Vec(9.507, 319.504), Port::INPUT, module, 7)); - addOutput(createOutput(Vec(86.393, 50.397), module, 0)); - addOutput(createOutput(Vec(86.393, 88.842), module, 1)); - addOutput(createOutput(Vec(86.393, 127.283), module, 2)); - addOutput(createOutput(Vec(86.393, 165.728), module, 3)); - addOutput(createOutput(Vec(86.393, 204.173), module, 4)); - addOutput(createOutput(Vec(86.393, 242.614), module, 5)); - addOutput(createOutput(Vec(86.393, 281.059), module, 6)); - addOutput(createOutput(Vec(86.393, 319.504), module, 7)); + addOutput(Port::create(Vec(86.393, 50.397), Port::OUTPUT, module, 0)); + addOutput(Port::create(Vec(86.393, 88.842), Port::OUTPUT, module, 1)); + addOutput(Port::create(Vec(86.393, 127.283), Port::OUTPUT, module, 2)); + addOutput(Port::create(Vec(86.393, 165.728), Port::OUTPUT, module, 3)); + addOutput(Port::create(Vec(86.393, 204.173), Port::OUTPUT, module, 4)); + addOutput(Port::create(Vec(86.393, 242.614), Port::OUTPUT, module, 5)); + addOutput(Port::create(Vec(86.393, 281.059), Port::OUTPUT, module, 6)); + addOutput(Port::create(Vec(86.393, 319.504), Port::OUTPUT, module, 7)); - addChild(createLight>(Vec(107.702, 50.414), module, 0)); - addChild(createLight>(Vec(107.702, 88.859), module, 2)); - addChild(createLight>(Vec(107.702, 127.304), module, 4)); - addChild(createLight>(Vec(107.702, 165.745), module, 6)); - addChild(createLight>(Vec(107.702, 204.19), module, 8)); - addChild(createLight>(Vec(107.702, 242.635), module, 10)); - addChild(createLight>(Vec(107.702, 281.076), module, 12)); - addChild(createLight>(Vec(107.702, 319.521), module, 14)); + addChild(ModuleLightWidget::create>(Vec(107.702, 50.414), module, 0)); + addChild(ModuleLightWidget::create>(Vec(107.702, 88.859), module, 2)); + addChild(ModuleLightWidget::create>(Vec(107.702, 127.304), module, 4)); + addChild(ModuleLightWidget::create>(Vec(107.702, 165.745), module, 6)); + addChild(ModuleLightWidget::create>(Vec(107.702, 204.19), module, 8)); + addChild(ModuleLightWidget::create>(Vec(107.702, 242.635), module, 10)); + addChild(ModuleLightWidget::create>(Vec(107.702, 281.076), module, 12)); + addChild(ModuleLightWidget::create>(Vec(107.702, 319.521), module, 14)); } diff --git a/src/ADSR.cpp b/src/ADSR.cpp index c30328b..264631d 100644 --- a/src/ADSR.cpp +++ b/src/ADSR.cpp @@ -114,27 +114,27 @@ ADSRWidget::ADSRWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); - - addParam(createParam(Vec(62, 57), module, ADSR::ATTACK_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(62, 124), module, ADSR::DECAY_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(62, 191), module, ADSR::SUSTAIN_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(62, 257), module, ADSR::RELEASE_PARAM, 0.0f, 1.0f, 0.5f)); - - addInput(createInput(Vec(9, 63), module, ADSR::ATTACK_INPUT)); - addInput(createInput(Vec(9, 129), module, ADSR::DECAY_INPUT)); - addInput(createInput(Vec(9, 196), module, ADSR::SUSTAIN_INPUT)); - addInput(createInput(Vec(9, 263), module, ADSR::RELEASE_INPUT)); - - addInput(createInput(Vec(9, 320), module, ADSR::GATE_INPUT)); - addInput(createInput(Vec(48, 320), module, ADSR::TRIG_INPUT)); - addOutput(createOutput(Vec(87, 320), module, ADSR::ENVELOPE_OUTPUT)); - - addChild(createLight>(Vec(94, 41), module, ADSR::ATTACK_LIGHT)); - addChild(createLight>(Vec(94, 109), module, ADSR::DECAY_LIGHT)); - addChild(createLight>(Vec(94, 175), module, ADSR::SUSTAIN_LIGHT)); - addChild(createLight>(Vec(94, 242), module, ADSR::RELEASE_LIGHT)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); + + addParam(ParamWidget::create(Vec(62, 57), module, ADSR::ATTACK_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(62, 124), module, ADSR::DECAY_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(62, 191), module, ADSR::SUSTAIN_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(62, 257), module, ADSR::RELEASE_PARAM, 0.0f, 1.0f, 0.5f)); + + addInput(Port::create(Vec(9, 63), Port::INPUT, module, ADSR::ATTACK_INPUT)); + addInput(Port::create(Vec(9, 129), Port::INPUT, module, ADSR::DECAY_INPUT)); + addInput(Port::create(Vec(9, 196), Port::INPUT, module, ADSR::SUSTAIN_INPUT)); + addInput(Port::create(Vec(9, 263), Port::INPUT, module, ADSR::RELEASE_INPUT)); + + addInput(Port::create(Vec(9, 320), Port::INPUT, module, ADSR::GATE_INPUT)); + addInput(Port::create(Vec(48, 320), Port::INPUT, module, ADSR::TRIG_INPUT)); + addOutput(Port::create(Vec(87, 320), Port::OUTPUT, module, ADSR::ENVELOPE_OUTPUT)); + + addChild(ModuleLightWidget::create>(Vec(94, 41), module, ADSR::ATTACK_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(94, 109), module, ADSR::DECAY_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(94, 175), module, ADSR::SUSTAIN_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(94, 242), module, ADSR::RELEASE_LIGHT)); } diff --git a/src/Delay.cpp b/src/Delay.cpp index c181719..fc1dc9b 100644 --- a/src/Delay.cpp +++ b/src/Delay.cpp @@ -119,20 +119,20 @@ DelayWidget::DelayWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); - - addParam(createParam(Vec(67, 57), module, Delay::TIME_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(67, 123), module, Delay::FEEDBACK_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(67, 190), module, Delay::COLOR_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(67, 257), module, Delay::MIX_PARAM, 0.0f, 1.0f, 0.5f)); - - addInput(createInput(Vec(14, 63), module, Delay::TIME_INPUT)); - addInput(createInput(Vec(14, 129), module, Delay::FEEDBACK_INPUT)); - addInput(createInput(Vec(14, 196), module, Delay::COLOR_INPUT)); - addInput(createInput(Vec(14, 263), module, Delay::MIX_INPUT)); - addInput(createInput(Vec(14, 320), module, Delay::IN_INPUT)); - addOutput(createOutput(Vec(73, 320), module, Delay::OUT_OUTPUT)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); + + addParam(ParamWidget::create(Vec(67, 57), module, Delay::TIME_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(67, 123), module, Delay::FEEDBACK_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(67, 190), module, Delay::COLOR_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(67, 257), module, Delay::MIX_PARAM, 0.0f, 1.0f, 0.5f)); + + addInput(Port::create(Vec(14, 63), Port::INPUT, module, Delay::TIME_INPUT)); + addInput(Port::create(Vec(14, 129), Port::INPUT, module, Delay::FEEDBACK_INPUT)); + addInput(Port::create(Vec(14, 196), Port::INPUT, module, Delay::COLOR_INPUT)); + addInput(Port::create(Vec(14, 263), Port::INPUT, module, Delay::MIX_INPUT)); + addInput(Port::create(Vec(14, 320), Port::INPUT, module, Delay::IN_INPUT)); + addOutput(Port::create(Vec(73, 320), Port::OUTPUT, module, Delay::OUT_OUTPUT)); } diff --git a/src/LFO.cpp b/src/LFO.cpp index e33030a..73b464f 100644 --- a/src/LFO.cpp +++ b/src/LFO.cpp @@ -132,31 +132,31 @@ LFOWidget::LFOWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); - - addParam(createParam(Vec(15, 77), module, LFO::OFFSET_PARAM, 0.0f, 1.0f, 1.0f)); - addParam(createParam(Vec(119, 77), module, LFO::INVERT_PARAM, 0.0f, 1.0f, 1.0f)); - - addParam(createParam(Vec(47, 61), module, LFO::FREQ_PARAM, -8.0f, 6.0f, -1.0f)); - addParam(createParam(Vec(23, 143), module, LFO::FM1_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(91, 143), module, LFO::PW_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(23, 208), module, LFO::FM2_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(91, 208), module, LFO::PWM_PARAM, 0.0f, 1.0f, 0.0f)); - - addInput(createInput(Vec(11, 276), module, LFO::FM1_INPUT)); - addInput(createInput(Vec(45, 276), module, LFO::FM2_INPUT)); - addInput(createInput(Vec(80, 276), module, LFO::RESET_INPUT)); - addInput(createInput(Vec(114, 276), module, LFO::PW_INPUT)); - - addOutput(createOutput(Vec(11, 320), module, LFO::SIN_OUTPUT)); - addOutput(createOutput(Vec(45, 320), module, LFO::TRI_OUTPUT)); - addOutput(createOutput(Vec(80, 320), module, LFO::SAW_OUTPUT)); - addOutput(createOutput(Vec(114, 320), module, LFO::SQR_OUTPUT)); - - addChild(createLight>(Vec(99, 42.5f), module, LFO::PHASE_POS_LIGHT)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); + + addParam(ParamWidget::create(Vec(15, 77), module, LFO::OFFSET_PARAM, 0.0f, 1.0f, 1.0f)); + addParam(ParamWidget::create(Vec(119, 77), module, LFO::INVERT_PARAM, 0.0f, 1.0f, 1.0f)); + + addParam(ParamWidget::create(Vec(47, 61), module, LFO::FREQ_PARAM, -8.0f, 6.0f, -1.0f)); + addParam(ParamWidget::create(Vec(23, 143), module, LFO::FM1_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(91, 143), module, LFO::PW_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(23, 208), module, LFO::FM2_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(91, 208), module, LFO::PWM_PARAM, 0.0f, 1.0f, 0.0f)); + + addInput(Port::create(Vec(11, 276), Port::INPUT, module, LFO::FM1_INPUT)); + addInput(Port::create(Vec(45, 276), Port::INPUT, module, LFO::FM2_INPUT)); + addInput(Port::create(Vec(80, 276), Port::INPUT, module, LFO::RESET_INPUT)); + addInput(Port::create(Vec(114, 276), Port::INPUT, module, LFO::PW_INPUT)); + + addOutput(Port::create(Vec(11, 320), Port::OUTPUT, module, LFO::SIN_OUTPUT)); + addOutput(Port::create(Vec(45, 320), Port::OUTPUT, module, LFO::TRI_OUTPUT)); + addOutput(Port::create(Vec(80, 320), Port::OUTPUT, module, LFO::SAW_OUTPUT)); + addOutput(Port::create(Vec(114, 320), Port::OUTPUT, module, LFO::SQR_OUTPUT)); + + addChild(ModuleLightWidget::create>(Vec(99, 42.5f), module, LFO::PHASE_POS_LIGHT)); } @@ -228,23 +228,23 @@ LFO2Widget::LFO2Widget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); - addParam(createParam(Vec(62, 150), module, LFO2::OFFSET_PARAM, 0.0f, 1.0f, 1.0f)); - addParam(createParam(Vec(62, 215), module, LFO2::INVERT_PARAM, 0.0f, 1.0f, 1.0f)); + addParam(ParamWidget::create(Vec(62, 150), module, LFO2::OFFSET_PARAM, 0.0f, 1.0f, 1.0f)); + addParam(ParamWidget::create(Vec(62, 215), module, LFO2::INVERT_PARAM, 0.0f, 1.0f, 1.0f)); - addParam(createParam(Vec(18, 60), module, LFO2::FREQ_PARAM, -8.0f, 6.0f, -1.0f)); - addParam(createParam(Vec(11, 142), module, LFO2::WAVE_PARAM, 0.0f, 3.0f, 1.5f)); - addParam(createParam(Vec(11, 207), module, LFO2::FM_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(18, 60), module, LFO2::FREQ_PARAM, -8.0f, 6.0f, -1.0f)); + addParam(ParamWidget::create(Vec(11, 142), module, LFO2::WAVE_PARAM, 0.0f, 3.0f, 1.5f)); + addParam(ParamWidget::create(Vec(11, 207), module, LFO2::FM_PARAM, 0.0f, 1.0f, 0.5f)); - addInput(createInput(Vec(11, 276), module, LFO2::FM_INPUT)); - addInput(createInput(Vec(54, 276), module, LFO2::RESET_INPUT)); - addInput(createInput(Vec(11, 319), module, LFO2::WAVE_INPUT)); + addInput(Port::create(Vec(11, 276), Port::INPUT, module, LFO2::FM_INPUT)); + addInput(Port::create(Vec(54, 276), Port::INPUT, module, LFO2::RESET_INPUT)); + addInput(Port::create(Vec(11, 319), Port::INPUT, module, LFO2::WAVE_INPUT)); - addOutput(createOutput(Vec(54, 319), module, LFO2::INTERP_OUTPUT)); + addOutput(Port::create(Vec(54, 319), Port::OUTPUT, module, LFO2::INTERP_OUTPUT)); - addChild(createLight>(Vec(68, 42.5f), module, LFO2::PHASE_POS_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(68, 42.5f), module, LFO2::PHASE_POS_LIGHT)); } diff --git a/src/Mutes.cpp b/src/Mutes.cpp index 5aa1d9b..bbb99f9 100644 --- a/src/Mutes.cpp +++ b/src/Mutes.cpp @@ -91,52 +91,52 @@ MutesWidget::MutesWidget() { setModule(module); setPanel(SVG::load(assetPlugin(plugin, "res/Mutes.svg"))); - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x - 30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x - 30, 365))); - - addParam(createParam(mm2px(Vec(16.57, 18.165)), module, Mutes::MUTE_PARAM + 0, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 28.164)), module, Mutes::MUTE_PARAM + 1, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 38.164)), module, Mutes::MUTE_PARAM + 2, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 48.165)), module, Mutes::MUTE_PARAM + 3, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 58.164)), module, Mutes::MUTE_PARAM + 4, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 68.165)), module, Mutes::MUTE_PARAM + 5, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 78.164)), module, Mutes::MUTE_PARAM + 6, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 88.164)), module, Mutes::MUTE_PARAM + 7, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 98.165)), module, Mutes::MUTE_PARAM + 8, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(16.57, 108.166)), module, Mutes::MUTE_PARAM + 9, 0.0f, 1.0f, 0.0f)); - - addInput(createInput(mm2px(Vec(4.214, 17.81)), module, Mutes::IN_INPUT + 0)); - addInput(createInput(mm2px(Vec(4.214, 27.809)), module, Mutes::IN_INPUT + 1)); - addInput(createInput(mm2px(Vec(4.214, 37.809)), module, Mutes::IN_INPUT + 2)); - addInput(createInput(mm2px(Vec(4.214, 47.81)), module, Mutes::IN_INPUT + 3)); - addInput(createInput(mm2px(Vec(4.214, 57.81)), module, Mutes::IN_INPUT + 4)); - addInput(createInput(mm2px(Vec(4.214, 67.809)), module, Mutes::IN_INPUT + 5)); - addInput(createInput(mm2px(Vec(4.214, 77.81)), module, Mutes::IN_INPUT + 6)); - addInput(createInput(mm2px(Vec(4.214, 87.81)), module, Mutes::IN_INPUT + 7)); - addInput(createInput(mm2px(Vec(4.214, 97.809)), module, Mutes::IN_INPUT + 8)); - addInput(createInput(mm2px(Vec(4.214, 107.809)), module, Mutes::IN_INPUT + 9)); - - addOutput(createOutput(mm2px(Vec(28.214, 17.81)), module, Mutes::OUT_OUTPUT + 0)); - addOutput(createOutput(mm2px(Vec(28.214, 27.809)), module, Mutes::OUT_OUTPUT + 1)); - addOutput(createOutput(mm2px(Vec(28.214, 37.809)), module, Mutes::OUT_OUTPUT + 2)); - addOutput(createOutput(mm2px(Vec(28.214, 47.81)), module, Mutes::OUT_OUTPUT + 3)); - addOutput(createOutput(mm2px(Vec(28.214, 57.809)), module, Mutes::OUT_OUTPUT + 4)); - addOutput(createOutput(mm2px(Vec(28.214, 67.809)), module, Mutes::OUT_OUTPUT + 5)); - addOutput(createOutput(mm2px(Vec(28.214, 77.81)), module, Mutes::OUT_OUTPUT + 6)); - addOutput(createOutput(mm2px(Vec(28.214, 87.81)), module, Mutes::OUT_OUTPUT + 7)); - addOutput(createOutput(mm2px(Vec(28.214, 97.809)), module, Mutes::OUT_OUTPUT + 8)); - addOutput(createOutput(mm2px(Vec(28.214, 107.809)), module, Mutes::OUT_OUTPUT + 9)); - - addChild(createLight>(mm2px(Vec(17.32, 18.915)), module, Mutes::MUTE_LIGHT + 0)); - addChild(createLight>(mm2px(Vec(17.32, 28.916)), module, Mutes::MUTE_LIGHT + 1)); - addChild(createLight>(mm2px(Vec(17.32, 38.915)), module, Mutes::MUTE_LIGHT + 2)); - addChild(createLight>(mm2px(Vec(17.32, 48.915)), module, Mutes::MUTE_LIGHT + 3)); - addChild(createLight>(mm2px(Vec(17.32, 58.916)), module, Mutes::MUTE_LIGHT + 4)); - addChild(createLight>(mm2px(Vec(17.32, 68.916)), module, Mutes::MUTE_LIGHT + 5)); - addChild(createLight>(mm2px(Vec(17.32, 78.915)), module, Mutes::MUTE_LIGHT + 6)); - addChild(createLight>(mm2px(Vec(17.32, 88.916)), module, Mutes::MUTE_LIGHT + 7)); - addChild(createLight>(mm2px(Vec(17.32, 98.915)), module, Mutes::MUTE_LIGHT + 8)); - addChild(createLight>(mm2px(Vec(17.32, 108.915)), module, Mutes::MUTE_LIGHT + 9)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x - 30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x - 30, 365))); + + addParam(ParamWidget::create(mm2px(Vec(16.57, 18.165)), module, Mutes::MUTE_PARAM + 0, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 28.164)), module, Mutes::MUTE_PARAM + 1, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 38.164)), module, Mutes::MUTE_PARAM + 2, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 48.165)), module, Mutes::MUTE_PARAM + 3, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 58.164)), module, Mutes::MUTE_PARAM + 4, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 68.165)), module, Mutes::MUTE_PARAM + 5, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 78.164)), module, Mutes::MUTE_PARAM + 6, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 88.164)), module, Mutes::MUTE_PARAM + 7, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 98.165)), module, Mutes::MUTE_PARAM + 8, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(16.57, 108.166)), module, Mutes::MUTE_PARAM + 9, 0.0f, 1.0f, 0.0f)); + + addInput(Port::create(mm2px(Vec(4.214, 17.81)), Port::INPUT, module, Mutes::IN_INPUT + 0)); + addInput(Port::create(mm2px(Vec(4.214, 27.809)), Port::INPUT, module, Mutes::IN_INPUT + 1)); + addInput(Port::create(mm2px(Vec(4.214, 37.809)), Port::INPUT, module, Mutes::IN_INPUT + 2)); + addInput(Port::create(mm2px(Vec(4.214, 47.81)), Port::INPUT, module, Mutes::IN_INPUT + 3)); + addInput(Port::create(mm2px(Vec(4.214, 57.81)), Port::INPUT, module, Mutes::IN_INPUT + 4)); + addInput(Port::create(mm2px(Vec(4.214, 67.809)), Port::INPUT, module, Mutes::IN_INPUT + 5)); + addInput(Port::create(mm2px(Vec(4.214, 77.81)), Port::INPUT, module, Mutes::IN_INPUT + 6)); + addInput(Port::create(mm2px(Vec(4.214, 87.81)), Port::INPUT, module, Mutes::IN_INPUT + 7)); + addInput(Port::create(mm2px(Vec(4.214, 97.809)), Port::INPUT, module, Mutes::IN_INPUT + 8)); + addInput(Port::create(mm2px(Vec(4.214, 107.809)), Port::INPUT, module, Mutes::IN_INPUT + 9)); + + addOutput(Port::create(mm2px(Vec(28.214, 17.81)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 0)); + addOutput(Port::create(mm2px(Vec(28.214, 27.809)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 1)); + addOutput(Port::create(mm2px(Vec(28.214, 37.809)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 2)); + addOutput(Port::create(mm2px(Vec(28.214, 47.81)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 3)); + addOutput(Port::create(mm2px(Vec(28.214, 57.809)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 4)); + addOutput(Port::create(mm2px(Vec(28.214, 67.809)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 5)); + addOutput(Port::create(mm2px(Vec(28.214, 77.81)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 6)); + addOutput(Port::create(mm2px(Vec(28.214, 87.81)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 7)); + addOutput(Port::create(mm2px(Vec(28.214, 97.809)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 8)); + addOutput(Port::create(mm2px(Vec(28.214, 107.809)), Port::OUTPUT, module, Mutes::OUT_OUTPUT + 9)); + + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 18.915)), module, Mutes::MUTE_LIGHT + 0)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 28.916)), module, Mutes::MUTE_LIGHT + 1)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 38.915)), module, Mutes::MUTE_LIGHT + 2)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 48.915)), module, Mutes::MUTE_LIGHT + 3)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 58.916)), module, Mutes::MUTE_LIGHT + 4)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 68.916)), module, Mutes::MUTE_LIGHT + 5)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 78.915)), module, Mutes::MUTE_LIGHT + 6)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 88.916)), module, Mutes::MUTE_LIGHT + 7)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 98.915)), module, Mutes::MUTE_LIGHT + 8)); + addChild(ModuleLightWidget::create>(mm2px(Vec(17.32, 108.915)), module, Mutes::MUTE_LIGHT + 9)); } diff --git a/src/SEQ3.cpp b/src/SEQ3.cpp index 5b86708..686ab8c 100644 --- a/src/SEQ3.cpp +++ b/src/SEQ3.cpp @@ -223,39 +223,39 @@ SEQ3Widget::SEQ3Widget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); - - addParam(createParam(Vec(18, 56), module, SEQ3::CLOCK_PARAM, -2.0f, 6.0f, 2.0f)); - addParam(createParam(Vec(60, 61-1), module, SEQ3::RUN_PARAM, 0.0f, 1.0f, 0.0f)); - addChild(createLight>(Vec(64.4f, 64.4f), module, SEQ3::RUNNING_LIGHT)); - addParam(createParam(Vec(99, 61-1), module, SEQ3::RESET_PARAM, 0.0f, 1.0f, 0.0f)); - addChild(createLight>(Vec(103.4f, 64.4f), module, SEQ3::RESET_LIGHT)); - addParam(createParam(Vec(132, 56), module, SEQ3::STEPS_PARAM, 1.0f, 8.0f, 8.0f)); - addChild(createLight>(Vec(179.4f, 64.4f), module, SEQ3::GATES_LIGHT)); - addChild(createLight>(Vec(218.4f, 64.4f), module, SEQ3::ROW_LIGHTS)); - addChild(createLight>(Vec(256.4f, 64.4f), module, SEQ3::ROW_LIGHTS + 1)); - addChild(createLight>(Vec(295.4f, 64.4f), module, SEQ3::ROW_LIGHTS + 2)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); + + addParam(ParamWidget::create(Vec(18, 56), module, SEQ3::CLOCK_PARAM, -2.0f, 6.0f, 2.0f)); + addParam(ParamWidget::create(Vec(60, 61-1), module, SEQ3::RUN_PARAM, 0.0f, 1.0f, 0.0f)); + addChild(ModuleLightWidget::create>(Vec(64.4f, 64.4f), module, SEQ3::RUNNING_LIGHT)); + addParam(ParamWidget::create(Vec(99, 61-1), module, SEQ3::RESET_PARAM, 0.0f, 1.0f, 0.0f)); + addChild(ModuleLightWidget::create>(Vec(103.4f, 64.4f), module, SEQ3::RESET_LIGHT)); + addParam(ParamWidget::create(Vec(132, 56), module, SEQ3::STEPS_PARAM, 1.0f, 8.0f, 8.0f)); + addChild(ModuleLightWidget::create>(Vec(179.4f, 64.4f), module, SEQ3::GATES_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(218.4f, 64.4f), module, SEQ3::ROW_LIGHTS)); + addChild(ModuleLightWidget::create>(Vec(256.4f, 64.4f), module, SEQ3::ROW_LIGHTS + 1)); + addChild(ModuleLightWidget::create>(Vec(295.4f, 64.4f), module, SEQ3::ROW_LIGHTS + 2)); static const float portX[8] = {20, 58, 96, 135, 173, 212, 250, 289}; - addInput(createInput(Vec(portX[0]-1, 98), module, SEQ3::CLOCK_INPUT)); - addInput(createInput(Vec(portX[1]-1, 98), module, SEQ3::EXT_CLOCK_INPUT)); - addInput(createInput(Vec(portX[2]-1, 98), module, SEQ3::RESET_INPUT)); - addInput(createInput(Vec(portX[3]-1, 98), module, SEQ3::STEPS_INPUT)); - addOutput(createOutput(Vec(portX[4]-1, 98), module, SEQ3::GATES_OUTPUT)); - addOutput(createOutput(Vec(portX[5]-1, 98), module, SEQ3::ROW1_OUTPUT)); - addOutput(createOutput(Vec(portX[6]-1, 98), module, SEQ3::ROW2_OUTPUT)); - addOutput(createOutput(Vec(portX[7]-1, 98), module, SEQ3::ROW3_OUTPUT)); + addInput(Port::create(Vec(portX[0]-1, 98), Port::INPUT, module, SEQ3::CLOCK_INPUT)); + addInput(Port::create(Vec(portX[1]-1, 98), Port::INPUT, module, SEQ3::EXT_CLOCK_INPUT)); + addInput(Port::create(Vec(portX[2]-1, 98), Port::INPUT, module, SEQ3::RESET_INPUT)); + addInput(Port::create(Vec(portX[3]-1, 98), Port::INPUT, module, SEQ3::STEPS_INPUT)); + addOutput(Port::create(Vec(portX[4]-1, 98), Port::OUTPUT, module, SEQ3::GATES_OUTPUT)); + addOutput(Port::create(Vec(portX[5]-1, 98), Port::OUTPUT, module, SEQ3::ROW1_OUTPUT)); + addOutput(Port::create(Vec(portX[6]-1, 98), Port::OUTPUT, module, SEQ3::ROW2_OUTPUT)); + addOutput(Port::create(Vec(portX[7]-1, 98), Port::OUTPUT, module, SEQ3::ROW3_OUTPUT)); for (int i = 0; i < 8; i++) { - addParam(createParam(Vec(portX[i]-2, 157), module, SEQ3::ROW1_PARAM + i, 0.0f, 10.0f, 0.0f)); - addParam(createParam(Vec(portX[i]-2, 198), module, SEQ3::ROW2_PARAM + i, 0.0f, 10.0f, 0.0f)); - addParam(createParam(Vec(portX[i]-2, 240), module, SEQ3::ROW3_PARAM + i, 0.0f, 10.0f, 0.0f)); - addParam(createParam(Vec(portX[i]+2, 278-1), module, SEQ3::GATE_PARAM + i, 0.0f, 1.0f, 0.0f)); - addChild(createLight>(Vec(portX[i]+6.4f, 281.4f), module, SEQ3::GATE_LIGHTS + i)); - addOutput(createOutput(Vec(portX[i]-1, 307), module, SEQ3::GATE_OUTPUT + i)); + addParam(ParamWidget::create(Vec(portX[i]-2, 157), module, SEQ3::ROW1_PARAM + i, 0.0f, 10.0f, 0.0f)); + addParam(ParamWidget::create(Vec(portX[i]-2, 198), module, SEQ3::ROW2_PARAM + i, 0.0f, 10.0f, 0.0f)); + addParam(ParamWidget::create(Vec(portX[i]-2, 240), module, SEQ3::ROW3_PARAM + i, 0.0f, 10.0f, 0.0f)); + addParam(ParamWidget::create(Vec(portX[i]+2, 278-1), module, SEQ3::GATE_PARAM + i, 0.0f, 1.0f, 0.0f)); + addChild(ModuleLightWidget::create>(Vec(portX[i]+6.4f, 281.4f), module, SEQ3::GATE_LIGHTS + i)); + addOutput(Port::create(Vec(portX[i]-1, 307), Port::OUTPUT, module, SEQ3::GATE_OUTPUT + i)); } } diff --git a/src/Scope.cpp b/src/Scope.cpp index 36b7977..59c8b56 100644 --- a/src/Scope.cpp +++ b/src/Scope.cpp @@ -311,10 +311,10 @@ ScopeWidget::ScopeWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); { ScopeDisplay *display = new ScopeDisplay(); @@ -324,21 +324,21 @@ ScopeWidget::ScopeWidget() { addChild(display); } - addParam(createParam(Vec(15, 209), module, Scope::X_SCALE_PARAM, -2.0f, 8.0f, 0.0f)); - addParam(createParam(Vec(15, 263), module, Scope::X_POS_PARAM, -10.0f, 10.0f, 0.0f)); - addParam(createParam(Vec(61, 209), module, Scope::Y_SCALE_PARAM, -2.0f, 8.0f, 0.0f)); - addParam(createParam(Vec(61, 263), module, Scope::Y_POS_PARAM, -10.0f, 10.0f, 0.0f)); - addParam(createParam(Vec(107, 209), module, Scope::TIME_PARAM, -6.0f, -16.0f, -14.0f)); - addParam(createParam(Vec(106, 262), module, Scope::LISSAJOUS_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(153, 209), module, Scope::TRIG_PARAM, -10.0f, 10.0f, 0.0f)); - addParam(createParam(Vec(152, 262), module, Scope::EXTERNAL_PARAM, 0.0f, 1.0f, 0.0f)); - - addInput(createInput(Vec(17, 319), module, Scope::X_INPUT)); - addInput(createInput(Vec(63, 319), module, Scope::Y_INPUT)); - addInput(createInput(Vec(154, 319), module, Scope::TRIG_INPUT)); - - addChild(createLight>(Vec(104, 251), module, Scope::PLOT_LIGHT)); - addChild(createLight>(Vec(104, 296), module, Scope::LISSAJOUS_LIGHT)); - addChild(createLight>(Vec(150, 251), module, Scope::INTERNAL_LIGHT)); - addChild(createLight>(Vec(150, 296), module, Scope::EXTERNAL_LIGHT)); + addParam(ParamWidget::create(Vec(15, 209), module, Scope::X_SCALE_PARAM, -2.0f, 8.0f, 0.0f)); + addParam(ParamWidget::create(Vec(15, 263), module, Scope::X_POS_PARAM, -10.0f, 10.0f, 0.0f)); + addParam(ParamWidget::create(Vec(61, 209), module, Scope::Y_SCALE_PARAM, -2.0f, 8.0f, 0.0f)); + addParam(ParamWidget::create(Vec(61, 263), module, Scope::Y_POS_PARAM, -10.0f, 10.0f, 0.0f)); + addParam(ParamWidget::create(Vec(107, 209), module, Scope::TIME_PARAM, -6.0f, -16.0f, -14.0f)); + addParam(ParamWidget::create(Vec(106, 262), module, Scope::LISSAJOUS_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(153, 209), module, Scope::TRIG_PARAM, -10.0f, 10.0f, 0.0f)); + addParam(ParamWidget::create(Vec(152, 262), module, Scope::EXTERNAL_PARAM, 0.0f, 1.0f, 0.0f)); + + addInput(Port::create(Vec(17, 319), Port::INPUT, module, Scope::X_INPUT)); + addInput(Port::create(Vec(63, 319), Port::INPUT, module, Scope::Y_INPUT)); + addInput(Port::create(Vec(154, 319), Port::INPUT, module, Scope::TRIG_INPUT)); + + addChild(ModuleLightWidget::create>(Vec(104, 251), module, Scope::PLOT_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(104, 296), module, Scope::LISSAJOUS_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(150, 251), module, Scope::INTERNAL_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(150, 296), module, Scope::EXTERNAL_LIGHT)); } diff --git a/src/SequentialSwitch.cpp b/src/SequentialSwitch.cpp index d9f0d9f..ac2780b 100644 --- a/src/SequentialSwitch.cpp +++ b/src/SequentialSwitch.cpp @@ -81,24 +81,24 @@ SequentialSwitch1Widget::SequentialSwitch1Widget() { setModule(module); setPanel(SVG::load(assetPlugin(plugin, "res/SequentialSwitch1.svg"))); - addChild(createScrew(Vec(RACK_GRID_WIDTH, 0))); - addChild(createScrew(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); + addChild(Widget::create(Vec(RACK_GRID_WIDTH, 0))); + addChild(Widget::create(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); - addParam(createParam(mm2px(Vec(5.24619, 46.9153)), module, TSequentialSwitch::CHANNELS_PARAM, 0.0f, 2.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(5.24619, 46.9153)), module, TSequentialSwitch::CHANNELS_PARAM, 0.0f, 2.0f, 0.0f)); - addInput(createInput(mm2px(Vec(3.51398, 17.694)), module, TSequentialSwitch::CLOCK_INPUT)); - addInput(createInput(mm2px(Vec(3.51398, 32.1896)), module, TSequentialSwitch::RESET_INPUT)); - addInput(createInput(mm2px(Vec(3.51536, 62.8096)), module, TSequentialSwitch::IN_INPUT + 0)); + addInput(Port::create(mm2px(Vec(3.51398, 17.694)), Port::INPUT, module, TSequentialSwitch::CLOCK_INPUT)); + addInput(Port::create(mm2px(Vec(3.51398, 32.1896)), Port::INPUT, module, TSequentialSwitch::RESET_INPUT)); + addInput(Port::create(mm2px(Vec(3.51536, 62.8096)), Port::INPUT, module, TSequentialSwitch::IN_INPUT + 0)); - addOutput(createOutput(mm2px(Vec(3.51536, 77.8095)), module, TSequentialSwitch::OUT_OUTPUT + 0)); - addOutput(createOutput(mm2px(Vec(3.51398, 87.8113)), module, TSequentialSwitch::OUT_OUTPUT + 1)); - addOutput(createOutput(mm2px(Vec(3.51398, 97.809)), module, TSequentialSwitch::OUT_OUTPUT + 2)); - addOutput(createOutput(mm2px(Vec(3.51398, 107.809)), module, TSequentialSwitch::OUT_OUTPUT + 3)); + addOutput(Port::create(mm2px(Vec(3.51536, 77.8095)), Port::OUTPUT, module, TSequentialSwitch::OUT_OUTPUT + 0)); + addOutput(Port::create(mm2px(Vec(3.51398, 87.8113)), Port::OUTPUT, module, TSequentialSwitch::OUT_OUTPUT + 1)); + addOutput(Port::create(mm2px(Vec(3.51398, 97.809)), Port::OUTPUT, module, TSequentialSwitch::OUT_OUTPUT + 2)); + addOutput(Port::create(mm2px(Vec(3.51398, 107.809)), Port::OUTPUT, module, TSequentialSwitch::OUT_OUTPUT + 3)); - addChild(createLight>(mm2px(Vec(10.8203, 77.7158)), module, TSequentialSwitch::CHANNEL_LIGHT + 0)); - addChild(createLight>(mm2px(Vec(10.8203, 87.7163)), module, TSequentialSwitch::CHANNEL_LIGHT + 1)); - addChild(createLight>(mm2px(Vec(10.8203, 97.7167)), module, TSequentialSwitch::CHANNEL_LIGHT + 2)); - addChild(createLight>(mm2px(Vec(10.8203, 107.716)), module, TSequentialSwitch::CHANNEL_LIGHT + 3)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.8203, 77.7158)), module, TSequentialSwitch::CHANNEL_LIGHT + 0)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.8203, 87.7163)), module, TSequentialSwitch::CHANNEL_LIGHT + 1)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.8203, 97.7167)), module, TSequentialSwitch::CHANNEL_LIGHT + 2)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.8203, 107.716)), module, TSequentialSwitch::CHANNEL_LIGHT + 3)); } @@ -108,22 +108,22 @@ SequentialSwitch2Widget::SequentialSwitch2Widget() { setModule(module); setPanel(SVG::load(assetPlugin(plugin, "res/SequentialSwitch2.svg"))); - addChild(createScrew(Vec(RACK_GRID_WIDTH, 0))); - addChild(createScrew(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); + addChild(Widget::create(Vec(RACK_GRID_WIDTH, 0))); + addChild(Widget::create(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH))); - addParam(createParam(mm2px(Vec(5.24619, 46.9153)), module, TSequentialSwitch::CHANNELS_PARAM, 0.0f, 2.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(5.24619, 46.9153)), module, TSequentialSwitch::CHANNELS_PARAM, 0.0f, 2.0f, 0.0f)); - addInput(createInput(mm2px(Vec(3.51398, 17.694)), module, TSequentialSwitch::CLOCK_INPUT)); - addInput(createInput(mm2px(Vec(3.51398, 32.191)), module, TSequentialSwitch::RESET_INPUT)); - addInput(createInput(mm2px(Vec(3.51398, 62.811)), module, TSequentialSwitch::IN_INPUT + 0)); - addInput(createInput(mm2px(Vec(3.51398, 72.8114)), module, TSequentialSwitch::IN_INPUT + 1)); - addInput(createInput(mm2px(Vec(3.51398, 82.8091)), module, TSequentialSwitch::IN_INPUT + 2)); - addInput(createInput(mm2px(Vec(3.51398, 92.8109)), module, TSequentialSwitch::IN_INPUT + 3)); + addInput(Port::create(mm2px(Vec(3.51398, 17.694)), Port::INPUT, module, TSequentialSwitch::CLOCK_INPUT)); + addInput(Port::create(mm2px(Vec(3.51398, 32.191)), Port::INPUT, module, TSequentialSwitch::RESET_INPUT)); + addInput(Port::create(mm2px(Vec(3.51398, 62.811)), Port::INPUT, module, TSequentialSwitch::IN_INPUT + 0)); + addInput(Port::create(mm2px(Vec(3.51398, 72.8114)), Port::INPUT, module, TSequentialSwitch::IN_INPUT + 1)); + addInput(Port::create(mm2px(Vec(3.51398, 82.8091)), Port::INPUT, module, TSequentialSwitch::IN_INPUT + 2)); + addInput(Port::create(mm2px(Vec(3.51398, 92.8109)), Port::INPUT, module, TSequentialSwitch::IN_INPUT + 3)); - addOutput(createOutput(mm2px(Vec(3.51398, 107.622)), module, TSequentialSwitch::OUT_OUTPUT + 0)); + addOutput(Port::create(mm2px(Vec(3.51398, 107.622)), Port::OUTPUT, module, TSequentialSwitch::OUT_OUTPUT + 0)); - addChild(createLight>(mm2px(Vec(10.7321, 62.6277)), module, TSequentialSwitch::CHANNEL_LIGHT + 0)); - addChild(createLight>(mm2px(Vec(10.7321, 72.6281)), module, TSequentialSwitch::CHANNEL_LIGHT + 1)); - addChild(createLight>(mm2px(Vec(10.7321, 82.6285)), module, TSequentialSwitch::CHANNEL_LIGHT + 2)); - addChild(createLight>(mm2px(Vec(10.7321, 92.6276)), module, TSequentialSwitch::CHANNEL_LIGHT + 3)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.7321, 62.6277)), module, TSequentialSwitch::CHANNEL_LIGHT + 0)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.7321, 72.6281)), module, TSequentialSwitch::CHANNEL_LIGHT + 1)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.7321, 82.6285)), module, TSequentialSwitch::CHANNEL_LIGHT + 2)); + addChild(ModuleLightWidget::create>(mm2px(Vec(10.7321, 92.6276)), module, TSequentialSwitch::CHANNEL_LIGHT + 3)); } diff --git a/src/Unity.cpp b/src/Unity.cpp index 539dad0..648a871 100644 --- a/src/Unity.cpp +++ b/src/Unity.cpp @@ -95,42 +95,42 @@ UnityWidget::UnityWidget() { setModule(module); setPanel(SVG::load(assetPlugin(plugin, "res/Unity.svg"))); - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x - 30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x - 30, 365))); - - addParam(createParam(mm2px(Vec(12.867, 52.961)), module, Unity::AVG1_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(mm2px(Vec(12.867, 107.006)), module, Unity::AVG2_PARAM, 0.0f, 1.0f, 0.0f)); - - addInput(createInput(mm2px(Vec(2.361, 17.144)), module, Unity::IN1_INPUT + 0)); - addInput(createInput(mm2px(Vec(19.907, 17.144)), module, Unity::IN1_INPUT + 1)); - addInput(createInput(mm2px(Vec(2.361, 28.145)), module, Unity::IN1_INPUT + 2)); - addInput(createInput(mm2px(Vec(19.907, 28.145)), module, Unity::IN1_INPUT + 3)); - addInput(createInput(mm2px(Vec(2.361, 39.145)), module, Unity::IN1_INPUT + 4)); - addInput(createInput(mm2px(Vec(19.907, 39.145)), module, Unity::IN1_INPUT + 5)); - addInput(createInput(mm2px(Vec(2.361, 71.145)), module, Unity::IN2_INPUT + 0)); - addInput(createInput(mm2px(Vec(19.907, 71.145)), module, Unity::IN2_INPUT + 1)); - addInput(createInput(mm2px(Vec(2.361, 82.145)), module, Unity::IN2_INPUT + 2)); - addInput(createInput(mm2px(Vec(19.907, 82.145)), module, Unity::IN2_INPUT + 3)); - addInput(createInput(mm2px(Vec(2.361, 93.144)), module, Unity::IN2_INPUT + 4)); - addInput(createInput(mm2px(Vec(19.907, 93.144)), module, Unity::IN2_INPUT + 5)); - - addOutput(createOutput(mm2px(Vec(2.361, 54.15)), module, Unity::MIX1_OUTPUT)); - addOutput(createOutput(mm2px(Vec(19.907, 54.15)), module, Unity::INV1_OUTPUT)); - addOutput(createOutput(mm2px(Vec(2.361, 108.144)), module, Unity::MIX2_OUTPUT)); - addOutput(createOutput(mm2px(Vec(19.907, 108.144)), module, Unity::INV2_OUTPUT)); - - addChild(createLight>(mm2px(Vec(13.652, 19.663)), module, Unity::VU1_LIGHT + 0)); - addChild(createLight>(mm2px(Vec(13.652, 25.163)), module, Unity::VU1_LIGHT + 1)); - addChild(createLight>(mm2px(Vec(13.652, 30.663)), module, Unity::VU1_LIGHT + 2)); - addChild(createLight>(mm2px(Vec(13.652, 36.162)), module, Unity::VU1_LIGHT + 3)); - addChild(createLight>(mm2px(Vec(13.652, 41.662)), module, Unity::VU1_LIGHT + 4)); - addChild(createLight>(mm2px(Vec(13.652, 73.663)), module, Unity::VU2_LIGHT + 0)); - addChild(createLight>(mm2px(Vec(13.652, 79.163)), module, Unity::VU2_LIGHT + 1)); - addChild(createLight>(mm2px(Vec(13.652, 84.663)), module, Unity::VU2_LIGHT + 2)); - addChild(createLight>(mm2px(Vec(13.652, 90.162)), module, Unity::VU2_LIGHT + 3)); - addChild(createLight>(mm2px(Vec(13.652, 95.662)), module, Unity::VU2_LIGHT + 4)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x - 30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x - 30, 365))); + + addParam(ParamWidget::create(mm2px(Vec(12.867, 52.961)), module, Unity::AVG1_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(mm2px(Vec(12.867, 107.006)), module, Unity::AVG2_PARAM, 0.0f, 1.0f, 0.0f)); + + addInput(Port::create(mm2px(Vec(2.361, 17.144)), Port::INPUT, module, Unity::IN1_INPUT + 0)); + addInput(Port::create(mm2px(Vec(19.907, 17.144)), Port::INPUT, module, Unity::IN1_INPUT + 1)); + addInput(Port::create(mm2px(Vec(2.361, 28.145)), Port::INPUT, module, Unity::IN1_INPUT + 2)); + addInput(Port::create(mm2px(Vec(19.907, 28.145)), Port::INPUT, module, Unity::IN1_INPUT + 3)); + addInput(Port::create(mm2px(Vec(2.361, 39.145)), Port::INPUT, module, Unity::IN1_INPUT + 4)); + addInput(Port::create(mm2px(Vec(19.907, 39.145)), Port::INPUT, module, Unity::IN1_INPUT + 5)); + addInput(Port::create(mm2px(Vec(2.361, 71.145)), Port::INPUT, module, Unity::IN2_INPUT + 0)); + addInput(Port::create(mm2px(Vec(19.907, 71.145)), Port::INPUT, module, Unity::IN2_INPUT + 1)); + addInput(Port::create(mm2px(Vec(2.361, 82.145)), Port::INPUT, module, Unity::IN2_INPUT + 2)); + addInput(Port::create(mm2px(Vec(19.907, 82.145)), Port::INPUT, module, Unity::IN2_INPUT + 3)); + addInput(Port::create(mm2px(Vec(2.361, 93.144)), Port::INPUT, module, Unity::IN2_INPUT + 4)); + addInput(Port::create(mm2px(Vec(19.907, 93.144)), Port::INPUT, module, Unity::IN2_INPUT + 5)); + + addOutput(Port::create(mm2px(Vec(2.361, 54.15)), Port::OUTPUT, module, Unity::MIX1_OUTPUT)); + addOutput(Port::create(mm2px(Vec(19.907, 54.15)), Port::OUTPUT, module, Unity::INV1_OUTPUT)); + addOutput(Port::create(mm2px(Vec(2.361, 108.144)), Port::OUTPUT, module, Unity::MIX2_OUTPUT)); + addOutput(Port::create(mm2px(Vec(19.907, 108.144)), Port::OUTPUT, module, Unity::INV2_OUTPUT)); + + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 19.663)), module, Unity::VU1_LIGHT + 0)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 25.163)), module, Unity::VU1_LIGHT + 1)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 30.663)), module, Unity::VU1_LIGHT + 2)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 36.162)), module, Unity::VU1_LIGHT + 3)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 41.662)), module, Unity::VU1_LIGHT + 4)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 73.663)), module, Unity::VU2_LIGHT + 0)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 79.163)), module, Unity::VU2_LIGHT + 1)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 84.663)), module, Unity::VU2_LIGHT + 2)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 90.162)), module, Unity::VU2_LIGHT + 3)); + addChild(ModuleLightWidget::create>(mm2px(Vec(13.652, 95.662)), module, Unity::VU2_LIGHT + 4)); } diff --git a/src/VCA.cpp b/src/VCA.cpp index f386e21..30e505b 100644 --- a/src/VCA.cpp +++ b/src/VCA.cpp @@ -55,21 +55,21 @@ VCAWidget::VCAWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); - addParam(createParam(Vec(27, 57), module, VCA::LEVEL1_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(27, 222), module, VCA::LEVEL2_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(27, 57), module, VCA::LEVEL1_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(27, 222), module, VCA::LEVEL2_PARAM, 0.0f, 1.0f, 0.5f)); - addInput(createInput(Vec(11, 113), module, VCA::EXP1_INPUT)); - addInput(createInput(Vec(54, 113), module, VCA::LIN1_INPUT)); - addInput(createInput(Vec(11, 156), module, VCA::IN1_INPUT)); - addInput(createInput(Vec(11, 276), module, VCA::EXP2_INPUT)); - addInput(createInput(Vec(54, 276), module, VCA::LIN2_INPUT)); - addInput(createInput(Vec(11, 320), module, VCA::IN2_INPUT)); + addInput(Port::create(Vec(11, 113), Port::INPUT, module, VCA::EXP1_INPUT)); + addInput(Port::create(Vec(54, 113), Port::INPUT, module, VCA::LIN1_INPUT)); + addInput(Port::create(Vec(11, 156), Port::INPUT, module, VCA::IN1_INPUT)); + addInput(Port::create(Vec(11, 276), Port::INPUT, module, VCA::EXP2_INPUT)); + addInput(Port::create(Vec(54, 276), Port::INPUT, module, VCA::LIN2_INPUT)); + addInput(Port::create(Vec(11, 320), Port::INPUT, module, VCA::IN2_INPUT)); - addOutput(createOutput(Vec(54, 156), module, VCA::OUT1_OUTPUT)); - addOutput(createOutput(Vec(54, 320), module, VCA::OUT2_OUTPUT)); + addOutput(Port::create(Vec(54, 156), Port::OUTPUT, module, VCA::OUT1_OUTPUT)); + addOutput(Port::create(Vec(54, 320), Port::OUTPUT, module, VCA::OUT2_OUTPUT)); } diff --git a/src/VCF.cpp b/src/VCF.cpp index ddc4040..6ea924e 100644 --- a/src/VCF.cpp +++ b/src/VCF.cpp @@ -156,22 +156,22 @@ VCFWidget::VCFWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); - - addParam(createParam(Vec(33, 61), module, VCF::FREQ_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(12, 143), module, VCF::FINE_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(71, 143), module, VCF::RES_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(12, 208), module, VCF::FREQ_CV_PARAM, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(71, 208), module, VCF::DRIVE_PARAM, 0.0f, 1.0f, 0.0f)); - - addInput(createInput(Vec(10, 276), module, VCF::FREQ_INPUT)); - addInput(createInput(Vec(48, 276), module, VCF::RES_INPUT)); - addInput(createInput(Vec(85, 276), module, VCF::DRIVE_INPUT)); - addInput(createInput(Vec(10, 320), module, VCF::IN_INPUT)); - - addOutput(createOutput(Vec(48, 320), module, VCF::LPF_OUTPUT)); - addOutput(createOutput(Vec(85, 320), module, VCF::HPF_OUTPUT)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); + + addParam(ParamWidget::create(Vec(33, 61), module, VCF::FREQ_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(12, 143), module, VCF::FINE_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(71, 143), module, VCF::RES_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(12, 208), module, VCF::FREQ_CV_PARAM, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(71, 208), module, VCF::DRIVE_PARAM, 0.0f, 1.0f, 0.0f)); + + addInput(Port::create(Vec(10, 276), Port::INPUT, module, VCF::FREQ_INPUT)); + addInput(Port::create(Vec(48, 276), Port::INPUT, module, VCF::RES_INPUT)); + addInput(Port::create(Vec(85, 276), Port::INPUT, module, VCF::DRIVE_INPUT)); + addInput(Port::create(Vec(10, 320), Port::INPUT, module, VCF::IN_INPUT)); + + addOutput(Port::create(Vec(48, 320), Port::OUTPUT, module, VCF::LPF_OUTPUT)); + addOutput(Port::create(Vec(85, 320), Port::OUTPUT, module, VCF::HPF_OUTPUT)); } diff --git a/src/VCMixer.cpp b/src/VCMixer.cpp index 410aa22..22e72da 100644 --- a/src/VCMixer.cpp +++ b/src/VCMixer.cpp @@ -58,26 +58,26 @@ VCMixerWidget::VCMixerWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); - addParam(createParam(Vec(52, 58), module, VCMixer::MIX_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(57, 139), module, VCMixer::CH1_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(57, 219), module, VCMixer::CH2_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(57, 300), module, VCMixer::CH3_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(52, 58), module, VCMixer::MIX_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(57, 139), module, VCMixer::CH1_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(57, 219), module, VCMixer::CH2_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(57, 300), module, VCMixer::CH3_PARAM, 0.0f, 1.0f, 0.0f)); - addInput(createInput(Vec(16, 69), module, VCMixer::MIX_CV_INPUT)); - addInput(createInput(Vec(22, 129), module, VCMixer::CH1_INPUT)); - addInput(createInput(Vec(22, 160), module, VCMixer::CH1_CV_INPUT)); - addInput(createInput(Vec(22, 209), module, VCMixer::CH2_INPUT)); - addInput(createInput(Vec(22, 241), module, VCMixer::CH2_CV_INPUT)); - addInput(createInput(Vec(22, 290), module, VCMixer::CH3_INPUT)); - addInput(createInput(Vec(22, 322), module, VCMixer::CH3_CV_INPUT)); + addInput(Port::create(Vec(16, 69), Port::INPUT, module, VCMixer::MIX_CV_INPUT)); + addInput(Port::create(Vec(22, 129), Port::INPUT, module, VCMixer::CH1_INPUT)); + addInput(Port::create(Vec(22, 160), Port::INPUT, module, VCMixer::CH1_CV_INPUT)); + addInput(Port::create(Vec(22, 209), Port::INPUT, module, VCMixer::CH2_INPUT)); + addInput(Port::create(Vec(22, 241), Port::INPUT, module, VCMixer::CH2_CV_INPUT)); + addInput(Port::create(Vec(22, 290), Port::INPUT, module, VCMixer::CH3_INPUT)); + addInput(Port::create(Vec(22, 322), Port::INPUT, module, VCMixer::CH3_CV_INPUT)); - addOutput(createOutput(Vec(110, 69), module, VCMixer::MIX_OUTPUT)); - addOutput(createOutput(Vec(110, 145), module, VCMixer::CH1_OUTPUT)); - addOutput(createOutput(Vec(110, 225), module, VCMixer::CH2_OUTPUT)); - addOutput(createOutput(Vec(110, 306), module, VCMixer::CH3_OUTPUT)); + addOutput(Port::create(Vec(110, 69), Port::OUTPUT, module, VCMixer::MIX_OUTPUT)); + addOutput(Port::create(Vec(110, 145), Port::OUTPUT, module, VCMixer::CH1_OUTPUT)); + addOutput(Port::create(Vec(110, 225), Port::OUTPUT, module, VCMixer::CH2_OUTPUT)); + addOutput(Port::create(Vec(110, 306), Port::OUTPUT, module, VCMixer::CH3_OUTPUT)); } diff --git a/src/VCO.cpp b/src/VCO.cpp index 7dc8bdf..dc581b7 100644 --- a/src/VCO.cpp +++ b/src/VCO.cpp @@ -242,31 +242,31 @@ VCOWidget::VCOWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); - - addParam(createParam(Vec(15, 77), module, VCO::MODE_PARAM, 0.0f, 1.0f, 1.0f)); - addParam(createParam(Vec(119, 77), module, VCO::SYNC_PARAM, 0.0f, 1.0f, 1.0f)); - - addParam(createParam(Vec(47, 61), module, VCO::FREQ_PARAM, -54.0f, 54.0f, 0.0f)); - addParam(createParam(Vec(23, 143), module, VCO::FINE_PARAM, -1.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(91, 143), module, VCO::PW_PARAM, 0.0f, 1.0f, 0.5f)); - addParam(createParam(Vec(23, 208), module, VCO::FM_PARAM, 0.0f, 1.0f, 0.0f)); - addParam(createParam(Vec(91, 208), module, VCO::PWM_PARAM, 0.0f, 1.0f, 0.0f)); - - addInput(createInput(Vec(11, 276), module, VCO::PITCH_INPUT)); - addInput(createInput(Vec(45, 276), module, VCO::FM_INPUT)); - addInput(createInput(Vec(80, 276), module, VCO::SYNC_INPUT)); - addInput(createInput(Vec(114, 276), module, VCO::PW_INPUT)); - - addOutput(createOutput(Vec(11, 320), module, VCO::SIN_OUTPUT)); - addOutput(createOutput(Vec(45, 320), module, VCO::TRI_OUTPUT)); - addOutput(createOutput(Vec(80, 320), module, VCO::SAW_OUTPUT)); - addOutput(createOutput(Vec(114, 320), module, VCO::SQR_OUTPUT)); - - addChild(createLight>(Vec(99, 42.5f), module, VCO::PHASE_POS_LIGHT)); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); + + addParam(ParamWidget::create(Vec(15, 77), module, VCO::MODE_PARAM, 0.0f, 1.0f, 1.0f)); + addParam(ParamWidget::create(Vec(119, 77), module, VCO::SYNC_PARAM, 0.0f, 1.0f, 1.0f)); + + addParam(ParamWidget::create(Vec(47, 61), module, VCO::FREQ_PARAM, -54.0f, 54.0f, 0.0f)); + addParam(ParamWidget::create(Vec(23, 143), module, VCO::FINE_PARAM, -1.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(91, 143), module, VCO::PW_PARAM, 0.0f, 1.0f, 0.5f)); + addParam(ParamWidget::create(Vec(23, 208), module, VCO::FM_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(91, 208), module, VCO::PWM_PARAM, 0.0f, 1.0f, 0.0f)); + + addInput(Port::create(Vec(11, 276), Port::INPUT, module, VCO::PITCH_INPUT)); + addInput(Port::create(Vec(45, 276), Port::INPUT, module, VCO::FM_INPUT)); + addInput(Port::create(Vec(80, 276), Port::INPUT, module, VCO::SYNC_INPUT)); + addInput(Port::create(Vec(114, 276), Port::INPUT, module, VCO::PW_INPUT)); + + addOutput(Port::create(Vec(11, 320), Port::OUTPUT, module, VCO::SIN_OUTPUT)); + addOutput(Port::create(Vec(45, 320), Port::OUTPUT, module, VCO::TRI_OUTPUT)); + addOutput(Port::create(Vec(80, 320), Port::OUTPUT, module, VCO::SAW_OUTPUT)); + addOutput(Port::create(Vec(114, 320), Port::OUTPUT, module, VCO::SQR_OUTPUT)); + + addChild(ModuleLightWidget::create>(Vec(99, 42.5f), module, VCO::PHASE_POS_LIGHT)); } @@ -340,25 +340,25 @@ VCO2Widget::VCO2Widget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); + addChild(Widget::create(Vec(15, 0))); + addChild(Widget::create(Vec(box.size.x-30, 0))); + addChild(Widget::create(Vec(15, 365))); + addChild(Widget::create(Vec(box.size.x-30, 365))); - addParam(createParam(Vec(62, 150), module, VCO2::MODE_PARAM, 0.0f, 1.0f, 1.0f)); - addParam(createParam(Vec(62, 215), module, VCO2::SYNC_PARAM, 0.0f, 1.0f, 1.0f)); + addParam(ParamWidget::create(Vec(62, 150), module, VCO2::MODE_PARAM, 0.0f, 1.0f, 1.0f)); + addParam(ParamWidget::create(Vec(62, 215), module, VCO2::SYNC_PARAM, 0.0f, 1.0f, 1.0f)); - addParam(createParam(Vec(17, 60), module, VCO2::FREQ_PARAM, -54.0f, 54.0f, 0.0f)); - addParam(createParam(Vec(12, 143), module, VCO2::WAVE_PARAM, 0.0f, 3.0f, 1.5f)); - addParam(createParam(Vec(12, 208), module, VCO2::FM_PARAM, 0.0f, 1.0f, 0.0f)); + addParam(ParamWidget::create(Vec(17, 60), module, VCO2::FREQ_PARAM, -54.0f, 54.0f, 0.0f)); + addParam(ParamWidget::create(Vec(12, 143), module, VCO2::WAVE_PARAM, 0.0f, 3.0f, 1.5f)); + addParam(ParamWidget::create(Vec(12, 208), module, VCO2::FM_PARAM, 0.0f, 1.0f, 0.0f)); - addInput(createInput(Vec(11, 276), module, VCO2::FM_INPUT)); - addInput(createInput(Vec(54, 276), module, VCO2::SYNC_INPUT)); - addInput(createInput(Vec(11, 320), module, VCO2::WAVE_INPUT)); + addInput(Port::create(Vec(11, 276), Port::INPUT, module, VCO2::FM_INPUT)); + addInput(Port::create(Vec(54, 276), Port::INPUT, module, VCO2::SYNC_INPUT)); + addInput(Port::create(Vec(11, 320), Port::INPUT, module, VCO2::WAVE_INPUT)); - addOutput(createOutput(Vec(54, 320), module, VCO2::OUT_OUTPUT)); + addOutput(Port::create(Vec(54, 320), Port::OUTPUT, module, VCO2::OUT_OUTPUT)); - addChild(createLight>(Vec(68, 42.5f), module, VCO2::PHASE_POS_LIGHT)); + addChild(ModuleLightWidget::create>(Vec(68, 42.5f), module, VCO2::PHASE_POS_LIGHT)); }