etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: fix visualizer issues 

including a hang/memory munch
This commit is contained in:
tildearrow 2022-02-21 23:53:17 -05:00
parent 6cfe209a41
commit 193c8af12d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/pattern.cpp
View File

@ -331,6 +331,9 @@ void FurnaceGUI::drawPattern() {
nextWindow=GUI_WINDOW_NOTHING; nextWindow=GUI_WINDOW_NOTHING;
} }
if (!patternOpen) return; if (!patternOpen) return;
float scrollX=0;
if (e->isPlaying() && followPattern) cursor.y=oldRow; if (e->isPlaying() && followPattern) cursor.y=oldRow;
demandX=0; demandX=0;
sel1=selStart; sel1=selStart;
@ -578,6 +581,7 @@ void FurnaceGUI::drawPattern() {
} }
demandScrollX=false; demandScrollX=false;
} }
scrollX=ImGui::GetScrollX();
ImGui::EndTable(); ImGui::EndTable();
} }
@ -613,8 +617,8 @@ void FurnaceGUI::drawPattern() {
switch (i.cmd) { switch (i.cmd) {
case DIV_CMD_NOTE_ON: case DIV_CMD_NOTE_ON:
partIcon=ICON_FA_ASTERISK; partIcon=ICON_FA_ASTERISK;
life=64.0f; life=96.0f;
lifeSpeed=2.0f; lifeSpeed=3.0f;
break; break;
case DIV_CMD_LEGATO: case DIV_CMD_LEGATO:
partIcon=ICON_FA_COG; partIcon=ICON_FA_COG;
@ -685,7 +689,7 @@ void FurnaceGUI::drawPattern() {
particles.push_back(Particle( particles.push_back(Particle(
color, color,
partIcon, partIcon,
off.x+patChanX[i.chan]+fmod(rand(),width), off.x+patChanX[i.chan]+fmod(rand(),width)-scrollX,
off.y+(ImGui::GetWindowHeight()*0.5f)+randRange(0,patFont->FontSize), off.y+(ImGui::GetWindowHeight()*0.5f)+randRange(0,patFont->FontSize),
(speedX+randRange(-spread,spread))*0.5*dpiScale, (speedX+randRange(-spread,spread))*0.5*dpiScale,
(speedY+randRange(-spread,spread))*0.5*dpiScale, (speedY+randRange(-spread,spread))*0.5*dpiScale,
@ -700,6 +704,7 @@ void FurnaceGUI::drawPattern() {
// note slides // note slides
ImVec2 arrowPoints[7]; ImVec2 arrowPoints[7];
for (int i=0; i<chans; i++) { for (int i=0; i<chans; i++) {
if (!e->song.chanShow[i]) continue;
DivChannelState* ch=e->getChanState(i); DivChannelState* ch=e->getChanState(i);
if (ch->portaSpeed>0) { if (ch->portaSpeed>0) {
ImVec4 col=uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH]; ImVec4 col=uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH];
@ -710,7 +715,7 @@ void FurnaceGUI::drawPattern() {
particles.push_back(Particle( particles.push_back(Particle(
pitchGrad, pitchGrad,
(ch->portaNote<=ch->note)?ICON_FA_CHEVRON_DOWN:ICON_FA_CHEVRON_UP, (ch->portaNote<=ch->note)?ICON_FA_CHEVRON_DOWN:ICON_FA_CHEVRON_UP,
off.x+patChanX[i]+fmod(rand(),width), off.x+patChanX[i]+fmod(rand(),width)-scrollX,
off.y+fmod(rand(),MAX(1,ImGui::GetWindowHeight())), off.y+fmod(rand(),MAX(1,ImGui::GetWindowHeight())),
0.0f, 0.0f,
(7.0f+(rand()%5)+pow(ch->portaSpeed,0.7f))*((ch->portaNote<=ch->note)?1:-1), (7.0f+(rand()%5)+pow(ch->portaSpeed,0.7f))*((ch->portaNote<=ch->note)?1:-1),
@ -721,9 +726,9 @@ void FurnaceGUI::drawPattern() {
)); ));
} }
for (float j=-patChanSlideY[i]; j<ImGui::GetWindowHeight(); j+=width*0.7) { if (width>0.1) for (float j=-patChanSlideY[i]; j<ImGui::GetWindowHeight(); j+=width*0.7) {
ImVec2 tMin=ImVec2(off.x+patChanX[i],off.y+j); ImVec2 tMin=ImVec2(off.x+patChanX[i]-scrollX,off.y+j);
ImVec2 tMax=ImVec2(off.x+patChanX[i+1],off.y+j+width*0.6); ImVec2 tMax=ImVec2(off.x+patChanX[i+1]-scrollX,off.y+j+width*0.6);
if (ch->portaNote<=ch->note) { if (ch->portaNote<=ch->note) {
arrowPoints[0]=ImLerp(tMin,tMax,ImVec2(0.1,1.0-0.8)); arrowPoints[0]=ImLerp(tMin,tMax,ImVec2(0.1,1.0-0.8));
arrowPoints[1]=ImLerp(tMin,tMax,ImVec2(0.5,1.0-0.0)); arrowPoints[1]=ImLerp(tMin,tMax,ImVec2(0.5,1.0-0.0));