diff options
| author | reduz <reduzio@gmail.com> | 2014-04-05 09:41:10 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-04-05 09:41:10 -0300 |
| commit | f9820d4c404fa8790361dae3c45ea8f0e49d6cbf (patch) | |
| tree | e7d0959d1d41fb4a572cddd03a58d8e34b3f2f53 /main/main.cpp | |
| parent | ee768378268c66fc64140f7016f6ce55e04aa204 (diff) | |
| parent | c0547f5691c9293f82f6713d18b344524146441a (diff) | |
Merge pull request #212 from marynate/PR-framelimit
Add ability to apply frame rate limit (application/target_fps)
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 323250fe11..64d16d452c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -651,7 +651,8 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas OS::get_singleton()->set_screen_orientation(OS::SCREEN_LANDSCAPE); } - OS::get_singleton()->set_iterations_per_second(GLOBAL_DEF("display/target_fps",60)); + OS::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/fixed_fps",60)); + OS::get_singleton()->set_target_fps(GLOBAL_DEF("application/target_fps",0)); if (!OS::get_singleton()->_verbose_stdout) //overrided OS::get_singleton()->_verbose_stdout=GLOBAL_DEF("debug/verbose_stdout",false); @@ -1213,6 +1214,7 @@ bool Main::start() { } uint64_t Main::last_ticks=0; +uint64_t Main::target_ticks=0; float Main::time_accum=0; uint32_t Main::frames=0; uint32_t Main::frame=0; @@ -1298,7 +1300,6 @@ bool Main::iteration() { } } else { VisualServer::get_singleton()->flush(); // flush visual commands - } if (AudioServer::get_singleton()) @@ -1346,6 +1347,16 @@ bool Main::iteration() { OS::get_singleton()->delay_usec( OS::get_singleton()->get_frame_delay()*1000 ); } + int taret_fps = OS::get_singleton()->get_target_fps(); + if (taret_fps>0) { + uint64_t time_step = 1000000L/taret_fps; + target_ticks += time_step; + uint64_t current_ticks = OS::get_singleton()->get_ticks_usec(); + if (current_ticks<target_ticks) OS::get_singleton()->delay_usec(target_ticks-current_ticks); + current_ticks = OS::get_singleton()->get_ticks_usec(); + target_ticks = MIN(MAX(target_ticks,current_ticks-time_step),current_ticks+time_step); + } + return exit; } |