Version 4.2.0

This commit is contained in:
Gary Scavone
2009-03-24 23:02:14 -04:00
committed by Stephen Sinclair
parent cf06b7598b
commit a6381b9d38
281 changed files with 17152 additions and 12000 deletions

View File

@@ -8,7 +8,7 @@
frequency response while maintaining a nearly
constant filter gain.
by Perry R. Cook and Gary P. Scavone, 1995 - 2002.
by Perry R. Cook and Gary P. Scavone, 1995 - 2004.
*/
/***************************************************/
@@ -17,9 +17,10 @@
TwoPole :: TwoPole() : Filter()
{
MY_FLOAT B = 1.0;
MY_FLOAT A[3] = {1.0, 0.0, 0.0};
Filter::setCoefficients( 1, &B, 3, A );
std::vector<StkFloat> b(1, 1.0);
std::vector<StkFloat> a(3, 0.0);
a[0] = 1.0;
Filter::setCoefficients( b, a );
}
TwoPole :: ~TwoPole()
@@ -31,63 +32,65 @@ void TwoPole :: clear(void)
Filter::clear();
}
void TwoPole :: setB0(MY_FLOAT b0)
void TwoPole :: setB0(StkFloat b0)
{
b[0] = b0;
b_[0] = b0;
}
void TwoPole :: setA1(MY_FLOAT a1)
void TwoPole :: setA1(StkFloat a1)
{
a[1] = a1;
a_[1] = a1;
}
void TwoPole :: setA2(MY_FLOAT a2)
void TwoPole :: setA2(StkFloat a2)
{
a[2] = a2;
a_[2] = a2;
}
void TwoPole :: setResonance(MY_FLOAT frequency, MY_FLOAT radius, bool normalize)
void TwoPole :: setResonance(StkFloat frequency, StkFloat radius, bool normalize)
{
a[2] = radius * radius;
a[1] = (MY_FLOAT) -2.0 * radius * cos(TWO_PI * frequency / Stk::sampleRate());
a_[2] = radius * radius;
a_[1] = (StkFloat) -2.0 * radius * cos(TWO_PI * frequency / Stk::sampleRate());
if ( normalize ) {
// Normalize the filter gain ... not terribly efficient.
MY_FLOAT real = 1 - radius + (a[2] - radius) * cos(TWO_PI * 2 * frequency / Stk::sampleRate());
MY_FLOAT imag = (a[2] - radius) * sin(TWO_PI * 2 * frequency / Stk::sampleRate());
b[0] = sqrt( pow(real, 2) + pow(imag, 2) );
StkFloat real = 1 - radius + (a_[2] - radius) * cos(TWO_PI * 2 * frequency / Stk::sampleRate());
StkFloat imag = (a_[2] - radius) * sin(TWO_PI * 2 * frequency / Stk::sampleRate());
b_[0] = sqrt( pow(real, 2) + pow(imag, 2) );
}
}
void TwoPole :: setGain(MY_FLOAT theGain)
void TwoPole :: setGain(StkFloat gain)
{
Filter::setGain(theGain);
Filter::setGain(gain);
}
MY_FLOAT TwoPole :: getGain(void) const
StkFloat TwoPole :: getGain(void) const
{
return Filter::getGain();
}
MY_FLOAT TwoPole :: lastOut(void) const
StkFloat TwoPole :: lastOut(void) const
{
return Filter::lastOut();
}
MY_FLOAT TwoPole :: tick(MY_FLOAT sample)
StkFloat TwoPole :: tick(StkFloat sample)
{
inputs[0] = gain * sample;
outputs[0] = b[0] * inputs[0] - a[2] * outputs[2] - a[1] * outputs[1];
outputs[2] = outputs[1];
outputs[1] = outputs[0];
inputs_[0] = gain_ * sample;
outputs_[0] = b_[0] * inputs_[0] - a_[2] * outputs_[2] - a_[1] * outputs_[1];
outputs_[2] = outputs_[1];
outputs_[1] = outputs_[0];
return outputs[0];
return outputs_[0];
}
MY_FLOAT *TwoPole :: tick(MY_FLOAT *vector, unsigned int vectorSize)
StkFloat *TwoPole :: tick(StkFloat *vector, unsigned int vectorSize)
{
for (unsigned int i=0; i<vectorSize; i++)
vector[i] = tick(vector[i]);
return vector;
return Filter::tick( vector, vectorSize );
}
StkFrames& TwoPole :: tick( StkFrames& frames, unsigned int channel )
{
return Filter::tick( frames, channel );
}