From 3fed284282784efe299875b70bd32581368ec4c0 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sun, 25 Feb 2018 19:17:26 -0500 Subject: [PATCH] Add Model::create calls --- src/AudibleInstruments.cpp | 14 -------------- src/AudibleInstruments.hpp | 2 +- src/Blinds.cpp | 5 ++++- src/Braids.cpp | 5 ++++- src/Branches.cpp | 7 +++++-- src/Clouds.cpp | 5 ++++- src/Elements.cpp | 9 ++++++--- src/Frames.cpp | 5 ++++- src/Kinks.cpp | 5 ++++- src/Links.cpp | 5 ++++- src/Rings.cpp | 3 +++ src/Shades.cpp | 5 ++++- src/Tides.cpp | 5 ++++- src/Veils.cpp | 5 ++++- src/Warps.cpp | 5 ++++- 15 files changed, 55 insertions(+), 30 deletions(-) diff --git a/src/AudibleInstruments.cpp b/src/AudibleInstruments.cpp index 21ba157..4cace27 100644 --- a/src/AudibleInstruments.cpp +++ b/src/AudibleInstruments.cpp @@ -8,20 +8,6 @@ void init(rack::Plugin *p) { p->slug = TOSTRING(SLUG); p->version = TOSTRING(VERSION); - // p->addModel(createModel("Audible Instruments", "Braids", "Macro Oscillator", OSCILLATOR_TAG, WAVESHAPER_TAG)); - // p->addModel(createModel("Audible Instruments", "Elements", "Modal Synthesizer", PHYSICAL_MODELING_TAG)); - // p->addModel(createModel("Audible Instruments", "Tides", "Tidal Modulator", LFO_TAG, OSCILLATOR_TAG, WAVESHAPER_TAG, FUNCTION_GENERATOR_TAG)); - // p->addModel(createModel("Audible Instruments", "Clouds", "Texture Synthesizer", GRANULAR_TAG, REVERB_TAG)); - // p->addModel(createModel("Audible Instruments", "Warps", "Meta Modulator", RING_MODULATOR_TAG, WAVESHAPER_TAG)); - // p->addModel(createModel("Audible Instruments", "Rings", "Resonator", PHYSICAL_MODELING_TAG)); - // p->addModel(createModel("Audible Instruments", "Links", "Multiples", MULTIPLE_TAG, MIXER_TAG)); - // p->addModel(createModel("Audible Instruments", "Kinks", "Utilities", UTILITY_TAG, NOISE_TAG)); - // p->addModel(createModel("Audible Instruments", "Shades", "Mixer", MIXER_TAG)); - // p->addModel(createModel("Audible Instruments", "Branches", "Bernoulli Gate", RANDOM_TAG, DUAL_TAG)); - // p->addModel(createModel("Audible Instruments", "Blinds", "Quad VC-polarizer", MIXER_TAG, ATTENUATOR_TAG)); - // p->addModel(createModel("Audible Instruments", "Veils", "Quad VCA", MIXER_TAG)); - // p->addModel(createModel("Audible Instruments", "Frames", "Keyframer/Mixer", MIXER_TAG, ATTENUATOR_TAG, LFO_TAG)); - p->addModel(modelBraidsWidget); p->addModel(modelElementsWidget); p->addModel(modelTidesWidget); diff --git a/src/AudibleInstruments.hpp b/src/AudibleInstruments.hpp index d096915..c211ba0 100644 --- a/src/AudibleInstruments.hpp +++ b/src/AudibleInstruments.hpp @@ -18,4 +18,4 @@ extern Model *modelShadesWidget; extern Model *modelBranchesWidget; extern Model *modelBlindsWidget; extern Model *modelVeilsWidget; -extern Model *modelFramesWidget; \ No newline at end of file +extern Model *modelFramesWidget; diff --git a/src/Blinds.cpp b/src/Blinds.cpp index 881dc12..8903904 100644 --- a/src/Blinds.cpp +++ b/src/Blinds.cpp @@ -113,4 +113,7 @@ struct BlindsWidget : ModuleWidget { addChild(ModuleLightWidget::create>(Vec(150, 245), module, Blinds::OUT3_POS_LIGHT)); addChild(ModuleLightWidget::create>(Vec(150, 324), module, Blinds::OUT4_POS_LIGHT)); } -}; \ No newline at end of file +}; + + +Model *modelBlinds = Model::create("Audible Instruments", "Blinds", "Quad VC-polarizer", MIXER_TAG, ATTENUATOR_TAG); diff --git a/src/Braids.cpp b/src/Braids.cpp index 9aa605b..ab79e24 100644 --- a/src/Braids.cpp +++ b/src/Braids.cpp @@ -339,4 +339,7 @@ struct BraidsWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "SIGN", &BraidsSettingItem::setting, &braids->settings.signature, &BraidsSettingItem::onValue, 4)); menu->addChild(construct(&MenuItem::text, "Low CPU", &BraidsLowCpuItem::braids, braids)); } -}; \ No newline at end of file +}; + + +Model *modelBraids = Model::create("Audible Instruments", "Braids", "Macro Oscillator", OSCILLATOR_TAG, WAVESHAPER_TAG); diff --git a/src/Branches.cpp b/src/Branches.cpp index 30347b4..7b630a3 100644 --- a/src/Branches.cpp +++ b/src/Branches.cpp @@ -61,7 +61,7 @@ void Branches::step() { if (gateTrigger[i].process(gate)) { // trigger - float r = randomf(); + float r = randomUniform(); float threshold = clamp(params[THRESHOLD1_PARAM + i].value + inputs[P1_INPUT + i].value / 10.f, 0.f, 1.f); bool toss = (r < threshold); if (!mode[i]) { @@ -136,4 +136,7 @@ struct BranchesWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "Channel 1 mode", &BranchesModeItem::branches, branches, &BranchesModeItem::channel, 0)); menu->addChild(construct(&MenuItem::text, "Channel 2 mode", &BranchesModeItem::branches, branches, &BranchesModeItem::channel, 1)); } -}; \ No newline at end of file +}; + + +Model *modelBranches = Model::create("Audible Instruments", "Branches", "Bernoulli Gate", RANDOM_TAG, DUAL_TAG); diff --git a/src/Clouds.cpp b/src/Clouds.cpp index f22bb4b..bf7578c 100644 --- a/src/Clouds.cpp +++ b/src/Clouds.cpp @@ -394,4 +394,7 @@ struct CloudsWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "4s 16kHz 8-bit µ-law stereo", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 2)); menu->addChild(construct(&MenuItem::text, "8s 16kHz 8-bit µ-law mono", &CloudsQualityItem::module, module, &CloudsQualityItem::quality, 3)); } -}; \ No newline at end of file +}; + + +Model *modelClouds = Model::create("Audible Instruments", "Clouds", "Texture Synthesizer", GRANULAR_TAG, REVERB_TAG); diff --git a/src/Elements.cpp b/src/Elements.cpp index 1d95e3e..1a0b599 100644 --- a/src/Elements.cpp +++ b/src/Elements.cpp @@ -227,8 +227,8 @@ struct ElementsModalItem : MenuItem { }; -struct RampageWidget : ModuleWidget { - RampageWidget(Elements *module) : ModuleWidget(module) { +struct ElementsWidget : ModuleWidget { + ElementsWidget(Elements *module) : ModuleWidget(module) { setPanel(SVG::load(assetPlugin(plugin, "res/Elements.svg"))); addChild(Widget::create(Vec(15, 0))); @@ -314,4 +314,7 @@ struct RampageWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "Non-linear string", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 1)); menu->addChild(construct(&MenuItem::text, "Chords", &ElementsModalItem::elements, elements, &ElementsModalItem::model, 2)); } -}; \ No newline at end of file +}; + + +Model *modelElements = Model::create("Audible Instruments", "Elements", "Modal Synthesizer", PHYSICAL_MODELING_TAG); diff --git a/src/Frames.cpp b/src/Frames.cpp index fc2da46..4450c9a 100644 --- a/src/Frames.cpp +++ b/src/Frames.cpp @@ -421,4 +421,7 @@ struct FramesWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "Keyframer", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, false)); menu->addChild(construct(&MenuItem::text, "Poly LFO", &FramesModeItem::frames, frames, &FramesModeItem::poly_lfo_mode, true)); } -}; \ No newline at end of file +}; + + +Model *modelFrames = Model::create("Audible Instruments", "Frames", "Keyframer/Mixer", MIXER_TAG, ATTENUATOR_TAG, LFO_TAG); diff --git a/src/Kinks.cpp b/src/Kinks.cpp index 33f050e..491751d 100644 --- a/src/Kinks.cpp +++ b/src/Kinks.cpp @@ -94,4 +94,7 @@ struct KinksWidget : ModuleWidget { addChild(ModuleLightWidget::create>(Vec(11, 161), module, Kinks::LOGIC_POS_LIGHT)); addChild(ModuleLightWidget::create>(Vec(11, 262), module, Kinks::SH_POS_LIGHT)); } -}; \ No newline at end of file +}; + + +Model *modelKinks = Model::create("Audible Instruments", "Kinks", "Utilities", UTILITY_TAG, NOISE_TAG); diff --git a/src/Links.cpp b/src/Links.cpp index 2b7db5d..7f24fb3 100644 --- a/src/Links.cpp +++ b/src/Links.cpp @@ -82,4 +82,7 @@ struct LinksWidget : ModuleWidget { addChild(ModuleLightWidget::create>(Vec(26, 161), module, Links::B_POS_LIGHT)); addChild(ModuleLightWidget::create>(Vec(26, 262), module, Links::C_POS_LIGHT)); } -}; \ No newline at end of file +}; + + +Model *modelLinks = Model::create("Audible Instruments", "Links", "Multiples", MULTIPLE_TAG, MIXER_TAG); diff --git a/src/Rings.cpp b/src/Rings.cpp index 82d7809..fed78da 100644 --- a/src/Rings.cpp +++ b/src/Rings.cpp @@ -327,3 +327,6 @@ struct RingsWidget : ModuleWidget { menu->addChild(construct(&MenuItem::text, "Disastrous Peace", &RingsEasterEggItem::rings, rings)); } }; + + +Model *modelRings = Model::create("Audible Instruments", "Rings", "Resonator", PHYSICAL_MODELING_TAG); diff --git a/src/Shades.cpp b/src/Shades.cpp index 7bb100c..357a6fa 100644 --- a/src/Shades.cpp +++ b/src/Shades.cpp @@ -87,4 +87,7 @@ struct ShadesWidget : ModuleWidget { addChild(ModuleLightWidget::create>(Vec(41, 290), module, Shades::OUT2_POS_LIGHT)); addChild(ModuleLightWidget::create>(Vec(41, 326), module, Shades::OUT3_POS_LIGHT)); } -}; \ No newline at end of file +}; + + +Model *modelShades = Model::create("Audible Instruments", "Shades", "Mixer", MIXER_TAG); diff --git a/src/Tides.cpp b/src/Tides.cpp index bcb4f32..0ed6c15 100644 --- a/src/Tides.cpp +++ b/src/Tides.cpp @@ -276,4 +276,7 @@ struct TidesWidget : ModuleWidget { menu->addChild(construct()); menu->addChild(construct(&MenuItem::text, "Sheep", &TidesSheepItem::tides, tides)); } -}; \ No newline at end of file +}; + + +Model *modelTides = Model::create("Audible Instruments", "Tides", "Tidal Modulator", LFO_TAG, OSCILLATOR_TAG, WAVESHAPER_TAG, FUNCTION_GENERATOR_TAG); diff --git a/src/Veils.cpp b/src/Veils.cpp index 1062ff1..00d70c8 100644 --- a/src/Veils.cpp +++ b/src/Veils.cpp @@ -107,4 +107,7 @@ struct VeilsWidget : ModuleWidget { addChild(ModuleLightWidget::create>(Vec(150, 245), module, Veils::OUT3_POS_LIGHT)); addChild(ModuleLightWidget::create>(Vec(150, 324), module, Veils::OUT4_POS_LIGHT)); } -}; \ No newline at end of file +}; + + +Model *modelVeils = Model::create("Audible Instruments", "Veils", "Quad VCA", MIXER_TAG); diff --git a/src/Warps.cpp b/src/Warps.cpp index fa7afd8..61fd85a 100644 --- a/src/Warps.cpp +++ b/src/Warps.cpp @@ -156,4 +156,7 @@ struct WarpsWidget : ModuleWidget { addChild(ModuleLightWidget::create(Vec(40, 63), module, Warps::ALGORITHM_LIGHT)); } -}; \ No newline at end of file +}; + + +Model *modelWarps = Model::create("Audible Instruments", "Warps", "Meta Modulator", RING_MODULATOR_TAG, WAVESHAPER_TAG);