Skip to content

Update for Rack v2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SteveRussell33 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update for Rack v2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1958ff
v2 update & warning fix
SteveRussell33 Oct 1, 2021
0eb0b9d
PercussiveVibration warning fix
SteveRussell33 Oct 1, 2021
c7ed968
ComplexOsc::process override
SteveRussell33 Oct 1, 2021
cdf54aa
Fix knobs
SteveRussell33 Oct 1, 2021
c7b8d09
Update plugin.json
SteveRussell33 Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"slug": "LifeFormModular",
"name": "LifeFormModular",
"version": "1.1",
"version": "2.1",
"license": "MIT",
"brand": "LifeFormModular",
"author": "Marc Dacunha",
Expand Down Expand Up @@ -126,4 +126,4 @@
]
}
]
}
}
4 changes: 2 additions & 2 deletions src/ComplexOsc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct ComplexOsc : Module {
Processor_process_init(processor);
}

void process(const ProcessArgs &args) {
void process(const ProcessArgs &args) override {

float pitch = params[OCTAVE_PARAM].getValue() + (params[CARFINE_PARAM].getValue() / 120.0) + (params[CARCOARSE_PARAM].getValue() / 12.0);

Expand Down Expand Up @@ -202,4 +202,4 @@ struct ComplexOscWidget : ModuleWidget {
}
};

Model *modelComplexOsc = createModel<ComplexOsc, ComplexOscWidget>("ComplexOsc");
Model *modelComplexOsc = createModel<ComplexOsc, ComplexOscWidget>("ComplexOsc");
6 changes: 3 additions & 3 deletions src/PercussiveVibration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ void process(const ProcessArgs &args) override{

float noise = 2.0 * random::normal();

float oscout = 0.0;
//float oscout = 0.0;

if (VelTrigger.process(inputs[TRIGG_A_INPUT].getVoltage())){
gate1 = true;
Expand Down Expand Up @@ -428,7 +428,7 @@ sample1 = (inputs[VEL_INPUT].getVoltage());
}

float x = rawoscout / 10.0f;
oscout = clamp (rawoscout, -1.0, 1.0);
//oscout = clamp (rawoscout, -1.0, 1.0);
float cv = params[CUTOFF_PARAM].getValue() + ((out / 10.0f) * params[ENVMOD_PARAM].getValue()) + ((inputs[CUTMOD_INPUT].getVoltage() / 10.0f) * params[CUTOFFMOD_PARAM].getValue()) + ((inputs[CUTMOD2_INPUT].getVoltage() / 10.0f) * params[CUTOFFMOD2_PARAM].getValue()) ;
cv = clamp (cv, 0.0, 0.9);
float q = params[RESO_PARAM].getValue();
Expand Down Expand Up @@ -511,4 +511,4 @@ sample1 = (inputs[VEL_INPUT].getVoltage());
};


Model *modelPercussiveVibration = createModel<PercussiveVibration, PercussiveVibrationWidget>("PercussiveVibration");
Model *modelPercussiveVibration = createModel<PercussiveVibration, PercussiveVibrationWidget>("PercussiveVibration");
18 changes: 9 additions & 9 deletions src/plugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ using namespace rack;

extern Plugin *pluginInstance;

struct LFMKnob : RoundKnob {
struct LFMKnob : SvgKnob {
LFMKnob() {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFMKnob.svg")));
minAngle = -0.68*M_PI;
maxAngle = 0.68*M_PI;
}
};

struct LFMTinyKnob : RoundKnob {
struct LFMTinyKnob : SvgKnob {
LFMTinyKnob() {
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFMTinyKnob.svg")));
minAngle = -0.68*M_PI;
Expand All @@ -38,8 +38,8 @@ struct LFMTinySnapKnob : LFMTinyKnob {

struct LFMSlider : app::SvgSlider {
LFMSlider() {
maxHandlePos = app::mm2px(math::Vec(0, 0).plus(math::Vec(-2.5f, 0)));
minHandlePos = app::mm2px(math::Vec(0, 23).plus(math::Vec(-2.5f, 0)));
maxHandlePos = window::mm2px(math::Vec(0, 0).plus(math::Vec(-2.5f, 0)));
minHandlePos = window::mm2px(math::Vec(0, 23).plus(math::Vec(-2.5f, 0)));
setBackgroundSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFMSlider.svg")));
}
};
Expand Down Expand Up @@ -69,25 +69,25 @@ struct MS : app::SvgSwitch {

struct JackPort : SVGPort {
JackPort() {
setSVG(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Jack.svg")));
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Jack.svg")));
}
};

struct OutJackPort : SVGPort {
OutJackPort() {
setSVG(APP->window->loadSvg(asset::plugin(pluginInstance, "res/OutJack.svg")));
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/OutJack.svg")));
}
};

struct MiniJackPort : SVGPort {
MiniJackPort() {
setSVG(APP->window->loadSvg(asset::plugin(pluginInstance, "res/MiniJack.svg")));
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/MiniJack.svg")));
}
};

struct InJackPort : SVGPort {
InJackPort() {
setSVG(APP->window->loadSvg(asset::plugin(pluginInstance, "res/InJack.svg")));
setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/InJack.svg")));
}
};

Expand Down Expand Up @@ -118,4 +118,4 @@ extern Model *modelPercussiveVibration;
extern Model *modelQuadUtility;
extern Model *modelAdditiveVibration;
extern Model *modelComplexOsc;
extern Model *modelDriftgen;
extern Model *modelDriftgen;