otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

game boy progress, part 4

Browse source 
waves are proper now
This commit is contained in:
tildearrow 2021-05-27 23:33:04 -05:00
parent 892ea33e77
commit 831d2c99fb
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/engine/platform/gb.cpp
View file

@ -14,9 +14,10 @@ void DivPlatformGB::acquire(int& l, int& r) {
} }
void DivPlatformGB::updateWave() { void DivPlatformGB::updateWave() {
printf("updating wave\n"); printf("updating wave: %d\n",chan[2].wave);
for (int i=0; i<16; i++) {
DivWavetable* wt=parent->getWave(chan[2].wave); DivWavetable* wt=parent->getWave(chan[2].wave);
rWrite(0x1a,0);
for (int i=0; i<16; i++) {
unsigned char next=((wt->data[i*2]&15)<<4)|(wt->data[1+i*2]&15); unsigned char next=((wt->data[i*2]&15)<<4)|(wt->data[1+i*2]&15);
rWrite(0x30+i,next); rWrite(0x30+i,next);
} }
@ -64,13 +65,13 @@ void DivPlatformGB::tick() {
if (chan[i].std.hadArp) { if (chan[i].std.hadArp) {
if (i==3) { // noise if (i==3) { // noise
if (chan[i].std.arpMode) { if (chan[i].std.arpMode) {
chan[i].baseFreq=chan[i].std.arp; chan[i].baseFreq=chan[i].std.arp+24;
} else { } else {
chan[i].baseFreq=chan[i].note+chan[i].std.arp-12; chan[i].baseFreq=chan[i].note+chan[i].std.arp-12;
} }
} else { } else {
if (chan[i].std.arpMode) { if (chan[i].std.arpMode) {
chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].std.arp)/12.0f))); chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].std.arp+24)/12.0f)));
} else { } else {
chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f))); chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
} }
@ -127,6 +128,7 @@ void DivPlatformGB::tick() {
rWrite(16+i*5+4,((chan[i].keyOn||chan[i].keyOff)?0x80:0x00)|((ins->gb.soundLen<64)<<6)); rWrite(16+i*5+4,((chan[i].keyOn||chan[i].keyOff)?0x80:0x00)|((ins->gb.soundLen<64)<<6));
} else { } else {
rWrite(16+i*5+3,(2048-chan[i].freq)&0xff); rWrite(16+i*5+3,(2048-chan[i].freq)&0xff);
printf("writing trigger kon %d\n",chan[i].keyOn);
rWrite(16+i*5+4,(((2048-chan[i].freq)>>8)&7)|((chan[i].keyOn||chan[i].keyOff)?0x80:0x00)|((ins->gb.soundLen<63)<<6)); rWrite(16+i*5+4,(((2048-chan[i].freq)>>8)&7)|((chan[i].keyOn||chan[i].keyOff)?0x80:0x00)|((ins->gb.soundLen<63)<<6));
} }
if (chan[i].keyOn) chan[i].keyOn=false; if (chan[i].keyOn) chan[i].keyOn=false;
@ -204,9 +206,15 @@ int DivPlatformGB::dispatch(DivCommand c) {
break; break;
} }
case DIV_CMD_STD_NOISE_MODE: case DIV_CMD_STD_NOISE_MODE:
snNoiseMode=(c.value&1)|((c.value&16)>>3); //snNoiseMode=(c.value&1)|((c.value&16)>>3);
updateSNMode=true; updateSNMode=true;
break; break;
case DIV_CMD_PANNING: {
lastPan&=~(0x11<<c.chan);
lastPan|=c.value<<c.chan;
rWrite(0x25,lastPan);
break;
}
case DIV_CMD_LEGATO: case DIV_CMD_LEGATO:
if (c.chan==3) break; if (c.chan==3) break;
chan[c.chan].baseFreq=round(FREQ_BASE/pow(2.0f,((float)c.value/12.0f))); chan[c.chan].baseFreq=round(FREQ_BASE/pow(2.0f,((float)c.value/12.0f)));
@ -240,7 +248,7 @@ int DivPlatformGB::init(DivEngine* p, int channels, int sugRate) {
// enable all channels // enable all channels
GB_apu_write(gb,0x26,0x80); GB_apu_write(gb,0x26,0x80);
GB_apu_write(gb,0x25,0xff); GB_apu_write(gb,0x25,0xff);
snNoiseMode=3; lastPan=0xff;
updateSNMode=false; updateSNMode=false;
return 4; return 4;
} }

2
src/engine/platform/gb.h
View file

@ -28,7 +28,7 @@ class DivPlatformGB: public DivDispatch {
wave(-1) {} wave(-1) {}
}; };
Channel chan[4]; Channel chan[4];
unsigned char snNoiseMode; unsigned char lastPan;
bool updateSNMode; bool updateSNMode;
short oldWrites[64]; short oldWrites[64];
short pendingWrites[64]; short pendingWrites[64];