Version 4.4.0

This commit is contained in:
Gary Scavone
2013-09-29 23:11:39 +02:00
committed by Stephen Sinclair
parent d199342e86
commit eccd8c9981
287 changed files with 11712 additions and 7676 deletions

View File

@@ -1,26 +1,28 @@
#ifndef STK_MODAL_H
#define STK_MODAL_H
#include "Instrmnt.h"
#include "Envelope.h"
#include "FileLoop.h"
#include "SineWave.h"
#include "BiQuad.h"
#include "OnePole.h"
namespace stk {
/***************************************************/
/*! \class Modal
\brief STK resonance model instrument.
\brief STK resonance model abstract base class.
This class contains an excitation wavetable,
an envelope, an oscillator, and N resonances
(non-sweeping BiQuad filters), where N is set
during instantiation.
by Perry R. Cook and Gary P. Scavone, 1995 - 2007.
by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
*/
/***************************************************/
#ifndef STK_MODAL_H
#define STK_MODAL_H
#include "Instrmnt.h"
#include "Envelope.h"
#include "WaveLoop.h"
#include "SineWave.h"
#include "BiQuad.h"
#include "OnePole.h"
class Modal : public Instrmnt
{
public:
@@ -31,45 +33,46 @@ public:
Modal( unsigned int modes = 4 );
//! Class destructor.
virtual ~Modal();
virtual ~Modal( void );
//! Reset and clear all internal state.
void clear();
void clear( void );
//! Set instrument parameters for a particular frequency.
virtual void setFrequency(StkFloat frequency);
virtual void setFrequency( StkFloat frequency );
//! Set the ratio and radius for a specified mode filter.
void setRatioAndRadius(unsigned int modeIndex, StkFloat ratio, StkFloat radius);
void setRatioAndRadius( unsigned int modeIndex, StkFloat ratio, StkFloat radius );
//! Set the master gain.
void setMasterGain(StkFloat aGain);
void setMasterGain( StkFloat aGain ) { masterGain_ = aGain; };
//! Set the direct gain.
void setDirectGain(StkFloat aGain);
void setDirectGain( StkFloat aGain ) { directGain_ = aGain; };
//! Set the gain for a specified mode filter.
void setModeGain(unsigned int modeIndex, StkFloat gain);
void setModeGain( unsigned int modeIndex, StkFloat gain );
//! Initiate a strike with the given amplitude (0.0 - 1.0).
virtual void strike(StkFloat amplitude);
virtual void strike( StkFloat amplitude );
//! Damp modes with a given decay factor (0.0 - 1.0).
void damp(StkFloat amplitude);
void damp( StkFloat amplitude );
//! Start a note with the given frequency and amplitude.
void noteOn(StkFloat frequency, StkFloat amplitude);
void noteOn( StkFloat frequency, StkFloat amplitude );
//! Stop a note with the given amplitude (speed of decay).
void noteOff(StkFloat amplitude);
void noteOff( StkFloat amplitude );
//! Perform the control change specified by \e number and \e value (0.0 - 128.0).
virtual void controlChange(int number, StkFloat value) = 0;
virtual void controlChange( int number, StkFloat value ) = 0;
//! Compute and return one output sample.
StkFloat tick( unsigned int channel = 0 );
protected:
StkFloat computeSample( void );
Envelope envelope_;
FileWvIn *wave_;
BiQuad **filters_;
@@ -88,4 +91,27 @@ protected:
StkFloat baseFrequency_;
};
inline StkFloat Modal :: tick( unsigned int )
{
StkFloat temp = masterGain_ * onepole_.tick( wave_->tick() * envelope_.tick() );
StkFloat temp2 = 0.0;
for ( unsigned int i=0; i<nModes_; i++ )
temp2 += filters_[i]->tick(temp);
temp2 -= temp2 * directGain_;
temp2 += directGain_ * temp;
if ( vibratoGain_ != 0.0 ) {
// Calculate AM and apply to master out
temp = 1.0 + ( vibrato_.tick() * vibratoGain_ );
temp2 = temp * temp2;
}
lastFrame_[0] = temp2;
return lastFrame_[0];
}
} // stk namespace
#endif