commit 31435932e6503922b148fa92a6e0c6a17fcfc045
parent c52c16fc1478e4cbd69f73619c24ff35f716572c
Author: Matt Demanett <matt@demanett.net>
Date: Sat, 17 Mar 2018 19:11:50 -0400
Biquad params from arbitrary z-plane polar coordinates; new Test2 wider test module.
Diffstat:
8 files changed, 411 insertions(+), 2 deletions(-)
diff --git a/res-src/Test2-src.svg b/res-src/Test2-src.svg
@@ -0,0 +1,188 @@
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="90"
+ height="380"
+ viewBox="0 0 90 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="12.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <g transform="rotate(-240) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
+ </g>
+ <g transform="rotate(-210) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-180) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-150) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-120) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-90) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-60) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(-30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(0) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(30) translate(15 0)">
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
+ </g>
+ <g transform="rotate(60) translate(15 0)">
+ <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-4 2.2)">10</text>
+ </g>
+ </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 89,1 89,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" />
+ <polyline points="0.5,0.5 89.5,0.5 89.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" />
+ <polyline points="0,0 90,0 90,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
+
+ <text class="title" x="30" y="17" font-size="9pt" letter-spacing="3px">TEST2</text>
+ <g transform="translate(5.5 374)">
+ <text class="brand" font-size="6.5pt" letter-spacing="2px">BOGAUDIO</text>
+ <rect width="1.5" height="2" fill="#ddd" transform="translate(21 -4)" />
+ </g>
+
+ <g transform="translate(0 30)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">P1A</text>
+ <use id="PARAM1A_PARAM" xlink:href="#knob" transform="translate(0 -1)" />
+ <use xlink:href="#knobguide" transform="translate(0 -1)" />
+ </g>
+ <g transform="translate(0 75)">
+ <g transform="translate(5.5 0)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="CV1A_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 130)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">P2A</text>
+ <use id="PARAM2A_PARAM" xlink:href="#knob" transform="translate(0 -1)" />
+ <use xlink:href="#knobguide" transform="translate(0 -1)" />
+ </g>
+ <g transform="translate(0 175)">
+ <g transform="translate(5.5 0)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="CV2A_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(0 230)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">P3A</text>
+ <use id="PARAM3A_PARAM" xlink:href="#knob" transform="translate(0 -1)" />
+ <use xlink:href="#knobguide" transform="translate(0 -1)" />
+ </g>
+ <g transform="translate(0 275)">
+ <g transform="translate(5.5 0)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="CV3A_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(45 30)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">P1B</text>
+ <use id="PARAM1B_PARAM" xlink:href="#knob" transform="translate(0 -1)" />
+ <use xlink:href="#knobguide" transform="translate(0 -1)" />
+ </g>
+ <g transform="translate(45 75)">
+ <g transform="translate(5.5 0)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="CV1B_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(45 130)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">P2B</text>
+ <use id="PARAM2B_PARAM" xlink:href="#knob" transform="translate(0 -1)" />
+ <use xlink:href="#knobguide" transform="translate(0 -1)" />
+ </g>
+ <g transform="translate(45 175)">
+ <g transform="translate(5.5 0)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="CV2B_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(45 230)">
+ <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">P3B</text>
+ <use id="PARAM3B_PARAM" xlink:href="#knob" transform="translate(0 -1)" />
+ <use xlink:href="#knobguide" transform="translate(0 -1)" />
+ </g>
+ <g transform="translate(45 275)">
+ <g transform="translate(5.5 0)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="CV3B_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">CV</text>
+ </g>
+ </g>
+
+ <g transform="translate(5.5 320)">
+ <g transform="translate(0 0)">
+ <rect width="34" height="38" rx="5" fill="#fafafa" />
+ <use id="IN_INPUT" xlink:href="#input" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(12.5 35)">IN</text>
+ </g>
+ <g transform="translate(45 0)">
+ <rect width="34" height="38" rx="5" fill="#bbb" />
+ <use id="OUT_OUTPUT" xlink:href="#output" transform="translate(5 3)" />
+ <text font-size="5pt" letter-spacing="2px" transform="translate(8.3 35)">OUT</text>
+ </g>
+ </g>
+</svg>
diff --git a/res/Test2.svg b/res/Test2.svg
Binary files differ.
diff --git a/src/Test.hpp b/src/Test.hpp
@@ -6,7 +6,7 @@ extern Model* modelTest;
// #define LPF 1
// #define LPFNOISE 1
-// #define SINE 1
+#define SINE 1
// #define SQUARE 1
// #define SAW 1
// #define TRIANGLE 1
@@ -14,7 +14,7 @@ extern Model* modelTest;
// #define OVERSAMPLING 1
// #define FM 1
// #define PM 1
-#define FEEDBACK_PM 1
+// #define FEEDBACK_PM 1
// #define EG 1
#include "pitch.hpp"
diff --git a/src/Test2.cpp b/src/Test2.cpp
@@ -0,0 +1,92 @@
+
+#include <math.h>
+#include <algorithm>
+
+#include "Test2.hpp"
+#include "pitch.hpp"
+
+void Test2::onReset() {
+}
+
+void Test2::step() {
+ if (!outputs[OUT_OUTPUT].active) {
+ return;
+ }
+
+#ifdef COMPLEX_BIQUAD
+ _complexBiquad.setComplexParams(
+ params[PARAM1B_PARAM].value,
+ params[PARAM2A_PARAM].value,
+ params[PARAM2B_PARAM].value * M_PI,
+ std::min(params[PARAM3A_PARAM].value, 0.9f),
+ params[PARAM3B_PARAM].value * M_PI
+ );
+ float in = 0.0f;
+ if (inputs[IN_INPUT].active) {
+ in = inputs[IN_INPUT].value;
+ }
+ outputs[OUT_OUTPUT].value = _complexBiquad.next(in);
+#endif
+}
+
+// float Test2::oscillatorPitch1A() {
+// if (inputs[CV1A_INPUT].active) {
+// return cvToFrequency(inputs[CV1A_INPUT].value);
+// }
+// return 10000.0 * powf(params[PARAM1_PARAM].value, 2.0);
+// }
+
+
+struct Test2Widget : ModuleWidget {
+ Test2Widget(Test2* module) : ModuleWidget(module) {
+ box.size = Vec(RACK_GRID_WIDTH * 6, RACK_GRID_HEIGHT);
+
+ {
+ SVGPanel *panel = new SVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(SVG::load(assetPlugin(plugin, "res/Test2.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 param1aParamPosition = Vec(9.5, 38.5);
+ auto param2aParamPosition = Vec(9.5, 138.5);
+ auto param3aParamPosition = Vec(9.5, 238.5);
+ auto param1bParamPosition = Vec(54.5, 38.5);
+ auto param2bParamPosition = Vec(54.5, 138.5);
+ auto param3bParamPosition = Vec(54.5, 238.5);
+
+ auto cv1aInputPosition = Vec(10.5, 78.0);
+ auto cv2aInputPosition = Vec(10.5, 178.0);
+ auto cv3aInputPosition = Vec(10.5, 278.0);
+ auto cv1bInputPosition = Vec(55.5, 78.0);
+ auto cv2bInputPosition = Vec(55.5, 178.0);
+ auto cv3bInputPosition = Vec(55.5, 278.0);
+ auto inInputPosition = Vec(10.5, 323.0);
+
+ auto outOutputPosition = Vec(55.5, 323.0);
+ // end generated by svg_widgets.rb
+
+ addParam(ParamWidget::create<Knob26>(param1aParamPosition, module, Test2::PARAM1A_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(param2aParamPosition, module, Test2::PARAM2A_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(param3aParamPosition, module, Test2::PARAM3A_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(param1bParamPosition, module, Test2::PARAM1B_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(param2bParamPosition, module, Test2::PARAM2B_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(param3bParamPosition, module, Test2::PARAM3B_PARAM, 0.0, 1.0, 0.0));
+
+ addInput(Port::create<Port24>(cv1aInputPosition, Port::INPUT, module, Test2::CV1A_INPUT));
+ addInput(Port::create<Port24>(cv2aInputPosition, Port::INPUT, module, Test2::CV2A_INPUT));
+ addInput(Port::create<Port24>(cv3aInputPosition, Port::INPUT, module, Test2::CV3A_INPUT));
+ addInput(Port::create<Port24>(cv1bInputPosition, Port::INPUT, module, Test2::CV1B_INPUT));
+ addInput(Port::create<Port24>(cv2bInputPosition, Port::INPUT, module, Test2::CV2B_INPUT));
+ addInput(Port::create<Port24>(cv3bInputPosition, Port::INPUT, module, Test2::CV3B_INPUT));
+ addInput(Port::create<Port24>(inInputPosition, Port::INPUT, module, Test2::IN_INPUT));
+
+ addOutput(Port::create<Port24>(outOutputPosition, Port::OUTPUT, module, Test2::OUT_OUTPUT));
+ }
+};
+
+Model* modelTest2 = Model::create<Test2, Test2Widget>("Bogaudio", "Bogaudio-Test2", "Test2");
diff --git a/src/Test2.hpp b/src/Test2.hpp
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "bogaudio.hpp"
+
+extern Model* modelTest2;
+
+#define COMPLEX_BIQUAD 1
+
+#ifdef COMPLEX_BIQUAD
+#include "dsp/filter.hpp"
+#elif
+#error what
+#endif
+
+using namespace bogaudio::dsp;
+
+namespace bogaudio {
+
+struct Test2 : Module {
+ enum ParamsIds {
+ PARAM1A_PARAM,
+ PARAM2A_PARAM,
+ PARAM3A_PARAM,
+ PARAM1B_PARAM,
+ PARAM2B_PARAM,
+ PARAM3B_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ CV1A_INPUT,
+ CV2A_INPUT,
+ CV3A_INPUT,
+ CV1B_INPUT,
+ CV2B_INPUT,
+ CV3B_INPUT,
+ IN_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ OUT_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ NUM_LIGHTS
+ };
+
+#ifdef COMPLEX_BIQUAD
+ ComplexBiquadFilter _complexBiquad;
+#endif
+
+ Test2() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {
+ onReset();
+ }
+
+ virtual void onReset() override;
+ virtual void step() override;
+ // float oscillatorPitch1A();
+};
+
+} // namespace bogaudio
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -24,6 +24,7 @@
#include "VCA.hpp"
#include "Test.hpp"
+#include "Test2.hpp"
#include "template_panels.hpp"
//NEW_INCLUDES_HERE
@@ -63,6 +64,7 @@ void init(rack::Plugin *p) {
#ifdef TEST
p->addModel(modelTest);
+ p->addModel(modelTest2);
p->addModel(modelThreeHP);
p->addModel(modelSixHP);
diff --git a/src/dsp/filter.cpp b/src/dsp/filter.cpp
@@ -1,5 +1,6 @@
#include <math.h>
+#include <assert.h>
#include "filter.hpp"
@@ -33,6 +34,46 @@ float BiquadFilter::next(float sample) {
}
+void ComplexBiquadFilter::setComplexParams(
+ float gain,
+ float zeroRadius,
+ float zeroTheta,
+ float poleRadius,
+ float poleTheta
+) {
+ if (
+ _gain != gain ||
+ _zeroRadius != zeroRadius ||
+ _zeroTheta != zeroTheta ||
+ _poleRadius != poleRadius ||
+ _poleTheta != poleTheta
+ ) {
+ assert(gain >= 0.0f && gain <= 1.0f);
+ assert(zeroRadius >= 0.0f && zeroRadius <= 1.0f);
+ assert(zeroTheta >= 0.0f && zeroTheta <= 2.0f*M_PI);
+ assert(poleRadius >= 0.0f && poleRadius <= 1.0f);
+ assert(poleTheta >= 0.0f && poleTheta <= 2.0f*M_PI);
+ _gain = gain;
+ _zeroRadius = zeroRadius;
+ _zeroTheta = zeroTheta;
+ _poleRadius = poleRadius;
+ _poleTheta = poleTheta;
+ updateParams();
+ }
+}
+
+void ComplexBiquadFilter::updateParams() {
+ setParams(
+ _gain,
+ -2.0f * _zeroRadius * cosf(_zeroTheta) * _gain,
+ _zeroRadius * _zeroRadius * _gain,
+ 1.0f,
+ -2.0f * _poleRadius * cosf(_poleTheta),
+ _poleRadius * _poleRadius
+ );
+}
+
+
void LowPassFilter::setParams(float sampleRate, float cutoff, float q) {
if (_sampleRate == sampleRate && _cutoff == cutoff && _q == q) {
return;
diff --git a/src/dsp/filter.hpp b/src/dsp/filter.hpp
@@ -1,5 +1,7 @@
#pragma once
+#include <math.h>
+
namespace bogaudio {
namespace dsp {
@@ -26,6 +28,27 @@ struct BiquadFilter : Filter {
virtual float next(float sample) override;
};
+struct ComplexBiquadFilter : BiquadFilter {
+ float _gain = 1.0f;
+ float _zeroRadius = 1.0f;
+ float _zeroTheta = M_PI;
+ float _poleRadius = 0.9f;
+ float _poleTheta = 0.0f;
+
+ ComplexBiquadFilter() {
+ updateParams();
+ }
+
+ void setComplexParams(
+ float gain,
+ float zeroRadius,
+ float zeroTheta,
+ float poleRadius,
+ float poleTheta
+ );
+ void updateParams();
+};
+
struct LowPassFilter : Filter {
float _sampleRate;
float _cutoff;
