summaryrefslogtreecommitdiff
path: root/src/video/cocoa
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2021-02-17 14:46:19 +0100
committerPatric Stout <github@truebrain.nl>2021-02-19 10:43:15 +0100
commit25f6851ca184346297c1d953e9e649311a0dc083 (patch)
tree5fa298bd14e8c92eefa69d05ec69cf37f90fbd59 /src/video/cocoa
parentd437445c67bb76713614ae5a4242168c891b9978 (diff)
downloadopenttd-25f6851ca184346297c1d953e9e649311a0dc083.tar.xz
Codechange: switch all video drivers to std::chrono for keeping time
On all OSes we tested the std::chrono::steady_clock is of a high enough resolution to do millisecond measurements, which is all we need. By accident, this fixes a Win32 driver bug, where we would never hit our targets, as the resolution of the clock was too low to do accurate millisecond measurements with (it was ~16ms resolution instead).
Diffstat (limited to 'src/video/cocoa')
-rw-r--r--src/video/cocoa/cocoa_v.mm35
1 files changed, 7 insertions, 28 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 4c6ce6cab..122a38be5 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -634,19 +634,13 @@ bool VideoDriver_Cocoa::PollEvent()
/** Main game loop. */
void VideoDriver_Cocoa::GameLoop()
{
- uint32 cur_ticks = GetTick();
- uint32 last_cur_ticks = cur_ticks;
- uint32 next_tick = cur_ticks + MILLISECONDS_PER_TICK;
-
-#ifdef _DEBUG
- uint32 et0 = GetTick();
- uint32 st = 0;
-#endif
+ auto cur_ticks = std::chrono::steady_clock::now();
+ auto last_cur_ticks = cur_ticks;
+ auto next_tick = cur_ticks;
for (;;) {
@autoreleasepool {
- uint32 prev_cur_ticks = cur_ticks; // to check for wrapping
InteractiveRandom(); // randomness
while (this->PollEvent()) {}
@@ -669,11 +663,11 @@ void VideoDriver_Cocoa::GameLoop()
_fast_forward = 0;
}
- cur_ticks = GetTick();
- if (cur_ticks >= next_tick || (_fast_forward && !_pause_mode) || cur_ticks < prev_cur_ticks) {
- _realtime_tick += cur_ticks - last_cur_ticks;
+ cur_ticks = std::chrono::steady_clock::now();
+ if (cur_ticks >= next_tick || (_fast_forward && !_pause_mode)) {
+ _realtime_tick += std::chrono::duration_cast<std::chrono::milliseconds>(cur_ticks - last_cur_ticks).count();
last_cur_ticks = cur_ticks;
- next_tick = cur_ticks + MILLISECONDS_PER_TICK;
+ next_tick = cur_ticks + std::chrono::milliseconds(MILLISECONDS_PER_TICK);
bool old_ctrl_pressed = _ctrl_pressed;
@@ -688,28 +682,13 @@ void VideoDriver_Cocoa::GameLoop()
this->CheckPaletteAnim();
this->Draw();
} else {
-#ifdef _DEBUG
- uint32 st0 = GetTick();
-#endif
CSleep(1);
-#ifdef _DEBUG
- st += GetTick() - st0;
-#endif
NetworkDrawChatMessage();
DrawMouseCursor();
this->Draw();
}
}
}
-
-#ifdef _DEBUG
- uint32 et = GetTick();
-
- DEBUG(driver, 1, "cocoa_v: nextEventMatchingMask took %i ms total", _tEvent);
- DEBUG(driver, 1, "cocoa_v: game loop took %i ms total (%i ms without sleep)", et - et0, et - et0 - st);
- DEBUG(driver, 1, "cocoa_v: (nextEventMatchingMask total)/(game loop total) is %f%%", (double)_tEvent / (double)(et - et0) * 100);
- DEBUG(driver, 1, "cocoa_v: (nextEventMatchingMask total)/(game loop without sleep total) is %f%%", (double)_tEvent / (double)(et - et0 - st) * 100);
-#endif
}