etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-12-31 20:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #191 from franciscod/about_fps

Browse source 
make about page animation framerate independent
This commit is contained in:
tildearrow 2022-02-20 04:24:19 -05:00 committed by GitHub
commit 3a6beecb67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/gui.cpp
View file

@ -1559,7 +1559,6 @@ void FurnaceGUI::drawAbout() {
float b=0; float b=0;
float peakMix=settings.partyTime?((peak[0]+peak[1])*0.5):0.3; float peakMix=settings.partyTime?((peak[0]+peak[1])*0.5):0.3;
ImGui::ColorConvertHSVtoRGB(aboutHue,1.0,0.25+MIN(0.75f,peakMix*0.75f),r,g,b); ImGui::ColorConvertHSVtoRGB(aboutHue,1.0,0.25+MIN(0.75f,peakMix*0.75f),r,g,b);
aboutHue+=0.001+peakMix*0.004;
dl->AddRectFilled(ImVec2(0,0),ImVec2(scrW*dpiScale,scrH*dpiScale),0xff000000); dl->AddRectFilled(ImVec2(0,0),ImVec2(scrW*dpiScale,scrH*dpiScale),0xff000000);
bool skip=false; bool skip=false;
bool skip2=false; bool skip2=false;
@ -1618,8 +1617,13 @@ void FurnaceGUI::drawAbout() {
0xffffffff,aboutLine[i]); 0xffffffff,aboutLine[i]);
} }
ImGui::PopFont(); ImGui::PopFont();
aboutScroll+=2+(peakMix>0.78)*3;
aboutSin+=1+(peakMix>0.75)*2; float timeScale = 60.0f * ImGui::GetIO().DeltaTime;
aboutHue+=(0.001+peakMix*0.004)*timeScale;
aboutScroll+=(2+(peakMix>0.78)*3)*timeScale;
aboutSin+=(1+(peakMix>0.75)*2)*timeScale;
if (aboutSin>=2400) aboutSin-=2400; if (aboutSin>=2400) aboutSin-=2400;
if (aboutScroll>(42*57+scrH)) aboutScroll=-20; if (aboutScroll>(42*57+scrH)) aboutScroll=-20;
} }