audio/wavetable
2
0
Fork 0
mirror of https://codeberg.org/armin/wavetable.git synced 2026-09-01 05:50:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add retrigger to lfos

Browse source
This commit is contained in:
Roland Rabien 2023-09-24 17:49:53 -07:00
commit 56c3bbfa51
7 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/gin

@ -1 +1 @@
Subproject commit c68d93436944689defeb513e4e1007fb9a8995c8 Subproject commit 49e7a0e0d34f0bd47cbd083790e55721573a200e

3
plugin/Resources/layout.json
View file

@ -56,7 +56,8 @@
{ "id": "Phase", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, { "id": "Phase", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 },
{ "id": "Delay", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, { "id": "Delay", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 },
{ "id": "Fade", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 }, { "id": "Fade", "x": "prevR()", "y": "prevY()", "w": 42, "h": 57 },
{ "id": "lfo", "x": "getX('Offset')", "y": "getY('Rate')", "r": "getR('Fade')", "b": "getY('Fade')" } { "id": "lfo", "x": "getX('Offset')", "y": "getY('Rate')", "r": "getR('Fade')", "b": "getY('Fade')" },
{ "id": "Retrig", "r": "getR('lfo') - 3", "y": "getY('lfo') + 3", "w": 12, "h": 12 }
] }, ] },
{ "id": "env[1..3]", "x": "getR('lfo1')+1", "y": "prevY()", "w": "168 + 50", "h": 163, "children": { "id": "env[1..3]", "x": "getR('lfo1')+1", "y": "prevY()", "w": "168 + 50", "h": 163, "children":
[ [

20
plugin/Source/Panels.h
View file

@ -309,22 +309,24 @@ public:
addModSource (new gin::ModulationSourceButton (proc.modMatrix, proc.modSrcLFO[idx], true)); addModSource (new gin::ModulationSourceButton (proc.modMatrix, proc.modSrcLFO[idx], true));
addModSource (new gin::ModulationSourceButton (proc.modMatrix, proc.modSrcMonoLFO[idx], false)); addModSource (new gin::ModulationSourceButton (proc.modMatrix, proc.modSrcMonoLFO[idx], false));
addControl (r = new gin::Knob (lfo.rate), 0, 0); addControl (r = new gin::Knob (lfo.rate));
addControl (b = new gin::Select (lfo.beat), 0, 0); addControl (b = new gin::Select (lfo.beat));
addControl (new gin::Knob (lfo.depth, true), 1, 0); addControl (new gin::Knob (lfo.depth, true));
addControl (new gin::Knob (lfo.fade, true), 0, 1); addControl (new gin::Knob (lfo.fade, true));
addControl (new gin::Knob (lfo.delay), 1, 1); addControl (new gin::Knob (lfo.delay));
addControl (new gin::Select (lfo.wave), 2, 1); addControl (new gin::Select (lfo.wave));
addControl (new gin::Switch (lfo.sync), 3, 1); addControl (new gin::Switch (lfo.sync));
addControl (new gin::Knob (lfo.phase, true), 4, 1); addControl (new gin::Knob (lfo.phase, true));
addControl (new gin::Knob (lfo.offset, true), 5, 1); addControl (new gin::Knob (lfo.offset, true));
auto l = new gin::LFOComponent(); auto l = new gin::LFOComponent();
l->phaseCallback = [this] { return proc.modLFOs[idx].getCurrentPhase(); }; l->phaseCallback = [this] { return proc.modLFOs[idx].getCurrentPhase(); };
l->setParams (lfo.wave, lfo.sync, lfo.rate, lfo.beat, lfo.depth, lfo.offset, lfo.phase, lfo.enable); l->setParams (lfo.wave, lfo.sync, lfo.rate, lfo.beat, lfo.depth, lfo.offset, lfo.phase, lfo.enable);
addControl (l, 2, 0, 4, 1); addControl (l, 2, 0, 4, 1);
addControl (new gin::SVGPluginButton (lfo.retrig, gin::Assets::retrigger));
watchParam (lfo.sync); watchParam (lfo.sync);
setSize (112, 163); setSize (112, 163);

1
plugin/Source/PluginProcessor.cpp
View file

@ -211,6 +211,7 @@ void WavetableAudioProcessor::LFOParams::setup (WavetableAudioProcessor& p, int
enable = p.addIntParam (id + "enable", nm + "Enable", "Enable", "", { 0.0, 1.0, 1.0, 1.0 }, 0.0f, 0.0f, enableTextFunction); enable = p.addIntParam (id + "enable", nm + "Enable", "Enable", "", { 0.0, 1.0, 1.0, 1.0 }, 0.0f, 0.0f, enableTextFunction);
sync = p.addIntParam (id + "sync", nm + "Sync", "Sync", "", { 0.0, 1.0, 1.0, 1.0 }, 0.0, 0.0f, enableTextFunction); sync = p.addIntParam (id + "sync", nm + "Sync", "Sync", "", { 0.0, 1.0, 1.0, 1.0 }, 0.0, 0.0f, enableTextFunction);
retrig = p.addIntParam (id + "retrig", nm + "Retrig", "Retrig", "", { 0.0, 1.0, 1.0, 1.0 }, 1.0, 0.0f, enableTextFunction);
wave = p.addIntParam (id + "wave", nm + "Wave", "Wave", "", { 1.0, 17.0, 1.0, 1.0 }, 1.0, 0.0f, lfoTextFunction); wave = p.addIntParam (id + "wave", nm + "Wave", "Wave", "", { 1.0, 17.0, 1.0, 1.0 }, 1.0, 0.0f, lfoTextFunction);
rate = p.addExtParam (id + "rate", nm + "Rate", "Rate", "Hz", { 0.0, 50.0, 0.0, 0.3f }, 10.0, 0.0f); rate = p.addExtParam (id + "rate", nm + "Rate", "Rate", "Hz", { 0.0, 50.0, 0.0, 0.3f }, 10.0, 0.0f);
beat = p.addIntParam (id + "beat", nm + "Beat", "Beat", "", { 0.0, float (notes.size() - 1), 1.0, 1.0 }, 13.0, 0.0f, durationTextFunction); beat = p.addIntParam (id + "beat", nm + "Beat", "Beat", "", { 0.0, float (notes.size() - 1), 1.0, 1.0 }, 13.0, 0.0f, durationTextFunction);

2
plugin/Source/PluginProcessor.h
View file

@ -108,7 +108,7 @@ public:
{ {
LFOParams() = default; LFOParams() = default;
gin::Parameter::Ptr enable, sync, wave, rate, beat, depth, phase, offset, fade, delay; gin::Parameter::Ptr enable, sync, retrig, wave, rate, beat, depth, phase, offset, fade, delay;
void setup (WavetableAudioProcessor& p, int idx); void setup (WavetableAudioProcessor& p, int idx);

8
plugin/Source/WavetableVoice.cpp
View file

@ -61,8 +61,8 @@ void WavetableVoice::noteStarted()
for (auto& a : modADSRs) for (auto& a : modADSRs)
a.noteOn(); a.noteOn();
for (auto& l : modLFOs) for (auto idx = 0; auto& l : modLFOs)
l.noteOn(); l.noteOn (proc.lfoParams[idx++].retrig->getBoolValue() ? -1 : rng.nextFloat());
modStepLFO.reset(); modStepLFO.reset();
modStepLFO.noteOn(); modStepLFO.noteOn();
@ -91,15 +91,11 @@ void WavetableVoice::noteRetriggered()
updateParams (0); updateParams (0);
for (auto& osc : oscillators)
osc.noteOn();
filterADSR.noteOn(); filterADSR.noteOn();
for (auto& a : modADSRs) for (auto& a : modADSRs)
a.noteOn(); a.noteOn();
modStepLFO.noteOn();
adsr.noteOn(); adsr.noteOn();
} }

1
plugin/Source/WavetableVoice.h
View file

@ -56,6 +56,7 @@ private:
gin::StereoOscillator::Params noiseParams; gin::StereoOscillator::Params noiseParams;
gin::EasedValueSmoother<float> noteSmoother; gin::EasedValueSmoother<float> noteSmoother;
juce::Random rng;
float ampKeyTrack = 1.0f; float ampKeyTrack = 1.0f;
}; };