commit 3161730284f91eeaa5f0da444c268a91b39cb24d
parent 87881745715816f6849974dd34a834f5c91cc3a5
Author: Matt Demanett <matt@demanett.net>
Date: Mon, 5 Mar 2018 00:46:53 -0500
Work-in-progress LFO.
Diffstat:
8 files changed, 703 insertions(+), 36 deletions(-)
diff --git a/res-src/EightFO-src.svg b/res-src/EightFO-src.svg
@@ -0,0 +1,258 @@
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="300"
+ height="380"
+ viewBox="0 0 300 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" viewBox="0 0 38px 38px">
+ <g transform="translate(19 19)">
+ <polyline points="-5,0 5,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-5 0,5" stroke-width="1" stroke="#00f" />
+ <circle cx="0" cy="0" r="18" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <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" 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-phase" viewBox="0 0 40px 40px">
+ <!-- <rect width="40" height="40" fill="#fafafa" opacity="0.2" /> -->
+ <g transform="translate(20 20)">
+ <g transform="rotate(-240) translate(10 0)">
+ <!-- <polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" /> -->
+ <!-- <text font-size="5.0pt" transform="translate(2.5 0) rotate(240) translate(-1.5 2.2)">-</text> -->
+ </g>
+ <g transform="rotate(-90) translate(10 0)">
+ <polyline points="0,0 6,0" stroke-width="1" stroke="#333" />
+ </g>
+ <g transform="rotate(60) translate(10 0)">
+ <!-- <polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" /> -->
+ <!-- <text font-size="5.0pt" transform="translate(2.5 0) rotate(-60) translate(-1.9 2.2)">+</text> -->
+ </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" viewBox="0 0 1.1px 1.1px">
+ <rect width="3.2" height="3.2" fill="#0f0" />
+ </symbol>
+ </defs>
+
+ <rect width="100%" height="100%" fill="#ddd" />
+ <polyline points="1,1 299,1 299,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" />
+ <polyline points="0.5,0.5 299.5,0.5 299.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" />
+ <polyline points="0,0 300,0 300,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
+
+ <!-- <rect width="125" height="20" fill="#0f0" transform="translate(0 0)" /> -->
+ <!-- <rect width="125" height="20" fill="#0f0" transform="translate(175 0)" /> -->
+
+ <text class="title" x="129" y="19" font-size="12pt" letter-spacing="4px">8FO</text>
+ <g transform="translate(110 374)">
+ <text class="brand" font-size="8pt" letter-spacing="2px">BOGAUDIO</text>
+ <rect width="3.0" height="3" fill="#ddd" transform="translate(24 -5)" />
+ </g>
+
+ <g transform="translate(10 50)">
+ <g transform="translate(10 0)">
+ <!-- <polyline points="0,19 70,19" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 57) rotate(270)">FREQUENCY</text>
+ <use id="FREQUENCY_PARAM" xlink:href="#knob" transform="translate(20 0)" />
+ </g>
+ <g transform="translate(90 0)">
+ <!-- <polyline points="0,19 68,19" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">WAVE</text>
+ <use id="WAVE_PARAM" xlink:href="#knob" transform="translate(20 0)" />
+ </g>
+ </g>
+
+ <g transform="translate(35 80)">
+ <g transform="translate(0 17.5)">
+ <use id="SLOW_LIGHT" xlink:href="#light" transform="translate(0 0)" />
+ <text font-size="7pt" letter-spacing="2px" transform="translate(7 5)">SLOW</text>
+ </g>
+ <use id="SLOW_PARAM" xlink:href="#button-small" transform="translate(44 14.5)" />
+ </g>
+
+ <g transform="translate(10 130)">
+ <g transform="translate(10 0)">
+ <!-- <polyline points="0,19 70,19" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 50) rotate(270)">SAM/PWM</text>
+ <use id="SAMPLE_PWM_PARAM" xlink:href="#knob" transform="translate(20 0)" />
+ </g>
+ <!-- <g transform="translate(90 0)"> -->
+ <!-- <polyline points="0,19 70,19" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <!-- <text font-size="8pt" letter-spacing="2px" transform="translate(8 40) rotate(270)">DECAY</text> -->
+ <!-- <use id="DECAY_PARAM" xlink:href="#knob" transform="translate(20 0)" /> -->
+ <!-- </g> -->
+ </g>
+
+ <g transform="translate(0 200)">
+ <g transform="translate(10 0)">
+ <rect width="30" height="40" rx="5" fill="#fafafa" />
+ <use id="SAMPLE_PWM_INPUT" xlink:href="#input" transform="translate(3 3)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(11.5 36)">S</text>
+ </g>
+ <g transform="translate(50 0)">
+ <!-- <rect width="30" height="40" rx="5" fill="#fafafa" /> -->
+ <!-- <use id="WIDTH_INPUT" xlink:href="#input" transform="translate(3 3)" /> -->
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(11.5 36)">Y</text> -->
+ </g>
+ </g>
+
+ <g transform="translate(180 20)">
+ <g transform="translate(3 4)">
+ <g transform="translate(0 0)">
+ <use id="PHASE7_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+ <g transform="translate(0 40)">
+ <use id="PHASE6_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+ <g transform="translate(0 80)">
+ <use id="PHASE5_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+ <g transform="translate(0 120)">
+ <use id="PHASE4_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+
+ <g transform="translate(0 160)">
+ <use id="PHASE3_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+ <g transform="translate(0 200)">
+ <use id="PHASE2_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+ <g transform="translate(0 240)">
+ <use id="PHASE1_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+ <g transform="translate(0 280)">
+ <use id="PHASE0_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
+ </g>
+ </g>
+ </g>
+
+ <g transform="translate(183 24)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(-225) translate(-20 -20)" />
+ </g>
+ <g transform="translate(183 64)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(-180) translate(-20 -20)" />
+ </g>
+ <g transform="translate(183 104)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(-135) translate(-20 -20)" />
+ </g>
+ <g transform="translate(183 144)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(-90) translate(-20 -20)" />
+ </g>
+
+ <g transform="translate(183 184)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(-45) translate(-20 -20)" />
+ </g>
+ <g transform="translate(183 224)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(0) translate(-20 -20)" />
+ </g>
+ <g transform="translate(183 264)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(45) translate(-20 -20)" />
+ </g>
+ <g transform="translate(183 304)">
+ <use xlink:href="#knobguide-phase" transform="translate(12 12) rotate(90) translate(-20 -20)" />
+ </g>
+
+ <g transform="translate(220 20)">
+ <rect width="30" height="328" rx="5" fill="#fafafa" />
+ <g transform="translate(3 4)">
+ <use id="PHASE7_INPUT" xlink:href="#input" transform="translate(0 0)" />
+ <use id="PHASE6_INPUT" xlink:href="#input" transform="translate(0 40)" />
+ <use id="PHASE5_INPUT" xlink:href="#input" transform="translate(0 80)" />
+ <use id="PHASE4_INPUT" xlink:href="#input" transform="translate(0 120)" />
+
+ <use id="PHASE3_INPUT" xlink:href="#input" transform="translate(0 160)" />
+ <use id="PHASE2_INPUT" xlink:href="#input" transform="translate(0 200)" />
+ <use id="PHASE1_INPUT" xlink:href="#input" transform="translate(0 240)" />
+ <use id="PHASE0_INPUT" xlink:href="#input" transform="translate(0 280)" />
+ </g>
+ <text font-size="6pt" letter-spacing="2px" transform="translate(8 320)">CV</text>
+ </g>
+
+ <g transform="translate(260 20)">
+ <rect width="30" height="328" rx="5" fill="#bbb" />
+ <g transform="translate(3 4)">
+ <use id="PHASE7_OUTPUT" xlink:href="#output" transform="translate(0 0)" />
+ <use id="PHASE6_OUTPUT" xlink:href="#output" transform="translate(0 40)" />
+ <use id="PHASE5_OUTPUT" xlink:href="#output" transform="translate(0 80)" />
+ <use id="PHASE4_OUTPUT" xlink:href="#output" transform="translate(0 120)" />
+
+ <use id="PHASE3_OUTPUT" xlink:href="#output" transform="translate(0 160)" />
+ <use id="PHASE2_OUTPUT" xlink:href="#output" transform="translate(0 200)" />
+ <use id="PHASE1_OUTPUT" xlink:href="#output" transform="translate(0 240)" />
+ <use id="PHASE0_OUTPUT" xlink:href="#output" transform="translate(0 280)" />
+ </g>
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5 320)">OUT</text>
+ </g>
+
+ <!-- <polyline points="0,0 300,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(0 339)" /> -->
+ <g transform="translate(0 320)">
+ <g transform="translate(10 0)">
+ <rect width="30" height="40" rx="5" fill="#fafafa" />
+ <use id="PITCH_INPUT" xlink:href="#input" transform="translate(3 3)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(1 36)">V/OCT</text>
+ </g>
+ <g transform="translate(50 0)">
+ <rect width="30" height="40" rx="5" fill="#fafafa" />
+ <use id="RESET_INPUT" xlink:href="#input" transform="translate(3 3)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 36)">RST</text>
+ </g>
+ </g>
+</svg>
diff --git a/res/EightFO.svg b/res/EightFO.svg
Binary files differ.
diff --git a/src/Additator.cpp b/src/Additator.cpp
@@ -3,13 +3,13 @@
void Additator::onReset() {
_syncTrigger.reset();
- _steps = 0;
+ _steps = modulationSteps;
_phase = PHASE_RESET;
}
void Additator::onSampleRateChange() {
_oscillator.setSampleRate(engineGetSampleRate());
- _steps = 0;
+ _steps = modulationSteps;
_phase = PHASE_RESET;
}
@@ -29,6 +29,7 @@ void Additator::step() {
if (!outputs[AUDIO_OUTPUT].active) {
return;
}
+
++_steps;
if (_steps >= modulationSteps) {
_steps = 0;
diff --git a/src/EightFO.cpp b/src/EightFO.cpp
@@ -0,0 +1,243 @@
+
+#include "EightFO.hpp"
+#include "dsp/pitch.hpp"
+
+void EightFO::onReset() {
+ _resetTrigger.reset();
+ _modulationStep = modulationSteps;
+ _sampleStep = _phasor._sampleRate;
+}
+
+void EightFO::onSampleRateChange() {
+ _phasor.setSampleRate(engineGetSampleRate());
+ _modulationStep = modulationSteps;
+ _sampleStep = _phasor._sampleRate;
+}
+
+void EightFO::step() {
+ lights[SLOW_LIGHT].value = _slowMode;
+ if (!(
+ outputs[PHASE7_OUTPUT].active ||
+ outputs[PHASE6_OUTPUT].active ||
+ outputs[PHASE5_OUTPUT].active ||
+ outputs[PHASE4_OUTPUT].active ||
+ outputs[PHASE3_OUTPUT].active ||
+ outputs[PHASE2_OUTPUT].active ||
+ outputs[PHASE1_OUTPUT].active ||
+ outputs[PHASE0_OUTPUT].active
+ )) {
+ return;
+ }
+
+ ++_modulationStep;
+ if (_modulationStep >= modulationSteps) {
+ _modulationStep = 0;
+
+ _slowMode = ((int)params[SLOW_PARAM].value) == 1;
+ float frequency = 0.0f;
+ if (inputs[PITCH_INPUT].active) {
+ frequency = clamp(cvToFrequency(inputs[PITCH_INPUT].value), minFrequency, maxFrequency);
+ }
+ else {
+ frequency = params[FREQUENCY_PARAM].value;
+ if (_slowMode) {
+ frequency *= slowModeFactor;
+ }
+ }
+ _phasor.setFrequency(frequency);
+
+ _wave = (Wave)params[WAVE_PARAM].value;
+ if (_wave == SQUARE_WAVE) {
+ _square.setPulseWidth((params[SAMPLE_PWM_PARAM].value + 1.0f) / 2.0f);
+ }
+ else {
+ float maxSampleSteps = (_phasor._sampleRate / _phasor._frequency) / 4.0f;
+ _sampleSteps = clamp((int)(abs(params[SAMPLE_PWM_PARAM].value) * maxSampleSteps), 1, (int)maxSampleSteps);
+ }
+
+ if (_resetTrigger.process(inputs[RESET_INPUT].value)) {
+ _phasor.setPhase(0.0f);
+ }
+
+ _phase7Offset = phaseOffset(params[PHASE7_PARAM], inputs[PHASE7_INPUT], basePhase7Offset);
+ _phase6Offset = phaseOffset(params[PHASE6_PARAM], inputs[PHASE6_INPUT], basePhase6Offset);
+ _phase5Offset = phaseOffset(params[PHASE5_PARAM], inputs[PHASE5_INPUT], basePhase5Offset);
+ _phase4Offset = phaseOffset(params[PHASE4_PARAM], inputs[PHASE4_INPUT], basePhase4Offset);
+ _phase3Offset = phaseOffset(params[PHASE3_PARAM], inputs[PHASE3_INPUT], basePhase3Offset);
+ _phase2Offset = phaseOffset(params[PHASE2_PARAM], inputs[PHASE2_INPUT], basePhase2Offset);
+ _phase1Offset = phaseOffset(params[PHASE1_PARAM], inputs[PHASE1_INPUT], basePhase1Offset);
+ _phase0Offset = phaseOffset(params[PHASE0_PARAM], inputs[PHASE0_INPUT], basePhase0Offset);
+ }
+
+ _phasor.next();
+ bool useSample = true;
+ ++_sampleStep;
+ if (_sampleStep >= _sampleSteps) {
+ _sampleStep = 0;
+ useSample = false;
+ }
+ updateOutput(useSample, outputs[PHASE7_OUTPUT], _phase7Offset, _phase7Sample, _phase7Active);
+ updateOutput(useSample, outputs[PHASE6_OUTPUT], _phase6Offset, _phase6Sample, _phase6Active);
+ updateOutput(useSample, outputs[PHASE5_OUTPUT], _phase5Offset, _phase5Sample, _phase5Active);
+ updateOutput(useSample, outputs[PHASE4_OUTPUT], _phase4Offset, _phase4Sample, _phase4Active);
+ updateOutput(useSample, outputs[PHASE3_OUTPUT], _phase3Offset, _phase3Sample, _phase3Active);
+ updateOutput(useSample, outputs[PHASE2_OUTPUT], _phase2Offset, _phase2Sample, _phase2Active);
+ updateOutput(useSample, outputs[PHASE1_OUTPUT], _phase1Offset, _phase1Sample, _phase1Active);
+ updateOutput(useSample, outputs[PHASE0_OUTPUT], _phase0Offset, _phase0Sample, _phase0Active);
+}
+
+float EightFO::phaseOffset(Param& p, Input& i, float baseOffset) {
+ float o = p.value * Phasor::maxPhase;
+ if (i.active) {
+ o *= clamp(i.value / 5.0f, -1.0f, 1.0f);
+ }
+ return o + baseOffset;
+}
+
+void EightFO::updateOutput(bool useSample, Output& output, float& offset, float& sample, bool& active) {
+ if (output.active) {
+ if (useSample && active) {
+ output.value = sample;
+ }
+ else {
+ float v = 0.0f;
+ switch (_wave) {
+ case NO_WAVE: {
+ assert(false);
+ }
+ case SINE_WAVE: {
+ v = sinf((_phasor._phase + offset) * M_PI); // FIXME
+ break;
+ }
+ case TRIANGLE_WAVE: {
+ v = _triangle.nextFromPhasor(_phasor, offset);
+ break;
+ }
+ case RAMP_UP_WAVE: {
+ v = _ramp.nextFromPhasor(_phasor, offset);
+ break;
+ }
+ case RAMP_DOWN_WAVE: {
+ v = -_ramp.nextFromPhasor(_phasor, offset);
+ break;
+ }
+ case SQUARE_WAVE: {
+ v = _square.nextFromPhasor(_phasor, offset);
+ break;
+ }
+ }
+ output.value = sample = amplitude * v;
+ }
+ active = true;
+ }
+ else {
+ active = false;
+ }
+}
+
+struct EightFOWidget : ModuleWidget {
+ EightFOWidget(EightFO* module) : ModuleWidget(module) {
+ box.size = Vec(RACK_GRID_WIDTH * 20, RACK_GRID_HEIGHT);
+
+ {
+ SVGPanel *panel = new SVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(SVG::load(assetPlugin(plugin, "res/EightFO.svg")));
+ addChild(panel);
+ }
+
+ addChild(Widget::create<ScrewSilver>(Vec(15, 0)));
+ addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 0)));
+ addChild(Widget::create<ScrewSilver>(Vec(15, 365)));
+ addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 30, 365)));
+
+ // generated by svg_widgets.rb
+ auto frequencyParamPosition = Vec(40.5, 50.5);
+ auto waveParamPosition = Vec(120.5, 50.5);
+ auto slowParamPosition = Vec(79.0, 94.5);
+ auto samplePwmParamPosition = Vec(40.5, 130.5);
+ auto phase7ParamPosition = Vec(187.0, 28.0);
+ auto phase6ParamPosition = Vec(187.0, 68.0);
+ auto phase5ParamPosition = Vec(187.0, 108.0);
+ auto phase4ParamPosition = Vec(187.0, 148.0);
+ auto phase3ParamPosition = Vec(187.0, 188.0);
+ auto phase2ParamPosition = Vec(187.0, 228.0);
+ auto phase1ParamPosition = Vec(187.0, 268.0);
+ auto phase0ParamPosition = Vec(187.0, 308.0);
+
+ auto samplePwmInputPosition = Vec(13.0, 203.0);
+ auto phase7InputPosition = Vec(223.0, 24.0);
+ auto phase6InputPosition = Vec(223.0, 64.0);
+ auto phase5InputPosition = Vec(223.0, 104.0);
+ auto phase4InputPosition = Vec(223.0, 144.0);
+ auto phase3InputPosition = Vec(223.0, 184.0);
+ auto phase2InputPosition = Vec(223.0, 224.0);
+ auto phase1InputPosition = Vec(223.0, 264.0);
+ auto phase0InputPosition = Vec(223.0, 304.0);
+ auto pitchInputPosition = Vec(13.0, 323.0);
+ auto resetInputPosition = Vec(53.0, 323.0);
+
+ auto phase7OutputPosition = Vec(263.0, 24.0);
+ auto phase6OutputPosition = Vec(263.0, 64.0);
+ auto phase5OutputPosition = Vec(263.0, 104.0);
+ auto phase4OutputPosition = Vec(263.0, 144.0);
+ auto phase3OutputPosition = Vec(263.0, 184.0);
+ auto phase2OutputPosition = Vec(263.0, 224.0);
+ auto phase1OutputPosition = Vec(263.0, 264.0);
+ auto phase0OutputPosition = Vec(263.0, 304.0);
+
+ auto slowLightPosition = Vec(35.0, 97.5);
+ // end generated by svg_widgets.rb
+
+ addParam(ParamWidget::create<Knob38>(frequencyParamPosition, module, EightFO::FREQUENCY_PARAM, module->minFrequency, module->maxFrequency, module->maxFrequency / 10.0f));
+ {
+ auto w = ParamWidget::create<Knob38>(waveParamPosition, module, EightFO::WAVE_PARAM, 1.0, 5.0, 5.0);
+ dynamic_cast<Knob*>(w)->snap = true;
+ addParam(w);
+ }
+ addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, EightFO::SLOW_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(samplePwmParamPosition, module, EightFO::SAMPLE_PWM_PARAM, -1.0, 1.0, 0.0));
+
+ addPhaseParam(phase7ParamPosition, module, EightFO::PHASE7_PARAM, 1.75f * M_PI);
+ addPhaseParam(phase6ParamPosition, module, EightFO::PHASE6_PARAM, 1.5f * M_PI);
+ addPhaseParam(phase5ParamPosition, module, EightFO::PHASE5_PARAM, 1.25f * M_PI);
+ addPhaseParam(phase4ParamPosition, module, EightFO::PHASE4_PARAM, M_PI);
+ addPhaseParam(phase3ParamPosition, module, EightFO::PHASE3_PARAM, 0.75f * M_PI);
+ addPhaseParam(phase2ParamPosition, module, EightFO::PHASE2_PARAM, 0.5f * M_PI);
+ addPhaseParam(phase1ParamPosition, module, EightFO::PHASE1_PARAM, 0.25f * M_PI);
+ addPhaseParam(phase0ParamPosition, module, EightFO::PHASE0_PARAM, 0.0f);
+
+ addInput(Port::create<Port24>(samplePwmInputPosition, Port::INPUT, module, EightFO::SAMPLE_PWM_INPUT));
+ addInput(Port::create<Port24>(phase7InputPosition, Port::INPUT, module, EightFO::PHASE7_INPUT));
+ addInput(Port::create<Port24>(phase6InputPosition, Port::INPUT, module, EightFO::PHASE6_INPUT));
+ addInput(Port::create<Port24>(phase5InputPosition, Port::INPUT, module, EightFO::PHASE5_INPUT));
+ addInput(Port::create<Port24>(phase4InputPosition, Port::INPUT, module, EightFO::PHASE4_INPUT));
+ addInput(Port::create<Port24>(phase3InputPosition, Port::INPUT, module, EightFO::PHASE3_INPUT));
+ addInput(Port::create<Port24>(phase2InputPosition, Port::INPUT, module, EightFO::PHASE2_INPUT));
+ addInput(Port::create<Port24>(phase1InputPosition, Port::INPUT, module, EightFO::PHASE1_INPUT));
+ addInput(Port::create<Port24>(phase0InputPosition, Port::INPUT, module, EightFO::PHASE0_INPUT));
+ addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, EightFO::PITCH_INPUT));
+ addInput(Port::create<Port24>(resetInputPosition, Port::INPUT, module, EightFO::RESET_INPUT));
+
+ addOutput(Port::create<Port24>(phase7OutputPosition, Port::OUTPUT, module, EightFO::PHASE7_OUTPUT));
+ addOutput(Port::create<Port24>(phase6OutputPosition, Port::OUTPUT, module, EightFO::PHASE6_OUTPUT));
+ addOutput(Port::create<Port24>(phase5OutputPosition, Port::OUTPUT, module, EightFO::PHASE5_OUTPUT));
+ addOutput(Port::create<Port24>(phase4OutputPosition, Port::OUTPUT, module, EightFO::PHASE4_OUTPUT));
+ addOutput(Port::create<Port24>(phase3OutputPosition, Port::OUTPUT, module, EightFO::PHASE3_OUTPUT));
+ addOutput(Port::create<Port24>(phase2OutputPosition, Port::OUTPUT, module, EightFO::PHASE2_OUTPUT));
+ addOutput(Port::create<Port24>(phase1OutputPosition, Port::OUTPUT, module, EightFO::PHASE1_OUTPUT));
+ addOutput(Port::create<Port24>(phase0OutputPosition, Port::OUTPUT, module, EightFO::PHASE0_OUTPUT));
+
+ addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(slowLightPosition, module, EightFO::SLOW_LIGHT));
+ }
+
+ void addPhaseParam(const Vec& position, Module* module, EightFO::ParamsIds paramId, float rotation) {
+ auto w = ParamWidget::create<Knob16>(position, module, paramId, -1.0, 1.0, 0.0);
+ auto k = dynamic_cast<SVGKnob*>(w);
+ k->minAngle += 0.5 * M_PI - rotation;
+ k->maxAngle += 0.5 * M_PI - rotation;
+ addParam(w);
+ }
+};
+
+Model* modelEightFO = Model::create<EightFO, EightFOWidget>("Bogaudio", "Bogaudio-EightFO", "8FO", LFO_TAG);
diff --git a/src/EightFO.hpp b/src/EightFO.hpp
@@ -0,0 +1,140 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/oscillator.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelEightFO;
+
+namespace bogaudio {
+
+struct EightFO : Module {
+ enum ParamsIds {
+ FREQUENCY_PARAM,
+ WAVE_PARAM,
+ SAMPLE_PWM_PARAM,
+ PHASE7_PARAM,
+ PHASE6_PARAM,
+ PHASE5_PARAM,
+ PHASE4_PARAM,
+ PHASE3_PARAM,
+ PHASE2_PARAM,
+ PHASE1_PARAM,
+ PHASE0_PARAM,
+ SLOW_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ SAMPLE_PWM_INPUT,
+ PHASE7_INPUT,
+ PHASE6_INPUT,
+ PHASE5_INPUT,
+ PHASE4_INPUT,
+ PHASE3_INPUT,
+ PHASE2_INPUT,
+ PHASE1_INPUT,
+ PHASE0_INPUT,
+ PITCH_INPUT,
+ RESET_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ PHASE7_OUTPUT,
+ PHASE6_OUTPUT,
+ PHASE5_OUTPUT,
+ PHASE4_OUTPUT,
+ PHASE3_OUTPUT,
+ PHASE2_OUTPUT,
+ PHASE1_OUTPUT,
+ PHASE0_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ SLOW_LIGHT,
+ NUM_LIGHTS
+ };
+
+ enum Wave {
+ NO_WAVE,
+ SINE_WAVE,
+ TRIANGLE_WAVE,
+ RAMP_UP_WAVE,
+ RAMP_DOWN_WAVE,
+ SQUARE_WAVE
+ };
+
+ const int modulationSteps = 100;
+ const float maxFrequency = 1000.0f;
+ const float minFrequency = 1.0f;
+ const float slowModeFactor = 0.01f;
+ const float amplitude = 5.0f;
+ const float basePhase7Offset = Phasor::radiansToPhase(1.75f * M_PI);
+ const float basePhase6Offset = Phasor::radiansToPhase(1.5f * M_PI);
+ const float basePhase5Offset = Phasor::radiansToPhase(1.25f * M_PI);
+ const float basePhase4Offset = Phasor::radiansToPhase(M_PI);
+ const float basePhase3Offset = Phasor::radiansToPhase(0.75f * M_PI);
+ const float basePhase2Offset = Phasor::radiansToPhase(0.5f * M_PI);
+ const float basePhase1Offset = Phasor::radiansToPhase(0.25f * M_PI);
+ const float basePhase0Offset = Phasor::radiansToPhase(0.0f);
+
+ int _modulationStep = 0;
+ Wave _wave = NO_WAVE;
+ bool _slowMode = false;
+ int _sampleSteps = 1;
+ int _sampleStep = 0;
+ SchmittTrigger _resetTrigger;
+
+ Phasor _phasor;
+ TriangleOscillator _triangle;
+ SawOscillator _ramp;
+ SquareOscillator _square;
+
+ float _phase7Offset = 0.0f;
+ float _phase6Offset = 0.0f;
+ float _phase5Offset = 0.0f;
+ float _phase4Offset = 0.0f;
+ float _phase3Offset = 0.0f;
+ float _phase2Offset = 0.0f;
+ float _phase1Offset = 0.0f;
+ float _phase0Offset = 0.0f;
+
+ float _phase7Sample = 0.0f;
+ float _phase6Sample = 0.0f;
+ float _phase5Sample = 0.0f;
+ float _phase4Sample = 0.0f;
+ float _phase3Sample = 0.0f;
+ float _phase2Sample = 0.0f;
+ float _phase1Sample = 0.0f;
+ float _phase0Sample = 0.0f;
+
+ bool _phase7Active = false;
+ bool _phase6Active = false;
+ bool _phase5Active = false;
+ bool _phase4Active = false;
+ bool _phase3Active = false;
+ bool _phase2Active = false;
+ bool _phase1Active = false;
+ bool _phase0Active = false;
+
+ EightFO()
+ : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS)
+ , _phasor(engineGetSampleRate(), 1.0f)
+ , _triangle(0.0f, 0.0f)
+ , _ramp(0.0f, 0.0f)
+ , _square(0.0f, 0.0f)
+ {
+ onReset();
+ }
+
+ virtual void onReset() override;
+ virtual void onSampleRateChange() override;
+ virtual void step() override;
+ float phaseOffset(Param& p, Input& i, float baseOffset);
+ void updateOutput(bool useSample, Output& output, float& offset, float& sample, bool& active);
+};
+
+} // namespace bogaudio
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -2,6 +2,7 @@
#include "bogaudio.hpp"
#include "Additator.hpp"
+#include "EightFO.hpp"
#include "Shaper.hpp"
#include "ShaperPlus.hpp"
@@ -35,7 +36,10 @@ void init(rack::Plugin *p) {
p->website = "https://github.com/bogaudio/BogaudioModules";
p->manual = "https://github.com/bogaudio/BogaudioModules/blob/master/README.md";
+#ifdef EXPERIMENTAL
p->addModel(modelAdditator);
+ p->addModel(modelEightFO);
+#endif
p->addModel(modelShaper);
p->addModel(modelShaperPlus);
diff --git a/src/dsp/oscillator.cpp b/src/dsp/oscillator.cpp
@@ -4,23 +4,38 @@
using namespace bogaudio::dsp;
-void Phasor::setPhase(float phase) {
- _phase = phase / M_PI;
+void Phasor::setPhase(float radians) {
+ _phase = radiansToPhase(radians);
}
-void Phasor::updateDelta() {
- _delta = (_frequency / _sampleRate) * 2.0f;
+float Phasor::nextFromPhasor(const Phasor& phasor, float offset) {
+ float p = phasor._phase + offset;
+ while (p >= maxPhase) {
+ p -= maxPhase;
+ }
+ while (p < 0.0f) {
+ p += maxPhase;
+ }
+ return _nextForPhase(p);
+}
+
+void Phasor::_updateDelta() {
+ _delta = (_frequency / _sampleRate) * maxPhase;
}
float Phasor::_next() {
_phase += _delta;
- if (_phase >= 2.0f) {
- _phase -= 2.0f;
+ if (_phase >= maxPhase) {
+ _phase -= maxPhase;
}
- else if (_phase <= 0.0f) {
- _phase += 2.0f;
+ else if (_phase <= 0.0f && _delta != 0.0f) {
+ _phase += maxPhase;
}
- return _phase;
+ return _nextForPhase(_phase);
+}
+
+float Phasor::_nextForPhase(float phase) {
+ return phase;
}
@@ -44,9 +59,8 @@ float SineOscillator::_next() {
}
-float SawOscillator::_next() {
- Phasor::_next();
- return _amplitude * (_phase - 1.0f);
+float SawOscillator::_nextForPhase(float phase) {
+ return _amplitude * (phase - halfMaxPhase);
}
@@ -60,20 +74,18 @@ void SquareOscillator::setPulseWidth(float pw) {
else {
_pulseWidth = pw;
}
- _pulseWidth *= 2.0f;
+ _pulseWidth *= maxPhase;
}
-float SquareOscillator::_next() {
- Phasor::_next();
-
+float SquareOscillator::_nextForPhase(float phase) {
if (positive) {
- if (_phase >= _pulseWidth) {
+ if (phase >= _pulseWidth) {
positive = false;
return _negativeAmplitude;
}
return _amplitude;
}
- if (_phase < _pulseWidth) {
+ if (phase < _pulseWidth) {
positive = true;
return _amplitude;
}
@@ -81,16 +93,15 @@ float SquareOscillator::_next() {
}
-float TriangleOscillator::_next() {
- Phasor::_next();
- float p = 2.0f * _phase;
- if (_phase < 0.5f) {
+float TriangleOscillator::_nextForPhase(float phase) {
+ float p = maxPhase * phase;
+ if (phase < quarterMaxPhase) {
return _amplitude * p;
}
- if (_phase < 1.5f) {
- return _amplitude * (2.0f - p);
+ if (phase < threeQuartersMaxPhase) {
+ return _amplitude * (maxPhase - p);
}
- return _amplitude * (p - 4.0f);
+ return _amplitude * (p - twiceMaxPhase);
}
diff --git a/src/dsp/oscillator.hpp b/src/dsp/oscillator.hpp
@@ -43,6 +43,8 @@ struct OscillatorGenerator : Generator {
};
struct Phasor : OscillatorGenerator {
+ static constexpr float maxPhase = 2.0f;
+
float _delta;
double _phase = 0.0;
@@ -54,20 +56,24 @@ struct Phasor : OscillatorGenerator {
: OscillatorGenerator(sampleRate, frequency)
{
setPhase(initialPhase);
- updateDelta();
+ _updateDelta();
}
virtual void _sampleRateChanged() override {
- updateDelta();
+ _updateDelta();
}
virtual void _frequencyChanged() override {
- updateDelta();
+ _updateDelta();
}
- void setPhase(float phase);
- void updateDelta();
- virtual float _next() override;
+ void setPhase(float radians);
+ float nextFromPhasor(const Phasor& phasor, float offset = 0.0f); // offset is not radians, but local phase.
+ void _updateDelta();
+ virtual float _next() final;
+ virtual float _nextForPhase(float phase);
+
+ static float radiansToPhase(float radians) { return radians / M_PI; }
};
struct SineOscillator : OscillatorGenerator {
@@ -103,6 +109,7 @@ struct SineOscillator : OscillatorGenerator {
};
struct SawOscillator : Phasor {
+ const float halfMaxPhase = 0.5f * maxPhase;
float _amplitude;
SawOscillator(
@@ -115,7 +122,7 @@ struct SawOscillator : Phasor {
{
}
- virtual float _next() override;
+ virtual float _nextForPhase(float phase) override;
};
struct SquareOscillator : Phasor {
@@ -137,10 +144,13 @@ struct SquareOscillator : Phasor {
void setPulseWidth(float pw);
- virtual float _next() override;
+ virtual float _nextForPhase(float phase) override;
};
struct TriangleOscillator : Phasor {
+ const float quarterMaxPhase = 0.25f * maxPhase;
+ const float threeQuartersMaxPhase = 0.75f * maxPhase;
+ const float twiceMaxPhase = 2.0f * maxPhase;
float _amplitude;
TriangleOscillator(
@@ -153,7 +163,7 @@ struct TriangleOscillator : Phasor {
{
}
- virtual float _next() override;
+ virtual float _nextForPhase(float phase) override;
};
struct SineBankOscillator : OscillatorGenerator {
