Skip to content
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

Tighten up the stages for high SR low attack ADSR #152

Merged
merged 1 commit into from
Dec 28, 2024
Merged

Tighten up the stages for high SR low attack ADSR #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 11 additions & 12 deletions include/sst/basic-blocks/modulators/AHDSRShapedSC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,13 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
lutsInitialized = true;
}

inline bool isZero(float f) { return f < 1e-6; }

inline void attackFromWithDelay(float from, float delay, float attack)
{
if (delay == 0.f)
if (isZero(delay))
{
attackFrom(from, attack == 0.f);
attackFrom(from, isZero(attack));
}
else
{
Expand Down Expand Up @@ -230,22 +232,22 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
}

// Accelerate traversal through the state machien for the 0 case
if (delay == 0.f && stage == base_t::s_delay)
if (isZero(delay) && stage == base_t::s_delay)
{
phase = 0;
stage = base_t::s_attack;
}
if (a == 0.f && stage == base_t::s_attack)
if (isZero(a) && stage == base_t::s_attack)
{
phase = 0;
stage = base_t::s_hold;
}
if (h == 0.f && stage == base_t::s_hold)
if (isZero(h) && stage == base_t::s_hold)
{
phase = 0.f;
stage = base_t::s_decay;
}
if (d == 0.f && stage == base_t::s_decay)
if (isZero(d) && stage == base_t::s_decay)
{
phase = 0.f;
stage = base_t::s_sustain;
Expand All @@ -261,10 +263,7 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
phase += dPhase(delay);
if (phase > 1)
{
while (phase > 1)
{
phase -= 1;
}
phase -= std::floor(phase);
if (a > 0.f)
{
stage = base_t::s_attack;
Expand Down Expand Up @@ -299,7 +298,7 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
{
stage = base_t::s_decay;
}
phase -= 1.f;
phase -= std::floor(phase);
target = 1.0;
}
else
Expand All @@ -316,7 +315,7 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
if (phase > 1)
{
stage = base_t::s_decay;
phase -= 1.f;
phase -= std::floor(phase);
}
}
break;
Expand Down
Loading