diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2024-12-13 20:49:32 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2024-12-13 20:49:32 +0100 |
| commit | b25d9438b3849efd0a6b6034d238eb36e23d6a5c (patch) | |
| tree | 75973b75580fbc708ad6d6361deab587c7758921 /src/crepe/manager | |
| parent | ded2f0d56d95edffb97830f406bce9e1ec4293d1 (diff) | |
| parent | 8f20aac54aed1a060d59d5169276ef3ed33a8dc9 (diff) | |
Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_concealing_scene
Diffstat (limited to 'src/crepe/manager')
| -rw-r--r-- | src/crepe/manager/LoopTimerManager.cpp | 2 | ||||
| -rw-r--r-- | src/crepe/manager/LoopTimerManager.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp index 9819632..a6e4788 100644 --- a/src/crepe/manager/LoopTimerManager.cpp +++ b/src/crepe/manager/LoopTimerManager.cpp @@ -31,7 +31,7 @@ void LoopTimerManager::update() { this->delta_time = this->maximum_delta_time; } if (this->delta_time > 0s) { - this->actual_fps = 1.0 / duration_cast<seconds>(this->delta_time).count(); + this->actual_fps = static_cast<unsigned>(1.0 / this->delta_time.count()); } else { this->actual_fps = 0; } diff --git a/src/crepe/manager/LoopTimerManager.h b/src/crepe/manager/LoopTimerManager.h index 91403e4..76b02d3 100644 --- a/src/crepe/manager/LoopTimerManager.h +++ b/src/crepe/manager/LoopTimerManager.h @@ -6,7 +6,7 @@ namespace crepe { -typedef std::chrono::duration<double> duration_t; +typedef std::chrono::duration<float> duration_t; typedef std::chrono::duration<unsigned long long, std::micro> elapsed_time_t; /** @@ -55,7 +55,7 @@ public: * * \return Current FPS. */ - unsigned get_fps() const; + unsigned int get_fps() const; /** * \brief Get the current time scale. @@ -149,9 +149,9 @@ private: private: //! Target frames per second. - unsigned target_fps = 60; + unsigned int target_fps = 60; //! Actual frames per second. - unsigned actual_fps = 0; + unsigned int actual_fps = 0; //! Time scale for speeding up or slowing down the game (0 = pause, < 1 = slow down, 1 = normal speed, > 1 = speed up). float time_scale = 1; //! Maximum delta time in seconds to avoid large jumps. |