etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SNES: easier filter config

This commit is contained in:
tildearrow 2022-09-30 04:02:11 -05:00
parent 36f3641c9f
commit 73a9eb5ccc
3 changed files with 129 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/engine/platform/snes.cpp
View File

@ -672,21 +672,27 @@ void DivPlatformSNES::reset() {
writeControl=false;
writeNoise=false;
writePitchMod=false;
writeEcho=false;
writeEcho=true;
echoDelay=0;
echoFeedback=0;
echoFIR[0]=127;
echoFIR[1]=0;
echoFIR[2]=0;
echoFIR[3]=0;
echoFIR[4]=0;
echoFIR[5]=0;
echoFIR[6]=0;
echoFIR[7]=0;
echoVolL=127;
echoVolR=127;
echoOn=false;
echoDelay=initEchoDelay;
echoFeedback=initEchoFeedback;
echoFIR[0]=initEchoFIR[0];
echoFIR[1]=initEchoFIR[1];
echoFIR[2]=initEchoFIR[2];
echoFIR[3]=initEchoFIR[3];
echoFIR[4]=initEchoFIR[4];
echoFIR[5]=initEchoFIR[5];
echoFIR[6]=initEchoFIR[6];
echoFIR[7]=initEchoFIR[7];
echoVolL=initEchoVolL;
echoVolR=initEchoVolR;
echoOn=initEchoOn;
for (int i=0; i<8; i++) {
if (initEchoMask&(1<<i)) {
chan[i].echo=true;
}
}
initEcho();
}
@ -770,6 +776,23 @@ void DivPlatformSNES::renderSamples() {
void DivPlatformSNES::setFlags(const DivConfig& flags) {
globalVolL=127-flags.getInt("volScaleL",0);
globalVolR=127-flags.getInt("volScaleR",0);
initEchoOn=flags.getBool("echo",false);
initEchoVolL=flags.getInt("echoVolL",127);
initEchoVolR=flags.getInt("echoVolR",127);
initEchoDelay=flags.getInt("echoDelay",0)&15;
initEchoFeedback=flags.getInt("echoFeedback",0);
initEchoFIR[0]=flags.getInt("echoFilter0",127);
initEchoFIR[1]=flags.getInt("echoFilter1",0);
initEchoFIR[2]=flags.getInt("echoFilter2",0);
initEchoFIR[3]=flags.getInt("echoFilter3",0);
initEchoFIR[4]=flags.getInt("echoFilter4",0);
initEchoFIR[5]=flags.getInt("echoFilter5",0);
initEchoFIR[6]=flags.getInt("echoFilter6",0);
initEchoFIR[7]=flags.getInt("echoFilter7",0);
initEchoMask=flags.getInt("echoMask",0);
}
int DivPlatformSNES::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) {

8
src/engine/platform/snes.h
View File

@ -87,6 +87,14 @@ class DivPlatformSNES: public DivDispatch {
bool writeEcho;
bool echoOn;
bool initEchoOn;
signed char initEchoVolL;
signed char initEchoVolR;
signed char initEchoFeedback;
signed char initEchoFIR[8];
unsigned char initEchoDelay;
unsigned char initEchoMask;
struct QueuedWrite {
unsigned char addr;
unsigned char val;

84
src/gui/sysConf.cpp
View File

@ -1183,8 +1183,25 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
break;
}
case DIV_SYSTEM_SNES: { // TODO: echo
char temp[64];
int vsL=127-(flags.getInt("volScaleL",0)&127);
int vsR=127-(flags.getInt("volScaleR",0)&127);
bool echo=flags.getBool("echo",false);
int echoVolL=flags.getInt("echoVolL",127);
int echoVolR=flags.getInt("echoVolR",127);
int echoDelay=flags.getInt("echoDelay",0)&15;
int echoFeedback=flags.getInt("echoFeedback",0);
int echoMask=flags.getInt("echoMask",0);
int echoFilter[8];
echoFilter[0]=flags.getInt("echoFilter0",127);
echoFilter[1]=flags.getInt("echoFilter1",0);
echoFilter[2]=flags.getInt("echoFilter2",0);
echoFilter[3]=flags.getInt("echoFilter3",0);
echoFilter[4]=flags.getInt("echoFilter4",0);
echoFilter[5]=flags.getInt("echoFilter5",0);
echoFilter[6]=flags.getInt("echoFilter6",0);
echoFilter[7]=flags.getInt("echoFilter7",0);
ImGui::Text("Volume scale:");
if (CWSliderInt("Left##VolScaleL",&vsL,0,127)) {
@ -1198,12 +1215,79 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
altered=true;
} rightClickable
if (ImGui::Checkbox("Enable echo",&echo)) {
altered=true;
}
ImGui::Text("Initial echo state:");
for (int i=0; i<8; i++) {
bool echoChan=(bool)(echoMask&(1<<i));
snprintf(temp,63,"%d##EON%d",i+1,i);
if (ImGui::Checkbox(temp,&echoChan)) {
echoMask&=~(1<<i);
if (echoChan) {
echoMask|=1<<i;
}
altered=true;
}
if (i<7) ImGui::SameLine();
}
if (CWSliderInt("Delay##EchoDelay",&echoDelay,0,15)) {
if (echoDelay<0) echoDelay=0;
if (echoDelay>15) echoDelay=15;
altered=true;
} rightClickable
if (CWSliderInt("Feedback##EchoFeedback",&echoFeedback,-128,127)) {
if (echoFeedback<-128) echoFeedback=-128;
if (echoFeedback>127) echoFeedback=127;
altered=true;
} rightClickable
ImGui::Text("Echo volume:");
if (CWSliderInt("Left##EchoVolL",&echoVolL,-128,127)) {
if (echoVolL<-128) echoVolL=-128;
if (echoVolL>127) echoVolL=127;
altered=true;
} rightClickable
if (CWSliderInt("Right##EchoVolL",&echoVolR,-128,127)) {
if (echoVolR<-128) echoVolR=-128;
if (echoVolR>127) echoVolR=127;
altered=true;
} rightClickable
ImGui::Text("Echo filter:");
for (int i=0; i<8; i++) {
snprintf(temp,63,"%d##FIR%d",i+1,i);
if (CWSliderInt(temp,&echoFilter[i],-128,127)) {
if (echoFilter[i]<-128) echoFilter[i]=-128;
if (echoFilter[i]>127) echoFilter[i]=127;
altered=true;
} rightClickable
}
if (altered) {
e->lockSave([&]() {
flags.set("volScaleL",127-vsL);
flags.set("volScaleR",127-vsR);
flags.set("echo",echo);
flags.set("echoVolL",echoVolL);
flags.set("echoVolR",echoVolR);
flags.set("echoDelay",echoDelay);
flags.set("echoFeedback",echoFeedback);
flags.set("echoFilter0",echoFilter[0]);
flags.set("echoFilter1",echoFilter[1]);
flags.set("echoFilter2",echoFilter[2]);
flags.set("echoFilter3",echoFilter[3]);
flags.set("echoFilter4",echoFilter[4]);
flags.set("echoFilter5",echoFilter[5]);
flags.set("echoFilter6",echoFilter[6]);
flags.set("echoFilter7",echoFilter[7]);
flags.set("echoMask",echoMask);
});
}
break;
}
case DIV_SYSTEM_SWAN: