mirror of
https://codeberg.org/armin/wavetable.git
synced 2026-09-01 14:00:47 +02:00
Add pulse 25% and 12.5%
This commit is contained in:
parent
73b34ded3f
commit
67e057357f
2 changed files with 25 additions and 6 deletions
|
|
@ -9,7 +9,9 @@ static juce::String subTextFunction (const gin::Parameter&, float v)
|
||||||
case 0: return "Sine";
|
case 0: return "Sine";
|
||||||
case 1: return "Triangle";
|
case 1: return "Triangle";
|
||||||
case 2: return "Saw";
|
case 2: return "Saw";
|
||||||
case 3: return "Pulse";
|
case 3: return "Pulse 50%";
|
||||||
|
case 4: return "Pulse 25%";
|
||||||
|
case 5: return "Pulse 12%";
|
||||||
default:
|
default:
|
||||||
jassertfalse;
|
jassertfalse;
|
||||||
return {};
|
return {};
|
||||||
|
|
@ -137,7 +139,7 @@ void WavetableAudioProcessor::SubParams::setup (WavetableAudioProcessor& p)
|
||||||
|
|
||||||
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);
|
||||||
retrig = p.addIntParam (id + "retrig", nm + "Retrig", "Retrig", "", { 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 }, 0.0, 0.0f, enableTextFunction);
|
||||||
wave = p.addIntParam (id + "wave", nm + "Wave", "Wave", "", { 0.0, 3.0, 1.0, 1.0 }, 1.0, 0.0f, subTextFunction);
|
wave = p.addIntParam (id + "wave", nm + "Wave", "Wave", "", { 0.0, 5.0, 1.0, 1.0 }, 1.0, 0.0f, subTextFunction);
|
||||||
tune = p.addExtParam (id + "tune", nm + "Tune", "Tune", "st", { -36.0, 36.0, 1.0, 1.0 }, 0.0, 0.0f);
|
tune = p.addExtParam (id + "tune", nm + "Tune", "Tune", "st", { -36.0, 36.0, 1.0, 1.0 }, 0.0, 0.0f);
|
||||||
level = p.addExtParam (id + "level", nm + "Level", "Level", "db", { -100.0, 0.0, 1.0, 4.0 }, 0.0, 0.0f);
|
level = p.addExtParam (id + "level", nm + "Level", "Level", "db", { -100.0, 0.0, 1.0, 4.0 }, 0.0, 0.0f);
|
||||||
pan = p.addExtParam (id + "pan", nm + "Pan", "Pan", "", { -1.0, 1.0, 0.0, 1.0 }, 0.0, 0.0f);
|
pan = p.addExtParam (id + "pan", nm + "Pan", "Pan", "", { -1.0, 1.0, 0.0, 1.0 }, 0.0, 0.0f);
|
||||||
|
|
|
||||||
|
|
@ -240,10 +240,27 @@ void WavetableVoice::updateParams (int blockSize)
|
||||||
|
|
||||||
switch (proc.subParams.wave->getUserValueInt())
|
switch (proc.subParams.wave->getUserValueInt())
|
||||||
{
|
{
|
||||||
case 0: subParams.wave = gin::Wave::sine; break;
|
case 0:
|
||||||
case 1: subParams.wave = gin::Wave::triangle; break;
|
subParams.wave = gin::Wave::sine;
|
||||||
case 2: subParams.wave = gin::Wave::sawUp; break;
|
break;
|
||||||
case 3: subParams.wave = gin::Wave::pulse; break;;
|
case 1:
|
||||||
|
subParams.wave = gin::Wave::triangle;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
subParams.wave = gin::Wave::sawUp;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
subParams.wave = gin::Wave::pulse;
|
||||||
|
subParams.pw = 0.50f;
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
subParams.wave = gin::Wave::pulse;
|
||||||
|
subParams.pw = 0.25f;
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
subParams.wave = gin::Wave::pulse;
|
||||||
|
subParams.pw = 0.125f;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
subParams.leftGain = getValue (proc.subParams.level) * (1.0f - getValue (proc.subParams.pan));
|
subParams.leftGain = getValue (proc.subParams.level) * (1.0f - getValue (proc.subParams.pan));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue