Merge branch 'master' of https://github.com/tildearrow/furnace into nmk112

This commit is contained in:
cam900 2023-11-02 21:19:26 +09:00
commit 31977ab7c6
111 changed files with 2630 additions and 574 deletions

View file

@ -586,10 +586,13 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
case DIV_SYSTEM_C64_6581: {
int clockSel=flags.getInt("clockSel",0);
bool keyPriority=flags.getBool("keyPriority",true);
bool no1EUpdate=flags.getBool("no1EUpdate",false);
bool multiplyRel=flags.getBool("multiplyRel",false);
int testAttack=flags.getInt("testAttack",0);
int testDecay=flags.getInt("testDecay",0);
int testSustain=flags.getInt("testSustain",0);
int testRelease=flags.getInt("testRelease",0);
int initResetTime=flags.getInt("initResetTime",2);
ImGui::Text("Clock rate:");
@ -644,14 +647,38 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
altered=true;
}
ImGui::Text("Envelope reset time:");
pushWarningColor(initResetTime<1 || initResetTime>4);
if (CWSliderInt("##InitReset",&initResetTime,0,16)) {
if (initResetTime<0) initResetTime=0;
if (initResetTime>16) initResetTime=16;
altered=true;
}
popWarningColor();
ImGui::Text("- 0 disables envelope reset. not recommended!\n- 1 may trigger SID envelope bugs.\n- values that are too high may result in notes being skipped.");
if (ImGui::Checkbox("Disable 1Exy env update (compatibility)",&no1EUpdate)) {
altered=true;
}
if (ImGui::Checkbox("Relative duty and cutoff macros are coarse (compatibility)",&multiplyRel)) {
altered=true;
}
if (altered) {
e->lockSave([&]() {
flags.set("clockSel",clockSel);
flags.set("keyPriority",keyPriority);
flags.set("no1EUpdate",no1EUpdate);
flags.set("multiplyRel",multiplyRel);
flags.set("testAttack",testAttack);
flags.set("testDecay",testDecay);
flags.set("testSustain",testSustain);
flags.set("testRelease",testRelease);
flags.set("initResetTime",initResetTime);
});
}
break;