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

GUI: channel status, part 2

Browse source
This commit is contained in:
tildearrow 2023-10-26 19:03:45 -05:00
parent ad4d08243a
commit e28af73746
3 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/engine.cpp
View file

@ -1424,6 +1424,11 @@ DivChannelPair DivEngine::getChanPaired(int ch) {
return disCont[dispatchOfChan[ch]].dispatch->getPaired(dispatchChanOfChan[ch]); return disCont[dispatchOfChan[ch]].dispatch->getPaired(dispatchChanOfChan[ch]);
} }
DivChannelModeHints DivEngine::getChanModeHints(int ch) {
if (ch<0 || ch>=chans) return DivChannelModeHints();
return disCont[dispatchOfChan[ch]].dispatch->getModeHints(dispatchChanOfChan[ch]);
}
unsigned char* DivEngine::getRegisterPool(int sys, int& size, int& depth) { unsigned char* DivEngine::getRegisterPool(int sys, int& size, int& depth) {
if (sys<0 || sys>=song.systemLen) return NULL; if (sys<0 || sys>=song.systemLen) return NULL;
if (disCont[sys].dispatch==NULL) return NULL; if (disCont[sys].dispatch==NULL) return NULL;

3
src/engine/engine.h
View file

@ -1017,6 +1017,9 @@ class DivEngine {
// get channel pairs // get channel pairs
DivChannelPair getChanPaired(int chan); DivChannelPair getChanPaired(int chan);
// get channel mode hints
DivChannelModeHints getChanModeHints(int chan);
// get register pool // get register pool
unsigned char* getRegisterPool(int sys, int& size, int& depth); unsigned char* getRegisterPool(int sys, int& size, int& depth);

29
src/gui/pattern.cpp
View file

@ -934,17 +934,18 @@ void FurnaceGUI::drawPattern() {
ImGui::Dummy(ImVec2(dpiScale,settings.iconSize*dpiScale)); ImGui::Dummy(ImVec2(dpiScale,settings.iconSize*dpiScale));
ImVec2 posMax=ImGui::GetContentRegionMax(); ImVec2 posMax=ImGui::GetContentRegionMax();
ImDrawList* dl=ImGui::GetWindowDrawList(); ImDrawList* dl=ImGui::GetWindowDrawList();
ImVec2 iconPos[6]; ImVec2 iconPos[6];
for (int i=0; i<6; i++) {
iconPos[i]=ImLerp(posMin,posMax,ImVec2((float)i/6.0f,0.0f));
//dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[i],0xffffffff,ICON_FUR_SINE);
}
DivChannelState* cs=e->getChanState(i); DivChannelState* cs=e->getChanState(i);
if (cs!=NULL) { if (cs!=NULL) {
DivChannelModeHints hints=e->getChanModeHints(i);
if (hints.count>4) hints.count=4;
int hintCount=3+hints.count;
// calculate icon size
for (int i=0; i<hintCount; i++) {
iconPos[i]=ImLerp(posMin,posMax,ImVec2((float)(2*i+1)/(float)(hintCount*2),0.0f));
}
// 1. ON/OFF // 1. ON/OFF
ImVec4 onOffColor; ImVec4 onOffColor;
if (cs->keyOn) { if (cs->keyOn) {
@ -960,6 +961,7 @@ void FurnaceGUI::drawPattern() {
onOffColor=uiColors[GUI_COLOR_PATTERN_STATUS_OFF]; onOffColor=uiColors[GUI_COLOR_PATTERN_STATUS_OFF];
} }
} }
iconPos[0].x-=mainFont->CalcTextSizeA(mainFont->FontSize,FLT_MAX,0.0f,ICON_FA_SQUARE).x*0.5f;
dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[0],ImGui::GetColorU32(onOffColor),ICON_FA_SQUARE); dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[0],ImGui::GetColorU32(onOffColor),ICON_FA_SQUARE);
// 2. PITCH SLIDE/VIBRATO // 2. PITCH SLIDE/VIBRATO
@ -984,6 +986,7 @@ void FurnaceGUI::drawPattern() {
} else { } else {
pitchColor=uiColors[GUI_COLOR_TOGGLE_OFF]; pitchColor=uiColors[GUI_COLOR_TOGGLE_OFF];
} }
iconPos[1].x-=mainFont->CalcTextSizeA(mainFont->FontSize,FLT_MAX,0.0f,pitchIcon).x*0.5f;
dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[1],ImGui::GetColorU32(pitchColor),pitchIcon); dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[1],ImGui::GetColorU32(pitchColor),pitchIcon);
@ -1003,7 +1006,17 @@ void FurnaceGUI::drawPattern() {
} else { } else {
volColor=uiColors[GUI_COLOR_TOGGLE_OFF]; volColor=uiColors[GUI_COLOR_TOGGLE_OFF];
} }
iconPos[2].x-=mainFont->CalcTextSizeA(mainFont->FontSize,FLT_MAX,0.0f,volIcon).x*0.5f;
dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[2],ImGui::GetColorU32(volColor),volIcon); dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[2],ImGui::GetColorU32(volColor),volIcon);
// 4. OTHER
for (int i=0; i<hints.count; i++) {
if (hints.hint[i]==NULL) continue;
ImVec4 hintColor=uiColors[GUI_COLOR_TOGGLE_OFF];
// TODO: color
iconPos[i+3].x-=mainFont->CalcTextSizeA(mainFont->FontSize,FLT_MAX,0.0f,hints.hint[i]).x*0.5f;
dl->AddText(mainFont,settings.mainFontSize*dpiScale,iconPos[i+3],ImGui::GetColorU32(hintColor),hints.hint[i]);
}
} }
} }
chanHeadBottom=ImGui::GetCursorScreenPos().y-ImGui::GetStyle().ItemSpacing.y; chanHeadBottom=ImGui::GetCursorScreenPos().y-ImGui::GetStyle().ItemSpacing.y;