hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Monstro: use phase delta instead of frequency for deciding which wavetable to use

Browse Source
This commit is contained in:
Vesa
2014-04-08 09:48:43 +03:00
parent e10bbeb84e
commit 13237f9c8e
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/BandLimitedWave.h
View File

@@ -81,6 +81,12 @@ public:
{
return static_cast<float>( _sr ) / _f;
}
/*! \brief This method converts phase delta to wavelength. It assumes a phase scale of 0 to 1. */
static inline float pdToLen( float _pd )
{
return 1.0f / _pd;
}
/*! \brief This method provides interpolated samples of bandlimited waveforms.
* \param _ph The phase of the sample.

38
plugins/monstro/Monstro.cpp
View File

@@ -79,6 +79,11 @@ MonstroSynth::MonstroSynth( MonstroInstrument * _i, NotePlayHandle * _nph,
m_osc3l_phase = 0.0f;
m_osc3r_phase = 0.0f;
m_ph2l_last = 0.0f;
m_ph2r_last = 0.0f;
m_ph3l_last = 0.0f;
m_ph3r_last = 0.0f;
m_env1_phase = 0.0f;
m_env2_phase = 0.0f;
@@ -282,6 +287,10 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf )
float o3l_p;
float o3r_p;
float sub;
// phase delta calculation vars
float pd_l;
float pd_r;
// begin for loop
for( f_cnt_t f = 0; f < _frames; f++ )
@@ -399,9 +408,15 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf )
if( o2l_p < 0 ) o2l_p -= floorf( o2l_p );
if( o2r_p < 0 ) o2r_p -= floorf( o2r_p );
// phase delta
pd_l = qAbs( o2l_p - m_ph2l_last );
if( pd_l > 0.5 ) pd_l = 1.0 - pd_l;
pd_r = qAbs( o2r_p - m_ph2r_last );
if( pd_r > 0.5 ) pd_r = 1.0 - pd_r;
// multi-wave DC Oscillator
sample_t O2L = oscillate( o2w, o2l_p, BandLimitedWave::freqToLen( o2l_f, m_samplerate ) );
sample_t O2R = oscillate( o2w, o2r_p, BandLimitedWave::freqToLen( o2r_f, m_samplerate ) );
sample_t O2L = oscillate( o2w, o2l_p, BandLimitedWave::pdToLen( pd_l ) );
sample_t O2R = oscillate( o2w, o2r_p, BandLimitedWave::pdToLen( pd_r ) );
// do amplitude delta cap
O2L = qBound( m_osc2l_last - m_adcap1, O2L, m_osc2l_last + m_adcap1 );
@@ -416,8 +431,11 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf )
modulatevol( O2R, o2v )
// update osc2 phases
m_ph2l_last = m_osc2l_phase;
m_ph2r_last = m_osc2r_phase;
m_osc2l_phase = fraction( m_osc2l_phase + 1.0f / ( static_cast<float>( m_samplerate ) / o2l_f ) );
m_osc2r_phase = fraction( m_osc2r_phase + 1.0f / ( static_cast<float>( m_samplerate ) / o2r_f ) );
/////////////////////////////
// //
@@ -453,13 +471,19 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf )
if( o3l_p < 0 ) o3l_p -= floorf( o3l_p );
if( o3r_p < 0 ) o3r_p -= floorf( o3r_p );
// phase delta
pd_l = qAbs( o3l_p - m_ph3l_last );
if( pd_l > 0.5 ) pd_l = 1.0 - pd_l;
pd_r = qAbs( o3r_p - m_ph3r_last );
if( pd_r > 0.5 ) pd_r = 1.0 - pd_r;
// multi-wave DC Oscillator, sub-osc 1
sample_t O3AL = oscillate( o3w1, o3l_p, BandLimitedWave::freqToLen( o3l_f, m_samplerate ) );
sample_t O3AR = oscillate( o3w1, o3r_p, BandLimitedWave::freqToLen( o3r_f, m_samplerate ) );
sample_t O3AL = oscillate( o3w1, o3l_p, BandLimitedWave::pdToLen( pd_l ) );
sample_t O3AR = oscillate( o3w1, o3r_p, BandLimitedWave::pdToLen( pd_r ) );
// multi-wave DC Oscillator, sub-osc 2
sample_t O3BL = oscillate( o3w2, o3l_p, BandLimitedWave::freqToLen( o3l_f, m_samplerate ) );
sample_t O3BR = oscillate( o3w2, o3r_p, BandLimitedWave::freqToLen( o3r_f, m_samplerate ) );
sample_t O3BL = oscillate( o3w2, o3l_p, BandLimitedWave::pdToLen( pd_l ) );
sample_t O3BR = oscillate( o3w2, o3r_p, BandLimitedWave::pdToLen( pd_r ) );
// calc and modulate sub
sub = o3sub;
@@ -487,6 +511,8 @@ void MonstroSynth::renderOutput( fpp_t _frames, sampleFrame * _buf )
}
// update osc3 phases
m_ph3l_last = m_osc3l_phase;
m_ph3r_last = m_osc3r_phase;
m_osc3l_phase = fraction( m_osc3l_phase + 1.0f / ( static_cast<float>( m_samplerate ) / o3l_f ) );
m_osc3r_phase = fraction( m_osc3r_phase + 1.0f / ( static_cast<float>( m_samplerate ) / o3r_f ) );

6
plugins/monstro/Monstro.h
View File

@@ -315,6 +315,12 @@ private:
sample_t m_l_last;
sample_t m_r_last;
float m_ph2l_last;
float m_ph2r_last;
float m_ph3l_last;
float m_ph3r_last;
float m_adcap1;
float m_adcap2;
};