commit 0e1bbf7abbe12cd0d0695af22fbb6e8292724176
parent dab2980abbc97929762da3e6aad98cbcba2f74e6
Author: Matt Demanett <matt@demanett.net>
Date: Sun, 29 Apr 2018 14:23:23 -0400
RM: ring mod module.
Diffstat:
7 files changed, 290 insertions(+), 0 deletions(-)
diff --git a/res-src/RM-src.svg b/res-src/RM-src.svg
@@ -0,0 +1,134 @@
+<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" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <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="14.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-depth" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(20 0) rotate(240) translate(-2 2)">0</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(17 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(60) translate(17 0)" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-mix" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <text font-size="5.0pt" transform="rotate(-240) translate(20 0) rotate(240) translate(-2 2)">D</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(17 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(-90) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(17 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(17 0)" />
+ <text font-size="5.0pt" transform="rotate(60) translate(20 0) rotate(-60) translate(-2 2)">W</text>
+ </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>
+ </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">RM</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>
+
+ <g transform="translate(0 25)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">DEPTH</text>
+ <use id="MODULATOR_DEPTH_PARAM" xlink:href="#knob" transform="translate(0 3)" />
+ <use xlink:href="#knobguide-depth" transform="scale(1) translate(0 3)" />
+ <g transform="translate(5.5 49)">
+ <rect width="34" height="39" rx="5" fill="#fafafa" />
+ <use id="MODULATOR_DEPTH_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 131)">
+ <text font-size="6pt" letter-spacing="1px" transform="translate(2 0)">DRY/WET</text>
+ <use id="MIX_PARAM" xlink:href="#knob" transform="translate(0 3)" />
+ <use xlink:href="#knobguide-mix" transform="scale(1) translate(0 3)" />
+ <g transform="translate(5.5 49)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="MIX_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 230)">
+ <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="MODULATOR_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(7.5 35)">MOD</text>
+ <use id="CARRIER_INPUT" xlink:href="#input" transform="translate(5 38)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(8.5 70)">CAR</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>
+
+ <!-- <polyline points="0,0 45,0" stroke-width="0.5" stroke="#0f0" transform="translate(0 73)" /> -->
+</svg>
diff --git a/res/RM.svg b/res/RM.svg
Binary files differ.
diff --git a/src/RM.cpp b/src/RM.cpp
@@ -0,0 +1,73 @@
+
+#include "RM.hpp"
+
+void RM::step() {
+ if (!(outputs[OUT_OUTPUT].active && (inputs[MODULATOR_INPUT].active || inputs[CARRIER_INPUT].active))) {
+ return;
+ }
+ if (inputs[MODULATOR_INPUT].active != inputs[CARRIER_INPUT].active) {
+ if (inputs[MODULATOR_INPUT].active) {
+ outputs[OUT_OUTPUT].value = inputs[MODULATOR_INPUT].value;
+ }
+ else {
+ outputs[OUT_OUTPUT].value = inputs[CARRIER_INPUT].value;
+ }
+ return;
+ }
+
+ float modulator = inputs[MODULATOR_INPUT].value;
+ modulator *= params[MODULATOR_DEPTH_PARAM].value;
+ if (inputs[MODULATOR_DEPTH_INPUT].active) {
+ modulator *= clamp(inputs[MODULATOR_DEPTH_INPUT].value / 10.0f, 0.0f, 1.0f);
+ }
+
+ float carrier = inputs[CARRIER_INPUT].value;
+
+ float mix = params[MIX_PARAM].value;
+ if (inputs[MIX_INPUT].active) {
+ mix *= clamp(inputs[MIX_INPUT].value / 5.0f, -1.0f, 1.0f);
+ }
+ _mix.setMix(mix);
+
+ outputs[OUT_OUTPUT].value = _mix.next(carrier, modulator * carrier * 0.2f);
+}
+
+struct RMWidget : ModuleWidget {
+ RMWidget(RM* module) : ModuleWidget(module) {
+ box.size = Vec(RACK_GRID_WIDTH * 3, RACK_GRID_HEIGHT);
+
+ {
+ SVGPanel *panel = new SVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(SVG::load(assetPlugin(plugin, "res/RM.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 modulatorDepthParamPosition = Vec(7.5, 35.5);
+ auto mixParamPosition = Vec(7.5, 141.5);
+
+ auto modulatorDepthInputPosition = Vec(10.5, 77.0);
+ auto mixInputPosition = Vec(10.5, 183.0);
+ auto modulatorInputPosition = Vec(10.5, 233.0);
+ auto carrierInputPosition = Vec(10.5, 268.0);
+
+ auto outOutputPosition = Vec(10.5, 306.0);
+ // end generated by svg_widgets.rb
+
+ addParam(ParamWidget::create<Knob29>(modulatorDepthParamPosition, module, RM::MODULATOR_DEPTH_PARAM, 0.0, 1.0, 1.0));
+ addParam(ParamWidget::create<Knob29>(mixParamPosition, module, RM::MIX_PARAM, -1.0, 1.0, 1.0));
+
+ addInput(Port::create<Port24>(modulatorInputPosition, Port::INPUT, module, RM::MODULATOR_INPUT));
+ addInput(Port::create<Port24>(carrierInputPosition, Port::INPUT, module, RM::CARRIER_INPUT));
+ addInput(Port::create<Port24>(modulatorDepthInputPosition, Port::INPUT, module, RM::MODULATOR_DEPTH_INPUT));
+ addInput(Port::create<Port24>(mixInputPosition, Port::INPUT, module, RM::MIX_INPUT));
+
+ addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, RM::OUT_OUTPUT));
+ }
+};
+
+Model* modelRM = Model::create<RM, RMWidget>("Bogaudio", "Bogaudio-RM", "RM", RING_MODULATOR_TAG, UTILITY_TAG);
diff --git a/src/RM.hpp b/src/RM.hpp
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/signal.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelRM;
+
+namespace bogaudio {
+
+struct RM : Module {
+ enum ParamsIds {
+ MODULATOR_DEPTH_PARAM,
+ MIX_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ MODULATOR_INPUT,
+ CARRIER_INPUT,
+ MODULATOR_DEPTH_INPUT,
+ MIX_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ OUT_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ NUM_LIGHTS
+ };
+
+ CrossFader _mix;
+
+ RM() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {
+ }
+
+ virtual void step() override;
+};
+
+} // namespace bogaudio
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -15,6 +15,8 @@
#include "Analyzer.hpp"
+#include "RM.hpp"
+
#include "ADSR.hpp"
#include "Bool.hpp"
#include "Detune.hpp"
@@ -60,6 +62,10 @@ void init(rack::Plugin *p) {
p->addModel(modelAnalyzer);
#ifdef EXPERIMENTAL
+ p->addModel(modelRM);
+#endif
+
+#ifdef EXPERIMENTAL
p->addModel(modelADSR);
p->addModel(modelBool);
#endif
diff --git a/src/dsp/signal.cpp b/src/dsp/signal.cpp
@@ -70,3 +70,23 @@ float SlewLimiter::next(float sample) {
--_steps;
return _current;
}
+
+
+void CrossFader::setMix(float mix) {
+ assert(mix >= -1.0f && mix <= 1.0f);
+ if (_mix != mix) {
+ _mix = mix;
+ if (_mix < 0.0f) {
+ _aMix = 1.0f;
+ _bMix = 1.0f + _mix;
+ }
+ else {
+ _aMix = 1.0f - _mix;
+ _bMix = 1.0f;
+ }
+ }
+}
+
+float CrossFader::next(float a, float b) {
+ return _aMix * a + _bMix * b;
+}
diff --git a/src/dsp/signal.hpp b/src/dsp/signal.hpp
@@ -45,5 +45,18 @@ struct SlewLimiter {
float next(float sample);
};
+struct CrossFader {
+ float _mix = 2.0f;
+ float _aMix;
+ float _bMix;
+
+ CrossFader() {
+ setMix(0.0f);
+ }
+
+ void setMix(float mix); // -1 to 1, 0 for equal output of both inputs.
+ float next(float a, float b);
+};
+
} // namespace dsp
} // namespace bogaudio
