diff options
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/time.cpp | 87 | ||||
-rw-r--r-- | src/base/time.hpp | 23 |
2 files changed, 0 insertions, 110 deletions
diff --git a/src/base/time.cpp b/src/base/time.cpp index a1817506..923b47cd 100644 --- a/src/base/time.cpp +++ b/src/base/time.cpp @@ -38,91 +38,4 @@ namespace usdx { return SDL_GetTicks() / SDL_CORRECTION_RATIO; } - - - /* - * RelativeTimer - */ - - /* - * creates a new timer. - * if triggermode is false (default), the timer - * will immediately begin with counting. - * if triggermode is true, it will wait until get/settime() or pause() is called - * for the first time. - */ - RelativeTimer::RelativeTimer(bool trigger_mode) - { - this->trigger_mode = trigger_mode; - reset(); - this->paused = false; - } - - void RelativeTimer::pause(void) - { - relative_time_offset = get_time(); - paused = true; - } - - void RelativeTimer::resume(void) - { - absolute_time = SDL_GetTicks(); - paused = false; - } - - /* - * Returns the counter of the timer. - * If in TriggerMode it will return 0 and start the counter on the first call. - */ - float RelativeTimer::get_time(void) - { - // initialize absolute time on first call in triggered mode - if (trigger_mode && (absolute_time == 0)) - { - absolute_time = SDL_GetTicks(); - return relative_time_offset; - } - - if (paused) - return relative_time_offset; - - return relative_time_offset + (SDL_GetTicks() - absolute_time) / SDL_CORRECTION_RATIO; - } - - /* - * Returns the counter of the timer and resets the counter to 0 afterwards. - * Note: In TriggerMode the counter will not be stopped as with Reset(). - */ - float RelativeTimer::get_and_reset_time(void) - { - float result = get_time(); - set_time(0); - return result; - } - - /* - * Sets the timer to the given time. This will trigger in TriggerMode if - * Trigger is set to true. Otherwise the counter's state will not change. - */ - void RelativeTimer::set_time(float time, bool trigger) - { - relative_time_offset = time; - - if (!trigger_mode || trigger) - absolute_time = SDL_GetTicks(); - } - - /* - * Resets the counter of the timer to 0. - * If in TriggerMode the timer will not start counting until it is triggered again. - */ - void RelativeTimer::reset(void) - { - relative_time_offset = 0; - - if (trigger_mode) - absolute_time = 0; - else - absolute_time = SDL_GetTicks(); - } } diff --git a/src/base/time.hpp b/src/base/time.hpp index ebf987a1..229ac3e1 100644 --- a/src/base/time.hpp +++ b/src/base/time.hpp @@ -25,8 +25,6 @@ #ifndef TIME_HPP #define TIME_HPP -#include <stdint.h> - namespace usdx { class Time @@ -35,27 +33,6 @@ namespace usdx Time(void); float get_time(); }; - - - class RelativeTimer - { - private: - // system-clock reference time for calculation of CurrentTime - uint64_t absolute_time; - float relative_time_offset; - bool paused; - bool trigger_mode; - - public: - RelativeTimer(bool trigger_mode = false); - void pause(void); - void resume(void); - float get_time(void); - float get_and_reset_time(void); - void set_time(float time, bool trigger = true); - void reset(void); - }; - }; #endif |