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

every freak chip case fixed fingers crossed

Browse source
This commit is contained in:
Eknous-P 2024-03-22 22:02:48 +04:00
parent 554a8a15b8
commit 4a0642df66
2 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/guiConst.cpp
View file

@ -239,10 +239,14 @@ const char* chanNames[]={
"Noise", "Noise",
"Wavetable", "Wavetable",
"Sample", "Sample",
"Square",
"Square", // the "freaks"
"Triangle", "Triangle",
"Ext. Operator",
"Drums",
"Channel", // if neither "Channel", // if neither
"Channels" "Channels" // in case this makes l10n easier
}; };
const FurnaceGUIColors fxColors[256]={ const FurnaceGUIColors fxColors[256]={

55
src/gui/sysMiscInfo.cpp
View file

@ -302,22 +302,47 @@ void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef) {
void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) { void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {
String info=""; String info="";
unsigned char chanCount[8]={0,0,0,0,0,0,0,0}; // same order as chanNames
// helper: FM|PU|NO|WA|SP|SQ|TR|OP|DR|CH
unsigned char chanCount[10]={0,0,0,0,0,0,0,0,0,0};
for (int i=0; i<whichDef->channels; i++) { for (int i=0; i<whichDef->channels; i++) {
switch (whichDef->chanInsType[i][0]) { switch (whichDef->chanInsType[i][0]) {
case DIV_INS_STD: // square case DIV_INS_STD: // square
switch (whichDef->chanTypes[i]) { if (whichDef->id==0xfd) { // dummy
case DIV_CH_NOISE: chanCount[9]++;
break;
}
if (whichDef->chanTypes[i]==DIV_CH_NOISE) {
chanCount[2]++; chanCount[2]++;
break; } else { // DIV_CH_PULSE
default: // DIV_CH_PULSE ?
chanCount[5]++; chanCount[5]++;
break;
} }
break; break;
case DIV_INS_NES: case DIV_INS_NES:
if (whichDef->chanTypes[i]==DIV_CH_WAVE) { if (whichDef->chanTypes[i]==DIV_CH_WAVE) {
chanCount[6]++; // trianlge chanCount[6]++; // triangle
} else {
chanCount[whichDef->chanTypes[i]]++;
}
break;
case DIV_INS_OPL_DRUMS:
case DIV_INS_OPL:
case DIV_INS_OPLL:
if (whichDef->chanTypes[i]==DIV_CH_OP) {
chanCount[0]++; // opl3 4op
break;
}
if (whichDef->chanTypes[i]==DIV_CH_NOISE) {
chanCount[8]++; // drums
} else {
chanCount[whichDef->chanTypes[i]]++;
}
break;
case DIV_INS_FM:
if (whichDef->chanTypes[i]==DIV_CH_OP) {
chanCount[7]++; // ext. ops
} else if (whichDef->chanTypes[i]==DIV_CH_NOISE) {
break; // csm timer
} else { } else {
chanCount[whichDef->chanTypes[i]]++; chanCount[whichDef->chanTypes[i]]++;
} }
@ -326,29 +351,23 @@ void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {
case DIV_INS_TIA: case DIV_INS_TIA:
case DIV_INS_PET: case DIV_INS_PET:
case DIV_INS_SU: case DIV_INS_SU:
chanCount[7]++; chanCount[9]++;
break; break;
case DIV_INS_OPL_DRUMS:
case DIV_INS_OPLL:
// TODO: drums
// TODO: ext. ch.s
default: default:
chanCount[whichDef->chanTypes[i]]++; chanCount[whichDef->chanTypes[i]]++;
break; break;
} }
} }
for (int i=0; i<8; i++) { for (int i=0; i<10; i++) {
if (chanCount[i]==0) continue; if (chanCount[i]==0) continue;
if (info.length()!=0) { if (info.length()!=0) {
info+=", "; info+=", ";
} }
if (i==7) { if (i==9) {
if (chanCount[i]>1) { if (chanCount[i]>1) {
info+=fmt::sprintf("%d %s",chanCount[i],chanNames[8]); info+=fmt::sprintf("%d %s",chanCount[i],chanNames[10]);
} else { } else {
info+=fmt::sprintf("%d %s",chanCount[i],chanNames[7]); info+=fmt::sprintf("%d %s",chanCount[i],chanNames[9]);
} }
continue; continue;
} }