From d1958ffb8bd298fdcb0fbbb7b00b66fa3d525576 Mon Sep 17 00:00:00 2001 From: Steve Russell <41975381+SteveRussell33@users.noreply.github.com> Date: Fri, 1 Oct 2021 01:46:44 +0100 Subject: [PATCH 1/5] v2 update & warning fix --- src/plugin.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugin.hpp b/src/plugin.hpp index 66e560e..1fdc32a 100644 --- a/src/plugin.hpp +++ b/src/plugin.hpp @@ -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"))); } }; @@ -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"))); } }; @@ -118,4 +118,4 @@ extern Model *modelPercussiveVibration; extern Model *modelQuadUtility; extern Model *modelAdditiveVibration; extern Model *modelComplexOsc; -extern Model *modelDriftgen; \ No newline at end of file +extern Model *modelDriftgen; From 0eb0b9d89359a57649a5ae93326b28bd9428b0b7 Mon Sep 17 00:00:00 2001 From: Steve Russell <41975381+SteveRussell33@users.noreply.github.com> Date: Fri, 1 Oct 2021 01:57:07 +0100 Subject: [PATCH 2/5] PercussiveVibration warning fix --- src/PercussiveVibration.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PercussiveVibration.cpp b/src/PercussiveVibration.cpp index 2e8cf4c..c263ae6 100644 --- a/src/PercussiveVibration.cpp +++ b/src/PercussiveVibration.cpp @@ -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; @@ -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(); @@ -511,4 +511,4 @@ sample1 = (inputs[VEL_INPUT].getVoltage()); }; -Model *modelPercussiveVibration = createModel("PercussiveVibration"); \ No newline at end of file +Model *modelPercussiveVibration = createModel("PercussiveVibration"); From c7ed96800ea636fbd33752ae2279ee097333c21b Mon Sep 17 00:00:00 2001 From: Steve Russell <41975381+SteveRussell33@users.noreply.github.com> Date: Fri, 1 Oct 2021 01:59:35 +0100 Subject: [PATCH 3/5] ComplexOsc::process override --- src/ComplexOsc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ComplexOsc.cpp b/src/ComplexOsc.cpp index f1fe2bd..66f663d 100644 --- a/src/ComplexOsc.cpp +++ b/src/ComplexOsc.cpp @@ -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); @@ -202,4 +202,4 @@ struct ComplexOscWidget : ModuleWidget { } }; -Model *modelComplexOsc = createModel("ComplexOsc"); \ No newline at end of file +Model *modelComplexOsc = createModel("ComplexOsc"); From cdf54aafdbd54656b3520780dd5d1fc894c463a5 Mon Sep 17 00:00:00 2001 From: Steve Russell <41975381+SteveRussell33@users.noreply.github.com> Date: Fri, 1 Oct 2021 02:15:39 +0100 Subject: [PATCH 4/5] Fix knobs --- src/plugin.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugin.hpp b/src/plugin.hpp index 1fdc32a..a126a77 100644 --- a/src/plugin.hpp +++ b/src/plugin.hpp @@ -7,7 +7,7 @@ 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; @@ -15,7 +15,7 @@ struct LFMKnob : RoundKnob { } }; -struct LFMTinyKnob : RoundKnob { +struct LFMTinyKnob : SvgKnob { LFMTinyKnob() { setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/LFMTinyKnob.svg"))); minAngle = -0.68*M_PI; From c7b8d096f618c421d7d45784b894c0ac2f3395b0 Mon Sep 17 00:00:00 2001 From: Steve Russell <41975381+SteveRussell33@users.noreply.github.com> Date: Fri, 1 Oct 2021 02:35:10 +0100 Subject: [PATCH 5/5] Update plugin.json --- plugin.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.json b/plugin.json index 9292724..181ada6 100644 --- a/plugin.json +++ b/plugin.json @@ -1,7 +1,7 @@ { "slug": "LifeFormModular", "name": "LifeFormModular", - "version": "1.1", + "version": "2.1", "license": "MIT", "brand": "LifeFormModular", "author": "Marc Dacunha", @@ -126,4 +126,4 @@ ] } ] -} \ No newline at end of file +}