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

finally, episode 2

Browse source 
now we really output the wave
This commit is contained in:
tildearrow 2021-06-07 03:05:42 -05:00
parent 9e72d4580f
commit c0e4e20b3e
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,11 +14,10 @@
#define FREQ_BASE 1712.0f #define FREQ_BASE 1712.0f
void DivPlatformPCE::acquire(int& l, int& r) { void DivPlatformPCE::acquire(int& l, int& r) {
if (!writes.empty() && --delay<0) { while (!writes.empty()) {
QueuedWrite w=writes.front(); QueuedWrite w=writes.front();
pce->Write(cycles,w.addr,w.val); pce->Write(cycles,w.addr,w.val);
writes.pop(); writes.pop();
delay=2;
} }
tempL=0; tempR=0; tempL=0; tempR=0;
pce->Update(2); pce->Update(2);
@ -30,9 +29,9 @@ void DivPlatformPCE::acquire(int& l, int& r) {
} }
void DivPlatformPCE::updateWave(int ch) { void DivPlatformPCE::updateWave(int ch) {
DivWavetable* wt=parent->getWave(chan[2].wave); DivWavetable* wt=parent->getWave(chan[ch].wave);
chWrite(ch,0x04,0x1f);
chWrite(ch,0x04,0x5f); chWrite(ch,0x04,0x5f);
chWrite(ch,0x04,0x1f);
for (int i=0; i<32; i++) { for (int i=0; i<32; i++) {
chWrite(ch,0x06,wt->data[i]&31); chWrite(ch,0x06,wt->data[i]&31);
} }
@ -41,6 +40,10 @@ void DivPlatformPCE::updateWave(int ch) {
void DivPlatformPCE::tick() { void DivPlatformPCE::tick() {
for (int i=0; i<6; i++) { for (int i=0; i<6; i++) {
chan[i].std.next(); chan[i].std.next();
if (chan[i].std.hadVol) {
chan[i].outVol=(chan[i].vol*chan[i].std.vol)>>5;
chWrite(i,0x04,0x80|chan[i].outVol);
}
if (chan[i].std.hadArp) { if (chan[i].std.hadArp) {
if (!chan[i].inPorta) { if (!chan[i].inPorta) {
if (chan[i].std.arpMode) { if (chan[i].std.arpMode) {
@ -124,7 +127,6 @@ int DivPlatformPCE::dispatch(DivCommand c) {
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
break; break;
case DIV_CMD_WAVE: case DIV_CMD_WAVE:
if (c.chan!=2) break;
chan[c.chan].wave=c.value; chan[c.chan].wave=c.value;
updateWave(c.chan); updateWave(c.chan);
chan[c.chan].keyOn=true; chan[c.chan].keyOn=true;

1
src/engine/platform/sound/pce_psg.cpp
View file

@ -799,7 +799,6 @@ void PCE_PSG::Power(const int32_t timestamp)
channel[ch].control = 0x00; channel[ch].control = 0x00;
channel[ch].balance = 0; channel[ch].balance = 0;
memset(channel[ch].waveform, 0, 32); memset(channel[ch].waveform, 0, 32);
channel[ch].waveform[3]=10;
channel[ch].samp_accum = 0; channel[ch].samp_accum = 0;
channel[ch].waveform_index = 0; channel[ch].waveform_index = 0;