mirror of
https://github.com/tildearrow/furnace.git
synced 2024-11-23 21:15:11 +00:00
GUI: intro monitor hotfix
This commit is contained in:
parent
a144ca75b4
commit
b3bc244858
2 changed files with 9 additions and 1 deletions
|
@ -3985,7 +3985,13 @@ bool FurnaceGUI::loop() {
|
||||||
if (introMonOpen) {
|
if (introMonOpen) {
|
||||||
int totalTicks=e->getTotalTicks();
|
int totalTicks=e->getTotalTicks();
|
||||||
int totalSeconds=e->getTotalSeconds();
|
int totalSeconds=e->getTotalSeconds();
|
||||||
drawIntro(totalSeconds+((double)totalTicks/1000000.0),true);
|
double newMonitorPos=totalSeconds+((double)totalTicks/1000000.0);
|
||||||
|
|
||||||
|
if (fabs(newMonitorPos-monitorPos)>0.08) monitorPos=newMonitorPos;
|
||||||
|
|
||||||
|
drawIntro(monitorPos,true);
|
||||||
|
|
||||||
|
if (e->isPlaying()) monitorPos+=ImGui::GetIO().DeltaTime;
|
||||||
}
|
}
|
||||||
drawSampleList();
|
drawSampleList();
|
||||||
drawSampleEdit();
|
drawSampleEdit();
|
||||||
|
@ -6268,6 +6274,7 @@ FurnaceGUI::FurnaceGUI():
|
||||||
waveGenFM(false),
|
waveGenFM(false),
|
||||||
introPos(0.0),
|
introPos(0.0),
|
||||||
introSkip(0.0),
|
introSkip(0.0),
|
||||||
|
monitorPos(0.0),
|
||||||
mustClear(2),
|
mustClear(2),
|
||||||
initialScreenWipe(1.0f),
|
initialScreenWipe(1.0f),
|
||||||
introSkipDo(false),
|
introSkipDo(false),
|
||||||
|
|
|
@ -1838,6 +1838,7 @@ class FurnaceGUI {
|
||||||
// intro
|
// intro
|
||||||
double introPos;
|
double introPos;
|
||||||
double introSkip;
|
double introSkip;
|
||||||
|
double monitorPos;
|
||||||
int mustClear;
|
int mustClear;
|
||||||
float initialScreenWipe;
|
float initialScreenWipe;
|
||||||
bool introSkipDo, teWarn;
|
bool introSkipDo, teWarn;
|
||||||
|
|
Loading…
Reference in a new issue