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

dev131 - SNES: add more sustain modes and D2

Browse source
This commit is contained in:
tildearrow 2022-12-24 18:03:57 -05:00
parent 3bea6ee891
commit 0914359063
7 changed files with 125 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
papers/format.md
View file

@ -32,6 +32,7 @@ these fields are 0 in format versions prior to 100 (0.6pre1).
the format versions are: the format versions are:
- 131: Furnace dev131
- 130: Furnace dev130 - 130: Furnace dev130
- 129: Furnace dev129 - 129: Furnace dev129
- 128: Furnace dev128 - 128: Furnace dev128

9
papers/newIns.md
View file

@ -440,7 +440,7 @@ size | description
| - bit 0-4: release | - bit 0-4: release
1 | flags 1 | flags
| - bit 4: envelope on | - bit 4: envelope on
| - bit 3: make sustain effective | - bit 3: make sustain effective (<131)
| - bit 0-2: gain mode | - bit 0-2: gain mode
| - 0: direct | - 0: direct
| - 4: dec | - 4: dec
@ -448,6 +448,13 @@ size | description
| - 6: inc | - 6: inc
| - 7: bent | - 7: bent
1 | gain 1 | gain
1 | decay 2/sustain mode (>=131)
| - bit 5-6: sustain mode
| - 0: direct
| - 1: sustain (release with dec)
| - 2: sustain (release with exp)
| - 3: sustain (release with rel)
| - bit 0-4: decay 2
``` ```
# Namco 163 data (N1) # Namco 163 data (N1)

4
src/engine/engine.h
View file

@ -47,8 +47,8 @@
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock(); #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
#define BUSY_END isBusy.unlock(); softLocked=false; #define BUSY_END isBusy.unlock(); softLocked=false;
#define DIV_VERSION "dev130" #define DIV_VERSION "dev131"
#define DIV_ENGINE_VERSION 130 #define DIV_ENGINE_VERSION 131
// for imports // for imports
#define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_MOD 0xff01
#define DIV_VERSION_FC 0xff02 #define DIV_VERSION_FC 0xff02

81
src/engine/instrument.cpp
View file

@ -506,6 +506,8 @@ void DivInstrument::writeFeatureSN(SafeWriter* w) {
w->writeC(snes.gain); w->writeC(snes.gain);
w->writeC(((snes.sus&3)<<5)|(snes.d2&31));
FEATURE_END; FEATURE_END;
} }
@ -1809,7 +1811,7 @@ void DivInstrument::putInsData(SafeWriter* w) {
#define READ_FEAT_END \ #define READ_FEAT_END \
if (reader.tell()<endOfFeat) reader.seek(endOfFeat,SEEK_SET); if (reader.tell()<endOfFeat) reader.seek(endOfFeat,SEEK_SET);
void DivInstrument::readFeatureNA(SafeReader& reader) { void DivInstrument::readFeatureNA(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
name=reader.readString(); name=reader.readString();
@ -1817,7 +1819,7 @@ void DivInstrument::readFeatureNA(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureFM(SafeReader& reader) { void DivInstrument::readFeatureFM(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
unsigned char opCount=reader.readC(); unsigned char opCount=reader.readC();
@ -1888,7 +1890,7 @@ void DivInstrument::readFeatureFM(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureMA(SafeReader& reader) { void DivInstrument::readFeatureMA(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
unsigned short macroHeaderLen=reader.readS(); unsigned short macroHeaderLen=reader.readS();
@ -2010,7 +2012,7 @@ void DivInstrument::readFeatureMA(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeature64(SafeReader& reader) { void DivInstrument::readFeature64(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
unsigned char next=reader.readC(); unsigned char next=reader.readC();
@ -2050,7 +2052,7 @@ void DivInstrument::readFeature64(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureGB(SafeReader& reader) { void DivInstrument::readFeatureGB(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
unsigned char next=reader.readC(); unsigned char next=reader.readC();
@ -2073,7 +2075,7 @@ void DivInstrument::readFeatureGB(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureSM(SafeReader& reader) { void DivInstrument::readFeatureSM(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
amiga.initSample=reader.readS(); amiga.initSample=reader.readS();
@ -2095,7 +2097,7 @@ void DivInstrument::readFeatureSM(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureOx(SafeReader& reader, int op) { void DivInstrument::readFeatureOx(SafeReader& reader, int op, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
unsigned short macroHeaderLen=reader.readS(); unsigned short macroHeaderLen=reader.readS();
@ -2214,7 +2216,7 @@ void DivInstrument::readFeatureOx(SafeReader& reader, int op) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureLD(SafeReader& reader) { void DivInstrument::readFeatureLD(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
fm.fixedDrums=reader.readC(); fm.fixedDrums=reader.readC();
@ -2225,7 +2227,7 @@ void DivInstrument::readFeatureLD(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureSN(SafeReader& reader) { void DivInstrument::readFeatureSN(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
unsigned char next=reader.readC(); unsigned char next=reader.readC();
@ -2238,18 +2240,23 @@ void DivInstrument::readFeatureSN(SafeReader& reader) {
next=reader.readC(); next=reader.readC();
snes.useEnv=next&16; snes.useEnv=next&16;
snes.sus=next&8; snes.sus=(next&8)?1:0;
snes.gainMode=(DivInstrumentSNES::GainMode)(next&7); snes.gainMode=(DivInstrumentSNES::GainMode)(next&7);
if (snes.gainMode==1 || snes.gainMode==2 || snes.gainMode==3) snes.gainMode=DivInstrumentSNES::GAIN_MODE_DIRECT; if (snes.gainMode==1 || snes.gainMode==2 || snes.gainMode==3) snes.gainMode=DivInstrumentSNES::GAIN_MODE_DIRECT;
snes.gain=reader.readC(); snes.gain=reader.readC();
if (version>=131) {
next=reader.readC();
snes.sus=(next>>5)&3;
snes.d2=next&31;
}
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureN1(SafeReader& reader) { void DivInstrument::readFeatureN1(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
n163.wave=reader.readI(); n163.wave=reader.readI();
@ -2260,7 +2267,7 @@ void DivInstrument::readFeatureN1(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureFD(SafeReader& reader) { void DivInstrument::readFeatureFD(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
fds.modSpeed=reader.readI(); fds.modSpeed=reader.readI();
@ -2271,7 +2278,7 @@ void DivInstrument::readFeatureFD(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureWS(SafeReader& reader) { void DivInstrument::readFeatureWS(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
ws.wave1=reader.readI(); ws.wave1=reader.readI();
@ -2406,7 +2413,7 @@ void DivInstrument::readFeatureWL(SafeReader& reader, DivSong* song, short versi
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureMP(SafeReader& reader) { void DivInstrument::readFeatureMP(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
multipcm.ar=reader.readC(); multipcm.ar=reader.readC();
@ -2422,7 +2429,7 @@ void DivInstrument::readFeatureMP(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureSU(SafeReader& reader) { void DivInstrument::readFeatureSU(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
su.switchRoles=reader.readC(); su.switchRoles=reader.readC();
@ -2430,7 +2437,7 @@ void DivInstrument::readFeatureSU(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureES(SafeReader& reader) { void DivInstrument::readFeatureES(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
es5506.filter.mode=(DivInstrumentES5506::Filter::FilterMode)reader.readC(); es5506.filter.mode=(DivInstrumentES5506::Filter::FilterMode)reader.readC();
@ -2447,7 +2454,7 @@ void DivInstrument::readFeatureES(SafeReader& reader) {
READ_FEAT_END; READ_FEAT_END;
} }
void DivInstrument::readFeatureX1(SafeReader& reader) { void DivInstrument::readFeatureX1(SafeReader& reader, short version) {
READ_FEAT_BEGIN; READ_FEAT_BEGIN;
x1_010.bankSlot=reader.readI(); x1_010.bankSlot=reader.readI();
@ -2479,47 +2486,47 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
if (memcmp(featCode,"EN",2)==0) { // end of instrument if (memcmp(featCode,"EN",2)==0) { // end of instrument
break; break;
} else if (memcmp(featCode,"NA",2)==0) { // name } else if (memcmp(featCode,"NA",2)==0) { // name
readFeatureNA(reader); readFeatureNA(reader,version);
} else if (memcmp(featCode,"FM",2)==0) { // FM } else if (memcmp(featCode,"FM",2)==0) { // FM
readFeatureFM(reader); readFeatureFM(reader,version);
} else if (memcmp(featCode,"MA",2)==0) { // macros } else if (memcmp(featCode,"MA",2)==0) { // macros
readFeatureMA(reader); readFeatureMA(reader,version);
} else if (memcmp(featCode,"64",2)==0) { // C64 } else if (memcmp(featCode,"64",2)==0) { // C64
readFeature64(reader); readFeature64(reader,version);
} else if (memcmp(featCode,"GB",2)==0) { // Game Boy } else if (memcmp(featCode,"GB",2)==0) { // Game Boy
readFeatureGB(reader); readFeatureGB(reader,version);
} else if (memcmp(featCode,"SM",2)==0) { // sample } else if (memcmp(featCode,"SM",2)==0) { // sample
readFeatureSM(reader); readFeatureSM(reader,version);
} else if (memcmp(featCode,"O1",2)==0) { // op1 macros } else if (memcmp(featCode,"O1",2)==0) { // op1 macros
readFeatureOx(reader,0); readFeatureOx(reader,0,version);
} else if (memcmp(featCode,"O2",2)==0) { // op2 macros } else if (memcmp(featCode,"O2",2)==0) { // op2 macros
readFeatureOx(reader,1); readFeatureOx(reader,1,version);
} else if (memcmp(featCode,"O3",2)==0) { // op3 macros } else if (memcmp(featCode,"O3",2)==0) { // op3 macros
readFeatureOx(reader,2); readFeatureOx(reader,2,version);
} else if (memcmp(featCode,"O4",2)==0) { // op4 macros } else if (memcmp(featCode,"O4",2)==0) { // op4 macros
readFeatureOx(reader,3); readFeatureOx(reader,3,version);
} else if (memcmp(featCode,"LD",2)==0) { // OPL drums } else if (memcmp(featCode,"LD",2)==0) { // OPL drums
readFeatureLD(reader); readFeatureLD(reader,version);
} else if (memcmp(featCode,"SN",2)==0) { // SNES } else if (memcmp(featCode,"SN",2)==0) { // SNES
readFeatureSN(reader); readFeatureSN(reader,version);
} else if (memcmp(featCode,"N1",2)==0) { // Namco 163 } else if (memcmp(featCode,"N1",2)==0) { // Namco 163
readFeatureN1(reader); readFeatureN1(reader,version);
} else if (memcmp(featCode,"FD",2)==0) { // FDS/VB } else if (memcmp(featCode,"FD",2)==0) { // FDS/VB
readFeatureFD(reader); readFeatureFD(reader,version);
} else if (memcmp(featCode,"WS",2)==0) { // WaveSynth } else if (memcmp(featCode,"WS",2)==0) { // WaveSynth
readFeatureWS(reader); readFeatureWS(reader,version);
} else if (memcmp(featCode,"SL",2)==0 && fui && song!=NULL) { // sample list } else if (memcmp(featCode,"SL",2)==0 && fui && song!=NULL) { // sample list
readFeatureSL(reader,song,version); readFeatureSL(reader,song,version);
} else if (memcmp(featCode,"WL",2)==0 && fui && song!=NULL) { // wave list } else if (memcmp(featCode,"WL",2)==0 && fui && song!=NULL) { // wave list
readFeatureWL(reader,song,version); readFeatureWL(reader,song,version);
} else if (memcmp(featCode,"MP",2)==0) { // MultiPCM } else if (memcmp(featCode,"MP",2)==0) { // MultiPCM
readFeatureMP(reader); readFeatureMP(reader,version);
} else if (memcmp(featCode,"SU",2)==0) { // Sound Unit } else if (memcmp(featCode,"SU",2)==0) { // Sound Unit
readFeatureSU(reader); readFeatureSU(reader,version);
} else if (memcmp(featCode,"ES",2)==0) { // ES5506 } else if (memcmp(featCode,"ES",2)==0) { // ES5506
readFeatureES(reader); readFeatureES(reader,version);
} else if (memcmp(featCode,"X1",2)==0) { // X1-010 } else if (memcmp(featCode,"X1",2)==0) { // X1-010
readFeatureX1(reader); readFeatureX1(reader,version);
} else { } else {
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) { if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
// nothing // nothing
@ -3134,7 +3141,7 @@ DivDataErrors DivInstrument::readInsDataOld(SafeReader &reader, short version) {
snes.a=reader.readC(); snes.a=reader.readC();
snes.d=reader.readC(); snes.d=reader.readC();
snes.s=reader.readC(); snes.s=reader.readC();
snes.sus=snes.s&8; snes.sus=(snes.s&8)?1:0;
snes.s&=7; snes.s&=7;
snes.r=reader.readC(); snes.r=reader.readC();
} }

46
src/engine/instrument.h
View file

@ -604,10 +604,15 @@ struct DivInstrumentSNES {
GAIN_MODE_INC_LINEAR=6, GAIN_MODE_INC_LINEAR=6,
GAIN_MODE_INC_INVLOG=7 GAIN_MODE_INC_INVLOG=7
}; };
bool useEnv, sus; bool useEnv;
// 0: no sustain (key off = cut)
// 1: sustain (R = d2; key off = dec linear to r)
// 2: sustain (R = d2; key off = dec exponential to r)
// 3: sustain (R = d2; key off = R to r)
unsigned char sus;
GainMode gainMode; GainMode gainMode;
unsigned char gain; unsigned char gain;
unsigned char a, d, s, r; unsigned char a, d, s, r, d2;
bool operator==(const DivInstrumentSNES& other); bool operator==(const DivInstrumentSNES& other);
bool operator!=(const DivInstrumentSNES& other) { bool operator!=(const DivInstrumentSNES& other) {
@ -616,13 +621,14 @@ struct DivInstrumentSNES {
DivInstrumentSNES(): DivInstrumentSNES():
useEnv(true), useEnv(true),
sus(false), sus(0),
gainMode(GAIN_MODE_DIRECT), gainMode(GAIN_MODE_DIRECT),
gain(127), gain(127),
a(15), a(15),
d(7), d(7),
s(7), s(7),
r(0) {} r(0),
d2(0) {}
}; };
struct DivInstrument { struct DivInstrument {
@ -665,24 +671,24 @@ struct DivInstrument {
void writeFeatureES(SafeWriter* w); void writeFeatureES(SafeWriter* w);
void writeFeatureX1(SafeWriter* w); void writeFeatureX1(SafeWriter* w);
void readFeatureNA(SafeReader& reader); void readFeatureNA(SafeReader& reader, short version);
void readFeatureFM(SafeReader& reader); void readFeatureFM(SafeReader& reader, short version);
void readFeatureMA(SafeReader& reader); void readFeatureMA(SafeReader& reader, short version);
void readFeature64(SafeReader& reader); void readFeature64(SafeReader& reader, short version);
void readFeatureGB(SafeReader& reader); void readFeatureGB(SafeReader& reader, short version);
void readFeatureSM(SafeReader& reader); void readFeatureSM(SafeReader& reader, short version);
void readFeatureOx(SafeReader& reader, int op); void readFeatureOx(SafeReader& reader, int op, short version);
void readFeatureLD(SafeReader& reader); void readFeatureLD(SafeReader& reader, short version);
void readFeatureSN(SafeReader& reader); void readFeatureSN(SafeReader& reader, short version);
void readFeatureN1(SafeReader& reader); void readFeatureN1(SafeReader& reader, short version);
void readFeatureFD(SafeReader& reader); void readFeatureFD(SafeReader& reader, short version);
void readFeatureWS(SafeReader& reader); void readFeatureWS(SafeReader& reader, short version);
void readFeatureSL(SafeReader& reader, DivSong* song, short version); void readFeatureSL(SafeReader& reader, DivSong* song, short version);
void readFeatureWL(SafeReader& reader, DivSong* song, short version); void readFeatureWL(SafeReader& reader, DivSong* song, short version);
void readFeatureMP(SafeReader& reader); void readFeatureMP(SafeReader& reader, short version);
void readFeatureSU(SafeReader& reader); void readFeatureSU(SafeReader& reader, short version);
void readFeatureES(SafeReader& reader); void readFeatureES(SafeReader& reader, short version);
void readFeatureX1(SafeReader& reader); void readFeatureX1(SafeReader& reader, short version);
DivDataErrors readInsDataOld(SafeReader& reader, short version); DivDataErrors readInsDataOld(SafeReader& reader, short version);
DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song); DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song);

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

@ -607,10 +607,23 @@ void DivPlatformSNES::writeEnv(int ch) {
if (chan[ch].state.sus) { if (chan[ch].state.sus) {
if (chan[ch].active) { if (chan[ch].active) {
chWrite(ch,5,chan[ch].state.a|(chan[ch].state.d<<4)|0x80); chWrite(ch,5,chan[ch].state.a|(chan[ch].state.d<<4)|0x80);
chWrite(ch,6,chan[ch].state.s<<5); chWrite(ch,6,(chan[ch].state.s<<5)|(chan[ch].state.d2&31));
} else { // dec linear } else {
chWrite(ch,7,0x80|chan[ch].state.r); switch (chan[ch].state.sus) {
chWrite(ch,5,0); case 1: // dec linear
chWrite(ch,7,0x80|chan[ch].state.r);
chWrite(ch,5,0);
break;
case 2: // dec exp
chWrite(ch,7,0xa0|chan[ch].state.r);
chWrite(ch,5,0);
break;
case 3: // update r
chWrite(ch,6,(chan[ch].state.s<<5)|(chan[ch].state.r&31));
break;
default: // what?
break;
}
} }
} else { } else {
chWrite(ch,5,chan[ch].state.a|(chan[ch].state.d<<4)|0x80); chWrite(ch,5,chan[ch].state.a|(chan[ch].state.d<<4)|0x80);

30
src/gui/insEdit.cpp
View file

@ -4601,10 +4601,13 @@ void FurnaceGUI::drawInsEdit() {
P(ImGui::Checkbox("Use envelope",&ins->snes.useEnv)); P(ImGui::Checkbox("Use envelope",&ins->snes.useEnv));
ImVec2 sliderSize=ImVec2(20.0f*dpiScale,128.0*dpiScale); ImVec2 sliderSize=ImVec2(20.0f*dpiScale,128.0*dpiScale);
if (ins->snes.useEnv) { if (ins->snes.useEnv) {
if (ImGui::BeginTable("SNESEnvParams",5,ImGuiTableFlags_NoHostExtendX)) { if (ImGui::BeginTable("SNESEnvParams",ins->snes.sus?6:5,ImGuiTableFlags_NoHostExtendX)) {
ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed,sliderSize.x); ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed,sliderSize.x);
ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,sliderSize.x); ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,sliderSize.x);
ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthFixed,sliderSize.x); ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthFixed,sliderSize.x);
if (ins->snes.sus) {
ImGui::TableSetupColumn("c2x",ImGuiTableColumnFlags_WidthFixed,sliderSize.x);
}
ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed,sliderSize.x); ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed,sliderSize.x);
ImGui::TableSetupColumn("c4",ImGuiTableColumnFlags_WidthStretch); ImGui::TableSetupColumn("c4",ImGuiTableColumnFlags_WidthStretch);
@ -4618,6 +4621,11 @@ void FurnaceGUI::drawInsEdit() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
CENTER_TEXT("S"); CENTER_TEXT("S");
ImGui::TextUnformatted("S"); ImGui::TextUnformatted("S");
if (ins->snes.sus) {
ImGui::TableNextColumn();
CENTER_TEXT("D2");
ImGui::TextUnformatted("D2");
}
ImGui::TableNextColumn(); ImGui::TableNextColumn();
CENTER_TEXT("R"); CENTER_TEXT("R");
ImGui::TextUnformatted("R"); ImGui::TextUnformatted("R");
@ -4632,14 +4640,30 @@ void FurnaceGUI::drawInsEdit() {
P(CWVSliderScalar("##Decay",sliderSize,ImGuiDataType_U8,&ins->snes.d,&_ZERO,&_SEVEN)); P(CWVSliderScalar("##Decay",sliderSize,ImGuiDataType_U8,&ins->snes.d,&_ZERO,&_SEVEN));
ImGui::TableNextColumn(); ImGui::TableNextColumn();
P(CWVSliderScalar("##Sustain",sliderSize,ImGuiDataType_U8,&ins->snes.s,&_ZERO,&_SEVEN)); P(CWVSliderScalar("##Sustain",sliderSize,ImGuiDataType_U8,&ins->snes.s,&_ZERO,&_SEVEN));
if (ins->snes.sus) {
ImGui::TableNextColumn();
P(CWVSliderScalar("##Decay2",sliderSize,ImGuiDataType_U8,&ins->snes.d2,&_ZERO,&_THIRTY_ONE));
}
ImGui::TableNextColumn(); ImGui::TableNextColumn();
P(CWVSliderScalar("##Release",sliderSize,ImGuiDataType_U8,&ins->snes.r,&_ZERO,&_THIRTY_ONE)); P(CWVSliderScalar("##Release",sliderSize,ImGuiDataType_U8,&ins->snes.r,&_ZERO,&_THIRTY_ONE));
ImGui::TableNextColumn(); ImGui::TableNextColumn();
drawFMEnv(0,ins->snes.a+1,1+ins->snes.d*2,ins->snes.r,ins->snes.r,(14-ins->snes.s*2),(ins->snes.r==0 || ins->snes.sus),0,0,7,16,31,ImVec2(ImGui::GetContentRegionAvail().x,sliderSize.y),ins->type); drawFMEnv(0,ins->snes.a+1,1+ins->snes.d*2,ins->snes.sus?ins->snes.d2:ins->snes.r,ins->snes.sus?ins->snes.r:31,(14-ins->snes.s*2),(ins->snes.r==0 || (ins->snes.sus && ins->snes.d2==0)),0,0,7,16,31,ImVec2(ImGui::GetContentRegionAvail().x,sliderSize.y),ins->type);
ImGui::EndTable(); ImGui::EndTable();
} }
ImGui::Checkbox("Make sustain effective",&ins->snes.sus); ImGui::Text("Sustain/release mode:");
if (ImGui::RadioButton("Direct (cut on release)",ins->snes.sus==0)) {
ins->snes.sus=0;
}
if (ImGui::RadioButton("Effective (linear decrease)",ins->snes.sus==1)) {
ins->snes.sus=1;
}
if (ImGui::RadioButton("Effective (exponential decrease)",ins->snes.sus==2)) {
ins->snes.sus=2;
}
if (ImGui::RadioButton("Delayed (write R on release)",ins->snes.sus==3)) {
ins->snes.sus=3;
}
} else { } else {
if (ImGui::BeginTable("SNESGainParams",3,ImGuiTableFlags_NoHostExtendX)) { if (ImGui::BeginTable("SNESGainParams",3,ImGuiTableFlags_NoHostExtendX)) {
ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed); ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed);