summaryrefslogtreecommitdiffstats
path: root/src/Timer.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-07 10:16:16 +0200
committeraap <aap@papnet.eu>2019-07-07 10:16:16 +0200
commit533f265f55ffea86a2090e3cd44f9efe69df8b57 (patch)
treeb13d1b1fa4818da40915c4a58c2fb61e5f07c421 /src/Timer.h
parentMerge pull request #114 from Nick007J/master (diff)
downloadre3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar
re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.gz
re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.bz2
re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.lz
re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.xz
re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.tar.zst
re3-533f265f55ffea86a2090e3cd44f9efe69df8b57.zip
Diffstat (limited to 'src/Timer.h')
-rw-r--r--src/Timer.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Timer.h b/src/Timer.h
index fbb130a3..9e6d447e 100644
--- a/src/Timer.h
+++ b/src/Timer.h
@@ -14,22 +14,24 @@ class CTimer
static bool &m_CodePause;
public:
static float GetTimeStep(void) { return ms_fTimeStep; }
- static inline void SetTimeStep(float ts) { ms_fTimeStep = ts; }
+ static void SetTimeStep(float ts) { ms_fTimeStep = ts; }
+ static float GetTimeStepInSeconds() { return ms_fTimeStep / 50.0f; }
+ static float GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; }
static float GetTimeStepNonClipped(void) { return ms_fTimeStepNonClipped; }
- static inline void SetTimeStepNonClipped(float ts) { ms_fTimeStepNonClipped = ts; }
+ static float GetTimeStepNonClippedInSeconds(void) { return ms_fTimeStepNonClipped / 50.0f; }
+ static void SetTimeStepNonClipped(float ts) { ms_fTimeStepNonClipped = ts; }
static uint32 GetFrameCounter(void) { return m_FrameCounter; }
- static inline void SetFrameCounter(uint32 fc) { m_FrameCounter = fc; }
+ static void SetFrameCounter(uint32 fc) { m_FrameCounter = fc; }
static uint32 GetTimeInMilliseconds(void) { return m_snTimeInMilliseconds; }
- static inline void SetTimeInMilliseconds(uint32 t) { m_snTimeInMilliseconds = t; }
+ static void SetTimeInMilliseconds(uint32 t) { m_snTimeInMilliseconds = t; }
static uint32 GetTimeInMillisecondsNonClipped(void) { return m_snTimeInMillisecondsNonClipped; }
- static inline void SetTimeInMillisecondsNonClipped(uint32 t) { m_snTimeInMillisecondsNonClipped = t; }
+ static void SetTimeInMillisecondsNonClipped(uint32 t) { m_snTimeInMillisecondsNonClipped = t; }
static uint32 GetTimeInMillisecondsPauseMode(void) { return m_snTimeInMillisecondsPauseMode; }
- static inline void SetTimeInMillisecondsPauseMode(uint32 t) { m_snTimeInMillisecondsPauseMode = t; }
+ static void SetTimeInMillisecondsPauseMode(uint32 t) { m_snTimeInMillisecondsPauseMode = t; }
static uint32 GetPreviousTimeInMilliseconds(void) { return m_snPreviousTimeInMilliseconds; }
- static inline void SetPreviousTimeInMilliseconds(uint32 t) { m_snPreviousTimeInMilliseconds = t; }
+ static void SetPreviousTimeInMilliseconds(uint32 t) { m_snPreviousTimeInMilliseconds = t; }
static float GetTimeScale(void) { return ms_fTimeScale; }
- static inline void SetTimeScale(float ts) { ms_fTimeScale = ts; }
- static inline float GetFrameTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; }
+ static void SetTimeScale(float ts) { ms_fTimeScale = ts; }
static bool GetIsPaused() { return m_UserPause || m_CodePause; }
static bool GetIsUserPaused() { return m_UserPause; }