DISTRHO
/
Cardinal
mirror of https://github.com/DISTRHO/Cardinal.git
1
0
Fork 0
Code Issues 0 Releases 20 Wiki Activity
Browse Source

Setup a Fundamental fork and remove old VCA hacks 

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 4 years ago
parent
c6d3cb45ed
commit
243d5f33f3
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 3 additions and 296 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      .gitmodules
  2. +1
    -1
      plugins/Fundamental
  3. +0
    -292
      plugins/Fundamental-workaround/VCA.cpp
  4. +1
    -2
      plugins/Makefile

+ 1
- 1
.gitmodules View File

@@ -12,7 +12,7 @@
url = https://github.com/DLTcollab/sse2neon.git
[submodule "plugins/Fundamental"]
path = plugins/Fundamental
url = https://github.com/VCVRack/Fundamental.git
url = https://github.com/CardinalModules/Fundamental.git
[submodule "plugins/Befaco"]
path = plugins/Befaco
url = https://github.com/VCVRack/Befaco.git


+ 1
- 1
plugins/Fundamental

@@ -1 +1 @@
Subproject commit f5943f1921ad986b373e82eb7f8879362fd21901
Subproject commit 71017fc7704bcb24145bee6b6ab1f7fee3340b03

+ 0
- 292
plugins/Fundamental-workaround/VCA.cpp View File

@@ -1,292 +0,0 @@
#include "../Fundamental/src/plugin.hpp"


struct VCA : Module {
enum ParamIds {
LEVEL1_PARAM,
LEVEL2_PARAM,
NUM_PARAMS
};
enum InputIds {
EXP1_INPUT,
LIN1_INPUT,
IN1_INPUT,
EXP2_INPUT,
LIN2_INPUT,
IN2_INPUT,
NUM_INPUTS
};
enum OutputIds {
OUT1_OUTPUT,
OUT2_OUTPUT,
NUM_OUTPUTS
};

VCA() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS);
configParam(LEVEL1_PARAM, 0.0, 1.0, 1.0, "Channel 1 level", "%", 0, 100);
configParam(LEVEL2_PARAM, 0.0, 1.0, 1.0, "Channel 2 level", "%", 0, 100);
configInput(EXP1_INPUT, "Channel 1 exponential CV");
configInput(EXP2_INPUT, "Channel 2 exponential CV");
configInput(LIN1_INPUT, "Channel 1 linear CV");
configInput(LIN2_INPUT, "Channel 2 linear CV");
configInput(IN1_INPUT, "Channel 1");
configInput(IN2_INPUT, "Channel 2");
configOutput(OUT1_OUTPUT, "Channel 1");
configOutput(OUT2_OUTPUT, "Channel 2");
configBypass(IN1_INPUT, OUT1_OUTPUT);
configBypass(IN2_INPUT, OUT2_OUTPUT);
}

void processChannel(Input& in, Param& level, Input& lin, Input& exp, Output& out) {
// Get input
int channels = std::max(in.getChannels(), 1);
simd::float_4 v[4];
for (int c = 0; c < channels; c += 4) {
v[c / 4] = simd::float_4::load(in.getVoltages(c));
}

// Apply knob gain
float gain = level.getValue();
for (int c = 0; c < channels; c += 4) {
v[c / 4] *= gain;
}

// Apply linear CV gain
if (lin.isConnected()) {
if (lin.isPolyphonic()) {
for (int c = 0; c < channels; c += 4) {
simd::float_4 cv = simd::float_4::load(lin.getVoltages(c)) / 10.f;
cv = clamp(cv, 0.f, 1.f);
v[c / 4] *= cv;
}
}
else {
float cv = lin.getVoltage() / 10.f;
cv = clamp(cv, 0.f, 1.f);
for (int c = 0; c < channels; c += 4) {
v[c / 4] *= cv;
}
}
}

// Apply exponential CV gain
const float expBase = 50.f;
if (exp.isConnected()) {
if (exp.isPolyphonic()) {
for (int c = 0; c < channels; c += 4) {
simd::float_4 cv = simd::float_4::load(exp.getVoltages(c)) / 10.f;
cv = clamp(cv, 0.f, 1.f);
cv = rescale(pow(expBase, cv), 1.f, expBase, 0.f, 1.f);
v[c / 4] *= cv;
}
}
else {
float cv = exp.getVoltage() / 10.f;
cv = clamp(cv, 0.f, 1.f);
cv = rescale(std::pow(expBase, cv), 1.f, expBase, 0.f, 1.f);
for (int c = 0; c < channels; c += 4) {
v[c / 4] *= cv;
}
}
}

// Set output
out.setChannels(channels);
for (int c = 0; c < channels; c += 4) {
v[c / 4].store(out.getVoltages(c));
}
}

void process(const ProcessArgs& args) override {
processChannel(inputs[IN1_INPUT], params[LEVEL1_PARAM], inputs[LIN1_INPUT], inputs[EXP1_INPUT], outputs[OUT1_OUTPUT]);
processChannel(inputs[IN2_INPUT], params[LEVEL2_PARAM], inputs[LIN2_INPUT], inputs[EXP2_INPUT], outputs[OUT2_OUTPUT]);
}
};



struct VCAWidget : ModuleWidget {
VCAWidget(VCA* module) {
setModule(module);
setPanel(createPanel(asset::plugin(pluginInstance, "res/VCA.svg")));

addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));

addParam(createParam<RoundLargeBlackKnob>(mm2px(Vec(6.35, 19.11753)), module, VCA::LEVEL1_PARAM));
addParam(createParam<RoundLargeBlackKnob>(mm2px(Vec(6.35, 74.80544)), module, VCA::LEVEL2_PARAM));

addInput(createInput<PJ301MPort>(mm2px(Vec(2.5907, 38.19371)), module, VCA::EXP1_INPUT));
addInput(createInput<PJ301MPort>(mm2px(Vec(14.59752, 38.19371)), module, VCA::LIN1_INPUT));
addInput(createInput<PJ301MPort>(mm2px(Vec(2.5907, 52.80642)), module, VCA::IN1_INPUT));
addInput(createInput<PJ301MPort>(mm2px(Vec(2.5907, 93.53435)), module, VCA::EXP2_INPUT));
addInput(createInput<PJ301MPort>(mm2px(Vec(14.59752, 93.53435)), module, VCA::LIN2_INPUT));
addInput(createInput<PJ301MPort>(mm2px(Vec(2.5907, 108.14706)), module, VCA::IN2_INPUT));

addOutput(createOutput<PJ301MPort>(mm2px(Vec(14.59752, 52.80642)), module, VCA::OUT1_OUTPUT));
addOutput(createOutput<PJ301MPort>(mm2px(Vec(14.59752, 108.14706)), module, VCA::OUT2_OUTPUT));
}
};


Model* modelVCA = createModel<VCA, VCAWidget>("VCA");


struct VCA_1 : Module {
enum ParamIds {
LEVEL_PARAM,
EXP_PARAM,
NUM_PARAMS
};
enum InputIds {
CV_INPUT,
IN_INPUT,
NUM_INPUTS
};
enum OutputIds {
OUT_OUTPUT,
NUM_OUTPUTS
};
enum LightIds {
NUM_LIGHTS
};

int lastChannels = 1;
float lastGains[16] = {};

VCA_1() {
config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
configParam(LEVEL_PARAM, 0.0, 1.0, 1.0, "Level", "%", 0, 100);
configSwitch(EXP_PARAM, 0.0, 1.0, 1.0, "Response mode", {"Exponential", "Linear"});
configInput(CV_INPUT, "CV");
configInput(IN_INPUT, "Channel");
configOutput(OUT_OUTPUT, "Channel");
configBypass(IN_INPUT, OUT_OUTPUT);
}

void process(const ProcessArgs& args) override {
int channels = std::max(inputs[IN_INPUT].getChannels(), 1);
float level = params[LEVEL_PARAM].getValue();

for (int c = 0; c < channels; c++) {
// Get input
float in = inputs[IN_INPUT].getVoltage(c);

// Get gain
float gain = level;
if (inputs[CV_INPUT].isConnected()) {
float cv = clamp(inputs[CV_INPUT].getPolyVoltage(c) / 10.f, 0.f, 1.f);
if (int(params[EXP_PARAM].getValue()) == 0)
cv = std::pow(cv, 4.f);
gain *= cv;
}

// Apply gain
in *= gain;
lastGains[c] = gain;

// Set output
outputs[OUT_OUTPUT].setVoltage(in, c);
}

outputs[OUT_OUTPUT].setChannels(channels);
lastChannels = channels;
}
};


struct VCA_1VUKnob : SliderKnob {
VCA_1* module = NULL;

VCA_1VUKnob() {
box.size = mm2px(Vec(10, 46));
}

void draw(const DrawArgs& args) override {
nvgBeginPath(args.vg);
nvgRoundedRect(args.vg, 0, 0, box.size.x, box.size.y, 2.0);
nvgFillColor(args.vg, nvgRGB(0, 0, 0));
nvgFill(args.vg);
}

void drawLayer(const DrawArgs& args, int layer) override {
if (layer != 1)
return;

const Vec margin = Vec(3, 3);
Rect r = box.zeroPos().grow(margin.neg());

int channels = module ? module->lastChannels : 1;
engine::ParamQuantity* pq = getParamQuantity();
float value = pq ? pq->getValue() : 1.f;

// Segment value
if (value >= 0.005f) {
nvgBeginPath(args.vg);
nvgRect(args.vg,
r.pos.x,
r.pos.y + r.size.y * (1 - value),
r.size.x,
r.size.y * value);
nvgFillColor(args.vg, color::mult(color::WHITE, 0.33));
nvgFill(args.vg);
}

// Segment gain
for (int c = 0; c < channels; c++) {
float gain = module ? module->lastGains[c] : 1.f;
if (gain >= 0.005f) {
nvgBeginPath(args.vg);
nvgRect(args.vg,
r.pos.x + r.size.x * c / channels,
r.pos.y + r.size.y * (1 - gain),
r.size.x / channels,
r.size.y * gain);
nvgFillColor(args.vg, SCHEME_GREEN);
nvgFill(args.vg);
}
}

// Invisible separators
const int segs = 25;
for (int i = 1; i <= segs; i++) {
nvgBeginPath(args.vg);
nvgRect(args.vg,
r.pos.x - 1.0,
r.pos.y + r.size.y * i / segs,
r.size.x + 2.0,
1.0);
nvgFillColor(args.vg, color::BLACK);
nvgFill(args.vg);
}
}
};


struct VCA_1Widget : ModuleWidget {
VCA_1Widget(VCA_1* module) {
setModule(module);
setPanel(createPanel(asset::plugin(pluginInstance, "res/VCA-1.svg")));

addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));

VCA_1VUKnob* levelParam = createParam<VCA_1VUKnob>(mm2px(Vec(2.62103, 12.31692)), module, VCA_1::LEVEL_PARAM);
levelParam->module = module;
addParam(levelParam);
addParam(createParam<CKSS>(mm2px(Vec(5.24619, 79.9593)), module, VCA_1::EXP_PARAM));

addInput(createInput<PJ301MPort>(mm2px(Vec(3.51261, 60.4008)), module, VCA_1::CV_INPUT));
addInput(createInput<PJ301MPort>(mm2px(Vec(3.51398, 97.74977)), module, VCA_1::IN_INPUT));

addOutput(createOutput<PJ301MPort>(mm2px(Vec(3.51398, 108.64454)), module, VCA_1::OUT_OUTPUT));
}
};


Model* modelVCA_1 = createModel<VCA_1, VCA_1Widget>("VCA-1");

+ 1
- 2
plugins/Makefile View File

@@ -371,8 +371,7 @@ PLUGIN_FILES += ESeries/src/E340.cpp
# --------------------------------------------------------------
# Fundamental

PLUGIN_FILES += $(filter-out Fundamental/src/plugin.cpp Fundamental/src/VCA.cpp,$(wildcard Fundamental/src/*.cpp))
PLUGIN_FILES += Fundamental-workaround/VCA.cpp
PLUGIN_FILES += $(filter-out Fundamental/src/plugin.cpp,$(wildcard Fundamental/src/*.cpp))

# --------------------------------------------------------------
# GrandeModular


Write Preview
Loading…
Cancel
Save