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

GUI: fix system detection

Browse source
This commit is contained in:
tildearrow 2024-03-20 17:39:22 -05:00
parent db45b0d7d7
commit 5848c48a76
2 changed files with 69 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/gui/gui.cpp
View file

@ -635,29 +635,9 @@ void FurnaceGUI::updateWindowTitle() {
} }
} }
void FurnaceGUI::autoDetectSystem() { void FurnaceGUI::autoDetectSystemIter(std::vector<FurnaceGUISysDef>& category, bool& isMatch, std::map<DivSystem,int>& defCountMap, std::map<DivSystem,DivConfig>& defConfMap, std::map<DivSystem,int>& sysCountMap, std::map<DivSystem,DivConfig>& sysConfMap) {
std::map<DivSystem,int> sysCountMap; for (FurnaceGUISysDef& j: category) {
std::map<DivSystem,DivConfig> sysConfMap; if (!j.orig.empty()) {
for (int i=0; i<e->song.systemLen; i++) {
auto it=sysCountMap.find(e->song.system[i]);
if (it==sysCountMap.cend()) {
sysCountMap[e->song.system[i]]=1;
} else {
it->second++;
}
sysConfMap[e->song.system[i]]=e->song.systemFlags[i];
}
logV("sysCountMap:");
for (std::pair<DivSystem,int> k: sysCountMap) {
logV("%s: %d",e->getSystemName(k.first),k.second);
}
bool isMatch=false;
std::map<DivSystem,int> defCountMap;
std::map<DivSystem,DivConfig> defConfMap;
for (FurnaceGUISysCategory& i: sysCategories) {
for (FurnaceGUISysDef& j: i.systems) {
defCountMap.clear(); defCountMap.clear();
defConfMap.clear(); defConfMap.clear();
for (FurnaceGUISysDefChip& k: j.orig) { for (FurnaceGUISysDefChip& k: j.orig) {
@ -671,12 +651,12 @@ void FurnaceGUI::autoDetectSystem() {
dc.loadFromMemory(k.flags); dc.loadFromMemory(k.flags);
defConfMap[k.sys]=dc; defConfMap[k.sys]=dc;
} }
if (defCountMap.size()!=sysCountMap.size()) continue; if (defCountMap.size()==sysCountMap.size()) {
isMatch=true; isMatch=true;
/*logV("trying on defCountMap: %s",j.name); logV("trying on defCountMap: %s",j.name);
for (std::pair<DivSystem,int> k: defCountMap) { for (std::pair<DivSystem,int> k: defCountMap) {
logV("- %s: %d",e->getSystemName(k.first),k.second); logV("- %s: %d",e->getSystemName(k.first),k.second);
}*/ }
for (std::pair<DivSystem,int> k: defCountMap) { for (std::pair<DivSystem,int> k: defCountMap) {
auto countI=sysCountMap.find(k.first); auto countI=sysCountMap.find(k.first);
if (countI==sysCountMap.cend()) { if (countI==sysCountMap.cend()) {
@ -716,6 +696,35 @@ void FurnaceGUI::autoDetectSystem() {
break; break;
} }
} }
}
if (!j.subDefs.empty()) autoDetectSystemIter(j.subDefs,isMatch,defCountMap,defConfMap,sysCountMap,sysConfMap);
if (isMatch) break;
}
}
void FurnaceGUI::autoDetectSystem() {
std::map<DivSystem,int> sysCountMap;
std::map<DivSystem,DivConfig> sysConfMap;
for (int i=0; i<e->song.systemLen; i++) {
auto it=sysCountMap.find(e->song.system[i]);
if (it==sysCountMap.cend()) {
sysCountMap[e->song.system[i]]=1;
} else {
it->second++;
}
sysConfMap[e->song.system[i]]=e->song.systemFlags[i];
}
logV("sysCountMap:");
for (std::pair<DivSystem,int> k: sysCountMap) {
logV("%s: %d",e->getSystemName(k.first),k.second);
}
bool isMatch=false;
std::map<DivSystem,int> defCountMap;
std::map<DivSystem,DivConfig> defConfMap;
for (FurnaceGUISysCategory& i: sysCategories) {
autoDetectSystemIter(i.systems,isMatch,defCountMap,defConfMap,sysCountMap,sysConfMap);
if (isMatch) break; if (isMatch) break;
} }

1
src/gui/gui.h
View file

@ -2511,6 +2511,7 @@ class FurnaceGUI {
void updateWindowTitle(); void updateWindowTitle();
void autoDetectSystem(); void autoDetectSystem();
void autoDetectSystemIter(std::vector<FurnaceGUISysDef>& category, bool& isMatch, std::map<DivSystem,int>& defCountMap, std::map<DivSystem,DivConfig>& defConfMap, std::map<DivSystem,int>& sysCountMap, std::map<DivSystem,DivConfig>& sysConfMap);
void prepareLayout(); void prepareLayout();
ImVec4 channelColor(int ch); ImVec4 channelColor(int ch);
ImVec4 channelTextColor(int ch); ImVec4 channelTextColor(int ch);