godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed target_fps option, moved it to debug (it makes no sense for games). Added a frame_delay option for games that don't want to use the CPU fully.

This commit is contained in:
Juan Linietsky 2016-07-09 12:34:30 -03:00
parent b0f0ae0723
commit 920310e72a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/main.cpp
View File

@ -101,6 +101,7 @@ static bool init_fullscreen=false;
static bool init_use_custom_pos=false; static bool init_use_custom_pos=false;
static bool debug_collisions=false; static bool debug_collisions=false;
static bool debug_navigation=false; static bool debug_navigation=false;
static int frame_delay=0;
static Vector2 init_custom_pos; static Vector2 init_custom_pos;
static int video_driver_idx=-1; static int video_driver_idx=-1;
static int audio_driver_idx=-1; static int audio_driver_idx=-1;
@ -488,7 +489,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
if (I->next()) { if (I->next()) {
OS::get_singleton()->set_frame_delay(I->next()->get().to_int()); frame_delay=I->next()->get().to_int();
N=I->next()->next(); N=I->next()->next();
} else { } else {
goto error; goto error;
@ -805,12 +806,19 @@ 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_screen_orientation(OS::SCREEN_LANDSCAPE);
} }
OS::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/fixed_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)); OS::get_singleton()->set_target_fps(GLOBAL_DEF("debug/force_fps",0));
if (!OS::get_singleton()->_verbose_stdout) //overrided if (!OS::get_singleton()->_verbose_stdout) //overrided
OS::get_singleton()->_verbose_stdout=GLOBAL_DEF("debug/verbose_stdout",false); OS::get_singleton()->_verbose_stdout=GLOBAL_DEF("debug/verbose_stdout",false);
if (frame_delay==0) {
frame_delay=GLOBAL_DEF("application/frame_delay_msec",0);
}
OS::get_singleton()->set_frame_delay(frame_delay);
message_queue = memnew( MessageQueue ); message_queue = memnew( MessageQueue );
Globals::get_singleton()->register_global_defaults(); Globals::get_singleton()->register_global_defaults();