diff options
author | Aki <please@ignore.pl> | 2022-03-10 23:37:05 +0100 |
---|---|---|
committer | Aki <please@ignore.pl> | 2022-03-10 23:37:05 +0100 |
commit | ba692357878e569587cf67fbc2bf3771d1fc49fb (patch) | |
tree | d626b9df78ff8c94ddcad85611278809fd91dd0d /Stars45 | |
parent | 35f271d64582e90bf82bde88d48fd631a46dce9e (diff) | |
download | starshatter-ba692357878e569587cf67fbc2bf3771d1fc49fb.zip starshatter-ba692357878e569587cf67fbc2bf3771d1fc49fb.tar.gz starshatter-ba692357878e569587cf67fbc2bf3771d1fc49fb.tar.bz2 |
Simplified clock usage in FadeView
Diffstat (limited to 'Stars45')
-rw-r--r-- | Stars45/FadeView.cpp | 26 | ||||
-rw-r--r-- | Stars45/FadeView.h | 1 |
2 files changed, 8 insertions, 19 deletions
diff --git a/Stars45/FadeView.cpp b/Stars45/FadeView.cpp index 1f6207e..cf879fc 100644 --- a/Stars45/FadeView.cpp +++ b/Stars45/FadeView.cpp @@ -23,12 +23,11 @@ FadeView::FadeView(Window* c, double in, double out, double hold) : View(c), -fade_in(in * 1000), -fade_out(out * 1000), -hold_time(hold * 1000), +fade_in(in), +fade_out(out), +hold_time(hold), step_time(0), -fast(1), -time(0) +fast(1) { state = StateStart; } @@ -38,9 +37,9 @@ FadeView::~FadeView() // +--------------------------------------------------------------------+ -void FadeView::FadeIn(double in) { fade_in = in * 1000; } -void FadeView::FadeOut(double out) { fade_out = out * 1000; } -void FadeView::FastFade(int fade_fast) { fast = fade_fast; } +void FadeView::FastFade(int fade_fast) { fast = fade_fast; } +void FadeView::FadeIn(double in) { fade_in = in; } +void FadeView::FadeOut(double out) { fade_out = out; } void FadeView::StopHold() { //Print(" FadeView::StopHold()\n"); @@ -52,16 +51,7 @@ void FadeView::StopHold() void FadeView::Refresh() { - double msec = 0; - - if (state == StateStart) { - time = Game::GetInstance()->GetClock()->RealTime(); - } - else if (state != StateDone) { - double new_time = Game::GetInstance()->GetClock()->RealTime(); - msec = new_time - time; - time = new_time; - } + double msec = Game::GetInstance()->GetClock()->GuiDelta(); switch (state) { case StateStart: diff --git a/Stars45/FadeView.h b/Stars45/FadeView.h index 9bb0d12..d3e3925 100644 --- a/Stars45/FadeView.h +++ b/Stars45/FadeView.h @@ -44,7 +44,6 @@ protected: double fade_in; double fade_out; double hold_time; - double time; double step_time; int fast; |