6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 01:30:56 +00:00
Code Issues Projects Releases Wiki Activity

Corrects divider, takes another whack at ADSR.

Browse Source
This commit is contained in:
Thomas Harte 2020-04-20 18:58:10 -04:00
parent 99fa86a67e
commit 100fddcee1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Components/OPL2/Implementation/Operator.cpp
View File

@ -77,7 +77,7 @@ void Operator::update(OperatorState &state, bool key_on, int channel_period, int
{511, 511, 511, 511}, // AbsSine: endlessly repeat the first half of the sine wave. {511, 511, 511, 511}, // AbsSine: endlessly repeat the first half of the sine wave.
{255, 0, 255, 0}, // PulseSine: act as if the first quadrant is in the first and third; lock the other two to 0. {255, 0, 255, 0}, // PulseSine: act as if the first quadrant is in the first and third; lock the other two to 0.
}; };
const int phase = (state.raw_phase_ >> 12) + phase_offset; const int phase = (state.raw_phase_ >> 11) + phase_offset;
state.attenuation = negative_log_sin(phase & waveforms[int(waveform_)][(phase >> 8) & 3]); state.attenuation = negative_log_sin(phase & waveforms[int(waveform_)][(phase >> 8) & 3]);
// Key-on logic: any time it is false, be in the release state. // Key-on logic: any time it is false, be in the release state.
@ -142,12 +142,12 @@ void Operator::update(OperatorState &state, bool key_on, int channel_period, int
if(decrease_rate) { if(decrease_rate) {
// TODO: don't throw away KSR bits. // TODO: don't throw away KSR bits.
switch(decrease_rate >> 2) { switch(decrease_rate >> 2) {
case 1: state.adsr_attenuation_ += 4; break; case 1: state.adsr_attenuation_ += 32; break;
case 2: state.adsr_attenuation_ += 2; break; case 2: state.adsr_attenuation_ += 16; break;
default: { default: {
const int sample_length = 1 << ((decrease_rate >> 2) - 4); const int sample_length = 1 << ((decrease_rate >> 2) - 4);
if(!(state.time_in_phase_ & (sample_length - 1))) { if(!(state.time_in_phase_ & (sample_length - 1))) {
++state.adsr_attenuation_; state.adsr_attenuation_ += 8;
} }
} break; } break;
} }