6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-25 11:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix clocking, do a linear attack phase.

Browse Source
This commit is contained in:
Thomas Harte
2025-11-11 20:53:54 -05:00
parent 735afcfabb
commit 989fb32fba
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Components/SID/SID.hpp
+20 -20
View File
@@ -180,29 +180,29 @@ struct Voice {
static_assert(exponential_prescaler[95] == 1);
static_assert(exponential_prescaler[255] == 1);
// TODO: what resets the exponential counter? If anything?
++adsr.exponential_counter;
if(adsr.exponential_counter == exponential_prescaler[adsr.envelope]) {
if(adsr.phase == ADSR::Phase::Attack) {
++adsr.envelope;
// TODO: what really resets the exponential counter? If anything?
adsr.exponential_counter = 0;
} else {
++adsr.exponential_counter;
if(adsr.exponential_counter == exponential_prescaler[adsr.envelope]) {
adsr.exponential_counter = 0;
switch(adsr.phase) {
case ADSR::Phase::Attack:
++adsr.envelope;
if(adsr.envelope == 0xff) {
adsr.set_phase(ADSR::Phase::DecayAndHold);
}
break;
case ADSR::Phase::DecayAndHold:
if(adsr.envelope == adsr.sustain) {
break;
}
--adsr.envelope;
break;
case ADSR::Phase::Release:
if(adsr.envelope) {
switch(adsr.phase) {
default: __builtin_unreachable();
case ADSR::Phase::DecayAndHold:
if(adsr.envelope == adsr.sustain) {
break;
}
--adsr.envelope;
}
break;
break;
case ADSR::Phase::Release:
if(adsr.envelope) {
--adsr.envelope;
}
break;
}
}
}
}