etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-26 06:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

AY: batman is expanding

Browse source
This commit is contained in:
tildearrow 2024-09-01 17:30:06 -05:00
parent d303675961
commit d14b187e66
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/engine/platform/ay.cpp
View file

@ -162,8 +162,8 @@ void DivPlatformAY8910::runTFX(int runRate) {
because for some reason, the register remap doesn't work because for some reason, the register remap doesn't work
when the user uses AtomicSSG core when the user uses AtomicSSG core
*/ */
// TODO: this float counterRatio=1.0;
if (runRate==0) runRate=dacRate; if (runRate!=0) counterRatio=(double)rate/(double)runRate;
int timerPeriod, output; int timerPeriod, output;
for (int i=0; i<3; i++) { for (int i=0; i<3; i++) {
if (chan[i].active && (chan[i].curPSGMode.val&16) && !(chan[i].curPSGMode.val&8) && chan[i].tfx.mode!=-1) { if (chan[i].active && (chan[i].curPSGMode.val&16) && !(chan[i].curPSGMode.val&8) && chan[i].tfx.mode!=-1) {
@ -185,9 +185,9 @@ void DivPlatformAY8910::runTFX(int runRate) {
continue; continue;
} }
} }
chan[i].tfx.counter += 1; chan[i].tfx.counter += counterRatio;
if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 0) { if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 0) {
chan[i].tfx.counter = 0; chan[i].tfx.counter -= chan[i].tfx.period;
chan[i].tfx.out ^= 1; chan[i].tfx.out ^= 1;
output = ((chan[i].tfx.out) ? chan[i].outVol : (chan[i].tfx.lowBound-(15-chan[i].outVol))); output = ((chan[i].tfx.out) ? chan[i].outVol : (chan[i].tfx.lowBound-(15-chan[i].outVol)));
// TODO: fix this stupid crackling noise that happens // TODO: fix this stupid crackling noise that happens
@ -204,7 +204,7 @@ void DivPlatformAY8910::runTFX(int runRate) {
} }
} }
if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 1) { if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 1) {
chan[i].tfx.counter = 0; chan[i].tfx.counter -= chan[i].tfx.period;
if (!isMuted[i]) { if (!isMuted[i]) {
if (intellivision && selCore) { if (intellivision && selCore) {
immWrite(0xa, ayEnvMode); immWrite(0xa, ayEnvMode);
@ -214,7 +214,7 @@ void DivPlatformAY8910::runTFX(int runRate) {
} }
} }
if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 2) { if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 2) {
chan[i].tfx.counter = 0; chan[i].tfx.counter -= chan[i].tfx.period;
} }
} }
if (chan[i].tfx.num > 0) { if (chan[i].tfx.num > 0) {

4
src/engine/platform/ay.h
View file

@ -78,7 +78,9 @@ class DivPlatformAY8910: public DivDispatch {
} dac; } dac;
struct TFX { struct TFX {
int period, counter, offset, den, num, mode, lowBound, out; int period;
float counter;
int offset, den, num, mode, lowBound, out;
TFX(): TFX():
period(0), period(0),
counter(0), counter(0),