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

SNES: panning/wavetable fixes

Browse source
This commit is contained in:
tildearrow 2022-09-26 03:23:34 -05:00
parent 5f91f0b09c
commit e5b37db55a
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,13 @@ void DivPlatformSNES::acquire(short* bufL, short* bufR, size_t start, size_t len
bufL[h]=out[0]; bufL[h]=out[0];
bufR[h]=out[1]; bufR[h]=out[1];
for (int i=0; i<8; i++) { for (int i=0; i<8; i++) {
oscBuf[i]->data[oscBuf[i]->needle++]=chOut[i*2]+chOut[i*2+1]; int next=chOut[i*2]+chOut[i*2+1];
if (next<-32768) next=-32768;
if (next>32767) next=32767;
next=(next*254)/MAX(1,globalVolL+globalVolR);
if (next<-32768) next=-32768;
if (next>32767) next=32767;
oscBuf[i]->data[oscBuf[i]->needle++]=next;
} }
} }
} }
@ -133,12 +139,10 @@ void DivPlatformSNES::tick(bool sysTick) {
chan[i].freqChanged=true; chan[i].freqChanged=true;
} }
if (chan[i].std.panL.had) { if (chan[i].std.panL.had) {
int val=chan[i].std.panL.val&0x7f; chan[i].panL=chan[i].std.panL.val&0x7f;
chan[i].panL=(val<<1)|(val>>6);
} }
if (chan[i].std.panR.had) { if (chan[i].std.panR.had) {
int val=chan[i].std.panR.val&0x7f; chan[i].panR=chan[i].std.panR.val&0x7f;
chan[i].panR=(val<<1)|(val>>6);
} }
bool hasInverted=false; bool hasInverted=false;
if (chan[i].std.ex1.had) { if (chan[i].std.ex1.had) {
@ -362,8 +366,8 @@ int DivPlatformSNES::dispatch(DivCommand c) {
return chan[c.chan].vol; return chan[c.chan].vol;
break; break;
case DIV_CMD_PANNING: case DIV_CMD_PANNING:
chan[c.chan].panL=c.value; chan[c.chan].panL=c.value>>1;
chan[c.chan].panR=c.value2; chan[c.chan].panR=c.value2>>1;
writeOutVol(c.chan); writeOutVol(c.chan);
break; break;
case DIV_CMD_PITCH: case DIV_CMD_PITCH:
@ -509,7 +513,7 @@ void DivPlatformSNES::reset() {
chan[i]=Channel(); chan[i]=Channel();
chan[i].std.setEngine(parent); chan[i].std.setEngine(parent);
chan[i].ws.setEngine(parent); chan[i].ws.setEngine(parent);
chan[i].ws.init(NULL,32,255); chan[i].ws.init(NULL,32,15);
writeOutVol(i); writeOutVol(i);
chWrite(i,4,i); // source number chWrite(i,4,i); // source number
} }

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

@ -75,7 +75,7 @@ class DivPlatformSNES: public DivDispatch {
Channel chan[8]; Channel chan[8];
DivDispatchOscBuffer* oscBuf[8]; DivDispatchOscBuffer* oscBuf[8];
bool isMuted[8]; bool isMuted[8];
signed char globalVolL, globalVolR; int globalVolL, globalVolR;
unsigned char noiseFreq; unsigned char noiseFreq;
size_t sampleTableBase; size_t sampleTableBase;
bool writeControl; bool writeControl;