Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Modified dtime calculation method in limitFps()

Browse Source
This commit is contained in:
Craig Robbins 2014-11-01 12:36:03 +10:00 committed by RealBadAngel
parent 429ecb2b94
commit dfd15fd1d9
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/game.cpp
View File

@ -3882,7 +3882,7 @@ inline void MinetestApp::limitFps(FpsControl *params, f32 *dtime)
u32 last_time = params->last_time; u32 last_time = params->last_time;
if (time > last_time) // Make sure last_time hasn't overflowed if (time > last_time) // Make sure time hasn't overflowed
params->busy_time = time - last_time; params->busy_time = time - last_time;
else else
params->busy_time = 0; params->busy_time = 0;
@ -3894,10 +3894,26 @@ inline void MinetestApp::limitFps(FpsControl *params, f32 *dtime)
if (params->busy_time < frametime_min) { if (params->busy_time < frametime_min) {
params->sleep_time = frametime_min - params->busy_time; params->sleep_time = frametime_min - params->busy_time;
device->sleep(params->sleep_time); device->sleep(params->sleep_time);
time += params->sleep_time;
} else { } else {
params->sleep_time = 0; params->sleep_time = 0;
} }
if (time > last_time) // Checking for overflow
*dtime = (time - last_time) / 1000.0;
else
*dtime = 0.03; // Choose 30fps as fallback in overflow case
params->last_time = time;
#if 0
/* This is the old method for calculating new_time and dtime, and seems
* like overkill considering timings are messed up by expected variation
* in execution speed in other places anyway. (This has nothing to do with
* WINE... the new method above calculates dtime based on sleep_time)
*/
// Necessary for device->getTimer()->getTime() // Necessary for device->getTimer()->getTime()
device->run(); device->run();
time = device->getTimer()->getTime(); time = device->getTimer()->getTime();
@ -3905,9 +3921,10 @@ inline void MinetestApp::limitFps(FpsControl *params, f32 *dtime)
if (time > last_time) // Make sure last_time hasn't overflowed if (time > last_time) // Make sure last_time hasn't overflowed
*dtime = (time - last_time) / 1000.0; *dtime = (time - last_time) / 1000.0;
else else
*dtime = 0; *dtime = 0.033;
params->last_time = time; params->last_time = time;
#endif
} }