sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Match LFO behavior to ARIA: pulse and sine

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-01 12:56:22 +01:00
parent d40a3ce162
commit 42271fd682
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sfizz/LFO.cpp
View file

@ -102,31 +102,35 @@ template <>
inline float LFO::eval<LFOWave::Sine>(float phase)
{
float x = phase + phase - 1;
return 4 * x * (1 - std::fabs(x));
return -4 * x * (1 - std::fabs(x));
}
// Pulse and Square levels
static constexpr float loPulse = 0.0f; // 0 in ARIA, -1 in Cakewalk
static constexpr float hiPulse = 1.0f;
template <>
inline float LFO::eval<LFOWave::Pulse75>(float phase)
{
return (phase < 0.75f) ? +1.0f : -1.0f;
return (phase < 0.75f) ? hiPulse : loPulse;
}
template <>
inline float LFO::eval<LFOWave::Square>(float phase)
{
return (phase < 0.5f) ? +1.0f : -1.0f;
return (phase < 0.5f) ? hiPulse : loPulse;
}
template <>
inline float LFO::eval<LFOWave::Pulse25>(float phase)
{
return (phase < 0.25f) ? +1.0f : -1.0f;
return (phase < 0.25f) ? hiPulse : loPulse;
}
template <>
inline float LFO::eval<LFOWave::Pulse12_5>(float phase)
{
return (phase < 0.125f) ? +1.0f : -1.0f;
return (phase < 0.125f) ? hiPulse : loPulse;
}
template <>

14
src/sfizz/effects/CommonLFO.hpp
View file

@ -11,6 +11,10 @@ namespace sfz {
namespace fx {
namespace lfo {
// Pulse and Square levels
static constexpr float loPulse = 0.0f; // 0 in ARIA, -1 in Cakewalk
static constexpr float hiPulse = 1.0f;
template <>
inline float evaluateAtPhase<kTriangle>(float phase)
{
@ -24,31 +28,31 @@ namespace lfo {
inline float evaluateAtPhase<kSine>(float phase)
{
float x = phase + phase - 1;
return 4 * x * (1 - std::fabs(x));
return -4 * x * (1 - std::fabs(x));
}
template <>
inline float evaluateAtPhase<kPulse75>(float phase)
{
return (phase < 0.75f) ? +1.0f : -1.0f;
return (phase < 0.75f) ? hiPulse : loPulse;
}
template <>
inline float evaluateAtPhase<kSquare>(float phase)
{
return (phase < 0.5f) ? +1.0f : -1.0f;
return (phase < 0.5f) ? hiPulse : loPulse;
}
template <>
inline float evaluateAtPhase<kPulse25>(float phase)
{
return (phase < 0.25f) ? +1.0f : -1.0f;
return (phase < 0.25f) ? hiPulse : loPulse;
}
template <>
inline float evaluateAtPhase<kPulse12_5>(float phase)
{
return (phase < 0.125f) ? +1.0f : -1.0f;
return (phase < 0.125f) ? hiPulse : loPulse;
}
template <>