BogaudioModules

BogaudioModules for VCV Rack
Log | Files | Refs | README | LICENSE

commit 7571721ba5a354e58277f20cd0848803c59d44c6
parent 07d2d9dfb4bbb5d18d28802ac8d6a1a414af7c7d
Author: Matt Demanett <matt@demanett.net>
Date:   Tue, 25 Dec 2018 14:38:43 -0600

LLFO: compact LFO.

Diffstat:
Ares-src/LLFO-src.svg | 234+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Ares/LLFO.svg | 0
Msrc/LFO.cpp | 3++-
Asrc/LLFO.cpp | 154+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asrc/LLFO.hpp | 88+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Msrc/bogaudio.cpp | 4+++-
6 files changed, 481 insertions(+), 2 deletions(-)

diff --git a/res-src/LLFO-src.svg b/res-src/LLFO-src.svg @@ -0,0 +1,234 @@ +<svg + version="1.1" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + width="45" + height="380" + viewBox="0 0 45 380" +> + <style> + text { + fill: #333; + font-family: 'Roboto', sans-serif; + font-weight: bold; + } + text.title { + font-family: 'Comfortaa', sans-serif; + font-weight: normal; + } + text.brand { + font-family: 'Audiowide', sans-serif; + font-weight: bold; + } + </style> + + <defs> + <symbol id="knob-medium" viewBox="0 0 26px 26px"> + <g transform="translate(13 13)"> + <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" /> + <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" /> + <circle cx="0" cy="0" r="12.5" stroke-width="1" stroke="#00f" fill="none" /> + </g> + </symbol> + + <symbol id="knob-smallest" viewBox="0 0 16px 16px"> + <g transform="translate(8 8)"> + <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" /> + <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" /> + <circle r="7.5" stroke-width="1" stroke="#00f" fill="none" /> + </g> + </symbol> + + <symbol id="knobguide-frequency-llfo" viewBox="0 0 45px 45px"> + <g transform="translate(22.5 22.5)"> + <polyline points="0,0 3.5,0" stroke-width="0.7" stroke="#333" transform="rotate(-240) translate(15 0)" /> + <polyline points="0,0 3.5,0" stroke-width="0.7" stroke="#333" transform="rotate(60) translate(15 0)" /> + + <g transform="rotate(-148.42) translate(14 0)"> + <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="translate(0 0)" /> + <text font-size="5.0pt" transform="translate(5 0) rotate(148.42) translate(-2.2 2.3)">1</text> + </g> + + <g transform="rotate(-55.39) translate(14 0)"> + <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="translate(0 0)" /> + <text font-size="5.0pt" transform="translate(5 0) rotate(55.39) translate(-1.0 2.3)">0V</text> + </g> + + <g transform="rotate(27.98) translate(14 0)"> + <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="translate(0 0)" /> + <text font-size="5.0pt" transform="translate(5 0) rotate(-27.98) translate(-2.3 -0.5) rotate(90)">200</text> + </g> + + <text font-size="5.0pt" transform="translate(-4.5 22)">HZ</text> + </g> + </symbol> + + <symbol id="knobguide-maxtick" viewBox="0 0 40px 40px"> + <g transform="translate(20 20)"> + <g transform="rotate(60) translate(10 0)"> + <polyline points="0,0 4,0" stroke-width="1" stroke="#333" /> + </g> + <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(0)" /> + <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(43)" /> + <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(0)" /> + <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(-43)" /> + </g> + </symbol> + + <symbol id="knobguide-centertick" viewBox="0 0 40px 40px"> + <g transform="translate(20 20)"> + <g transform="rotate(-90) translate(10 0)"> + <polyline points="0,0 4,0" stroke-width="1" stroke="#333" /> + </g> + <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(20)" /> + <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(43)" /> + <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(-20)" /> + <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(-43)" /> + </g> + </symbol> + + <symbol id="input" viewBox="0 0 24px 24px"> + <g transform="translate(12 12)"> + <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#0f0" fill="#0f0" /> + <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none" /> + </g> + </symbol> + + <symbol id="output" viewBox="0 0 24px 24px"> + <g transform="translate(12 12)"> + <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#f00" fill="#f00" /> + <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#f00" fill="none" /> + </g> + </symbol> + + <symbol id="button-small" viewBox="0 0 9px 9px"> + <g transform="translate(4.5 4.5)"> + <circle r="4" stroke-width="1" stroke="#00f" fill="#f00" /> + </g> + </symbol> + + <symbol id="light-small" viewBox="0 0 6.4px 6.4px"> + <rect width="6.4" height="6.4" fill="#0f0" /> + </symbol> + </defs> + + <rect width="100%" height="100%" fill="#ddd" /> + <polyline points="1,1 44,1 44,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" /> + <polyline points="0.5,0.5 44.5,0.5 44.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" /> + <polyline points="0,0 45,0 45,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" /> + + <g transform="rotate(-90) translate(-376 13)"> + <text class="title" font-size="7pt" letter-spacing="2.5px">LLFO</text> + <g transform="translate(0 12)"> + <text class="brand" font-size="7pt" letter-spacing="2px">BGA</text> + <rect width="3.0" height="3" fill="#ddd" transform="translate(11.5 -5)" /> + </g> + </g> + + <!-- <polyline points="0,0 0,380" stroke="#0f0" stroke-width="1" fill="none" transform="translate(22.5 0)" /> --> + + <g transform="translate(0 25)"> + <!-- <polyline points="0,0 45,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(0 0)" /> --> + <use id="FREQUENCY_PARAM" xlink:href="#knob-medium" transform="translate(9.5 2)" /> + <use xlink:href="#knobguide-frequency-llfo" transform="translate(0 -7.5)" /> + </g> + + <g transform="translate(2 72)"> + <!-- <rect width="45" height="8" fill="#f0f" transform="translate(0 -9)" /> --> + <!-- <rect width="230" height="15" fill="#0f0" transform="translate(-30 -17)" /> --> + <!-- <rect width="230" height="15" fill="#0f0" transform="translate(-30 8)" /> --> + <use id="SLOW_PARAM" xlink:href="#button-small" transform="translate(32 -1)" /> + <use id="SLOW_LIGHT" xlink:href="#light-small" transform="translate(0 0)" /> + <text font-size="6pt" letter-spacing="0.5px" transform="translate(8 6.1)">SLOW</text> + </g> + + <g transform="translate(0.5 88)"> + <!-- <rect width="45" height="8" fill="#f0f" transform="translate(0 -8)" /> --> + <g transform="translate(9 0)"> + <g transform="translate(0 0)"> + <use id="SINE_LIGHT" xlink:href="#light-small" transform="translate(-7.5 1)" /> + <g transform="translate(1 1) scale(0.8)"> + <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#f0f" /> --> + <path d="M 0 4 A 2 3 0 0 1 6 4" stroke="#333" stroke-width="1" fill="none" /> + <path d="M 6 4 A 2 3 0 0 0 12 4" stroke="#333" stroke-width="1" fill="none" /> + </g> + </g> + + <g transform="translate(0 13)"> + <use id="RAMP_UP_LIGHT" xlink:href="#light-small" transform="translate(-7.5 1)" /> + <g transform="translate(1 1) scale(0.8)"> + <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#f0f" /> --> + <polyline points="0,8 12,0 12,8" stroke-width="1" stroke="#333" fill="none" /> + </g> + </g> + + <g transform="translate(0 26)"> + <use id="SQUARE_LIGHT" xlink:href="#light-small" transform="translate(-7.5 1)" /> + <g transform="translate(1 1) scale(0.8)"> + <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#f0f" /> --> + <polyline points="0,4 0,0 6,0 6,8 12,8 12,4" stroke-width="1" stroke="#333" fill="none" /> + </g> + </g> + </g> + + <g transform="translate(31 0)"> + <g transform="translate(0 0)"> + <use id="TRIANGLE_LIGHT" xlink:href="#light-small" transform="translate(-7.5 1)" /> + <g transform="translate(1 1) scale(0.8)"> + <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#f0f" /> --> + <polyline points="0,4 3,0 9,8 12,4" stroke-width="1" stroke="#333" fill="none" /> + </g> + </g> + + <g transform="translate(0 13)"> + <use id="RAMP_DOWN_LIGHT" xlink:href="#light-small" transform="translate(-7.5 1)" /> + <g transform="translate(1 1) scale(0.8)"> + <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#f0f" /> --> + <polyline points="0,8 0,0 12,8" stroke-width="1" stroke="#333" fill="none" /> + </g> + </g> + + <g transform="translate(0 26)"> + <use id="PULSE_LIGHT" xlink:href="#light-small" transform="translate(-7.5 1)" /> + <g transform="translate(1 1) scale(0.8)"> + <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#f0f" /> --> + <polyline points="0,4 0,0 3,0 3,8 12,8 12,4" stroke-width="1" stroke="#333" fill="none" /> + </g> + </g> + </g> + + <use id="WAVE_PARAM" xlink:href="#button-small" transform="translate(17.5 38)" /> + </g> + + <g transform="translate(0 149)"> + <!-- <rect width="45" height="8" fill="#f0f" transform="translate(0 -14)" /> --> + <text font-size="6pt" letter-spacing="2px" transform="translate(3 0)">OFFSET</text> + <use id="OFFSET_PARAM" xlink:href="#knob-smallest" transform="translate(14.5 9.5)" /> + <use xlink:href="#knobguide-centertick" transform="translate(2.2 -2.5)" /> + </g> + + <g transform="translate(0 190)"> + <!-- <rect width="45" height="8" fill="#f0f" transform="translate(0 -14)" /> --> + <text font-size="6pt" letter-spacing="2px" transform="translate(6.6 0)">SCALE</text> + <use id="SCALE_PARAM" xlink:href="#knob-smallest" transform="translate(14.5 9.5)" /> + <use xlink:href="#knobguide-maxtick" transform="translate(2.2 -2.5)" /> + </g> + + <g transform="translate(0 228)"> + <!-- <rect width="45" height="8" fill="#f0f" transform="translate(0 -8)" /> --> + <g transform="translate(5.5 0)"> + <rect width="34" height="10" fill="#fafafa" transform="translate(0 63)" /> + <rect width="34" height="70" rx="5" fill="#fafafa" /> + <use id="PITCH_INPUT" xlink:href="#input" transform="translate(5 3)" /> + <text font-size="5pt" letter-spacing="2px" transform="translate(3.5 35)">V/OCT</text> + <use id="RESET_INPUT" xlink:href="#input" transform="translate(5 38)" /> + <text font-size="5pt" letter-spacing="2px" transform="translate(3.5 70)">RESET</text> + </g> + <g transform="translate(5.5 76)"> + <rect width="34" height="10" fill="#bbb" transform="translate(0 -3)" /> + <rect width="34" height="35" rx="5" fill="#bbb" /> + <use id="OUT_OUTPUT" xlink:href="#output" transform="translate(5 0)" /> + <text font-size="5pt" letter-spacing="2px" transform="translate(8.3 32)">OUT</text> + </g> + </g> +</svg> diff --git a/res/LLFO.svg b/res/LLFO.svg Binary files differ. diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -102,10 +102,11 @@ void LFO::updateOutput(Phasor& wave, bool useSample, bool invert, Output& output output.value = sample; } else { - sample = wave.nextFromPhasor(_phasor) * amplitude * _scale + (invert ? -_offset : _offset); + sample = wave.nextFromPhasor(_phasor) * amplitude * _scale; if (invert) { sample = -sample; } + sample += _offset; output.value = sample; } active = true; diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -0,0 +1,154 @@ + +#include "LLFO.hpp" +#include "dsp/pitch.hpp" + +void LLFO::onReset() { + _resetTrigger.reset(); + _modulationStep = modulationSteps; +} + +void LLFO::onSampleRateChange() { + _phasor.setSampleRate(engineGetSampleRate()); + _modulationStep = modulationSteps; +} + +void LLFO::step() { + lights[SLOW_LIGHT].value = _slowMode = params[SLOW_PARAM].value > 0.5f; + + lights[SINE_LIGHT].value = _wave == SINE_WAVE; + lights[TRIANGLE_LIGHT].value = _wave == TRIANGLE_WAVE; + lights[RAMP_UP_LIGHT].value = _wave == RAMP_UP_WAVE; + lights[RAMP_DOWN_LIGHT].value = _wave == RAMP_DOWN_WAVE; + lights[SQUARE_LIGHT].value = _wave == SQUARE_WAVE; + lights[PULSE_LIGHT].value = _wave == PULSE_WAVE; + if (!outputs[OUT_OUTPUT].active) { + return; + } + + ++_modulationStep; + if (_modulationStep >= modulationSteps) { + _modulationStep = 0; + + float frequency = params[FREQUENCY_PARAM].value; + if (inputs[PITCH_INPUT].active) { + frequency += inputs[PITCH_INPUT].value; + } + if (_slowMode) { + frequency -= 8.0f; + } + else { + frequency -= 4.0f; + } + frequency = cvToFrequency(frequency); + if (frequency > 2000.0f) { + frequency = 2000.0f; + } + _phasor.setFrequency(frequency); + + _wave = (Wave)params[WAVE_PARAM].value; + _invert = false; + switch (_wave) { + case SINE_WAVE: { + _oscillator = &_sine; + break; + } + case TRIANGLE_WAVE: { + _oscillator = &_triangle; + break; + } + case RAMP_UP_WAVE: { + _oscillator = &_ramp; + break; + } + case RAMP_DOWN_WAVE: { + _oscillator = &_ramp; + _invert = true; + break; + } + case SQUARE_WAVE: { + _oscillator = &_square; + _square.setPulseWidth(0.5f); + break; + } + case PULSE_WAVE: { + _oscillator = &_square; + _square.setPulseWidth(0.1f); + break; + } + } + + _offset = params[OFFSET_PARAM].value * 5.0f; + _scale = params[SCALE_PARAM].value; + } + + if (_resetTrigger.next(inputs[RESET_INPUT].value)) { + _phasor.resetPhase(); + } + _phasor.advancePhase(); + float sample = _oscillator->nextFromPhasor(_phasor) * amplitude * _scale; + if (_invert) { + sample = -sample; + } + sample += _offset; + outputs[OUT_OUTPUT].value = sample; +} + +struct LLFOWidget : ModuleWidget { + static constexpr int hp = 3; + + LLFOWidget(LLFO* module) : ModuleWidget(module) { + box.size = Vec(RACK_GRID_WIDTH * hp, RACK_GRID_HEIGHT); + + { + SVGPanel *panel = new SVGPanel(); + panel->box.size = box.size; + panel->setBackground(SVG::load(assetPlugin(plugin, "res/LLFO.svg"))); + addChild(panel); + } + + addChild(Widget::create<ScrewSilver>(Vec(0, 0))); + addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365))); + + // generated by svg_widgets.rb + auto frequencyParamPosition = Vec(9.5, 27.0); + auto slowParamPosition = Vec(34.0, 71.0); + auto waveParamPosition = Vec(18.0, 126.0); + auto offsetParamPosition = Vec(14.5, 158.5); + auto scaleParamPosition = Vec(14.5, 199.5); + + auto pitchInputPosition = Vec(10.5, 231.0); + auto resetInputPosition = Vec(10.5, 266.0); + + auto outOutputPosition = Vec(10.5, 304.0); + + auto slowLightPosition = Vec(2.0, 72.0); + auto sineLightPosition = Vec(2.0, 89.0); + auto rampUpLightPosition = Vec(2.0, 102.0); + auto squareLightPosition = Vec(2.0, 115.0); + auto triangleLightPosition = Vec(24.0, 89.0); + auto rampDownLightPosition = Vec(24.0, 102.0); + auto pulseLightPosition = Vec(24.0, 115.0); + // end generated by svg_widgets.rb + + addParam(ParamWidget::create<Knob26>(frequencyParamPosition, module, LLFO::FREQUENCY_PARAM, -8.0, 5.0, 0.0)); + addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, LLFO::SLOW_PARAM, 0.0, 1.0, 0.0)); + addParam(ParamWidget::create<StatefulButton9>(waveParamPosition, module, LLFO::WAVE_PARAM, 0.0, 5.0, 0.0)); + addParam(ParamWidget::create<Knob16>(offsetParamPosition, module, LLFO::OFFSET_PARAM, -1.0, 1.0, 0.0)); + addParam(ParamWidget::create<Knob16>(scaleParamPosition, module, LLFO::SCALE_PARAM, 0.0, 1.0, 1.0)); + + addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, LLFO::PITCH_INPUT)); + addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, LLFO::RESET_INPUT)); + + addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, LLFO::OUT_OUTPUT)); + + addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(slowLightPosition, module, LLFO::SLOW_LIGHT)); + addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(sineLightPosition, module, LLFO::SINE_LIGHT)); + addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(rampUpLightPosition, module, LLFO::RAMP_UP_LIGHT)); + addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(squareLightPosition, module, LLFO::SQUARE_LIGHT)); + addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(triangleLightPosition, module, LLFO::TRIANGLE_LIGHT)); + addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(rampDownLightPosition, module, LLFO::RAMP_DOWN_LIGHT)); + addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(pulseLightPosition, module, LLFO::PULSE_LIGHT)); + } +}; + +Model* modelLLFO = createModel<LLFO, LLFOWidget>("Bogaudio-LLFO", "LLFO", "compact LFO", LFO_TAG); diff --git a/src/LLFO.hpp b/src/LLFO.hpp @@ -0,0 +1,88 @@ +#pragma once + +#include "bogaudio.hpp" +#include "dsp/oscillator.hpp" +#include "dsp/signal.hpp" + +using namespace bogaudio::dsp; + +extern Model* modelLLFO; + +namespace bogaudio { + +struct LLFO : Module { + enum ParamsIds { + FREQUENCY_PARAM, + SLOW_PARAM, + WAVE_PARAM, + OFFSET_PARAM, + SCALE_PARAM, + NUM_PARAMS + }; + + enum InputsIds { + PITCH_INPUT, + RESET_INPUT, + NUM_INPUTS + }; + + enum OutputsIds { + OUT_OUTPUT, + NUM_OUTPUTS + }; + + enum LightsIds { + SLOW_LIGHT, + SINE_LIGHT, + RAMP_UP_LIGHT, + SQUARE_LIGHT, + TRIANGLE_LIGHT, + RAMP_DOWN_LIGHT, + PULSE_LIGHT, + NUM_LIGHTS + }; + + enum Wave { + SINE_WAVE, + TRIANGLE_WAVE, + RAMP_UP_WAVE, + RAMP_DOWN_WAVE, + SQUARE_WAVE, + PULSE_WAVE + }; + + const int modulationSteps = 100; + const float amplitude = 5.0f; + + int _modulationStep = 0; + bool _slowMode = false; + float _offset = 0.0f; + float _scale = 0.0f; + PositiveZeroCrossing _resetTrigger; + + Phasor _phasor; + SineTableOscillator _sine; + TriangleOscillator _triangle; + SawOscillator _ramp; + SquareOscillator _square; + + Wave _wave; + bool _invert; + Phasor* _oscillator; + + LLFO() + : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) + , _wave(SINE_WAVE) + , _invert(false) + , _oscillator(&_sine) + { + onReset(); + onSampleRateChange(); + } + + void onReset() override; + void onSampleRateChange() override; + void step() override; +}; + +} // namespace bogaudio diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp @@ -21,8 +21,9 @@ #include "FMOp.hpp" #include "FlipFlop.hpp" #include "Follow.hpp" -#include "LFO.hpp" #include "Lag.hpp" +#include "LFO.hpp" +#include "LLFO.hpp" #include "Lmtr.hpp" #include "Manual.hpp" #include "Matrix88.hpp" @@ -74,6 +75,7 @@ void init(rack::Plugin *p) { p->addModel(modelLFO); p->addModel(modelEightFO); + p->addModel(modelLLFO); p->addModel(modelDADSRH); p->addModel(modelDADSRHPlus);