diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /scene/main/timer.cpp | |
parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'scene/main/timer.cpp')
-rw-r--r-- | scene/main/timer.cpp | 82 |
1 files changed, 36 insertions, 46 deletions
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index d27b53d48b..5df30e5080 100644 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -28,21 +28,19 @@ /*************************************************************************/ #include "timer.h" - void Timer::_notification(int p_what) { - switch(p_what) { - + switch (p_what) { case NOTIFICATION_READY: { if (autostart) { #ifdef TOOLS_ENABLED - if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root()==this || get_tree()->get_edited_scene_root()->is_a_parent_of(this))) + if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && (get_tree()->get_edited_scene_root() == this || get_tree()->get_edited_scene_root()->is_a_parent_of(this))) break; #endif start(); - autostart=false; + autostart = false; } } break; case NOTIFICATION_INTERNAL_PROCESS: { @@ -50,7 +48,7 @@ void Timer::_notification(int p_what) { return; time_left -= get_process_delta_time(); - if (time_left<0) { + if (time_left < 0) { if (!one_shot) //time_left=wait_time+time_left; time_left = wait_time; @@ -66,7 +64,7 @@ void Timer::_notification(int p_what) { return; time_left -= get_fixed_process_delta_time(); - if (time_left<0) { + if (time_left < 0) { if (!one_shot) //time_left = wait_time + time_left; time_left = wait_time; @@ -79,13 +77,10 @@ void Timer::_notification(int p_what) { } } - - void Timer::set_wait_time(float p_time) { ERR_EXPLAIN("time should be greater than zero."); - ERR_FAIL_COND(p_time<=0); - wait_time=p_time; - + ERR_FAIL_COND(p_time <= 0); + wait_time = p_time; } float Timer::get_wait_time() const { @@ -94,7 +89,7 @@ float Timer::get_wait_time() const { void Timer::set_one_shot(bool p_one_shot) { - one_shot=p_one_shot; + one_shot = p_one_shot; } bool Timer::is_one_shot() const { @@ -103,7 +98,7 @@ bool Timer::is_one_shot() const { void Timer::set_autostart(bool p_start) { - autostart=p_start; + autostart = p_start; } bool Timer::has_autostart() const { @@ -111,24 +106,22 @@ bool Timer::has_autostart() const { } void Timer::start() { - time_left=wait_time; + time_left = wait_time; _set_process(true); } void Timer::stop() { - time_left=-1; + time_left = -1; _set_process(false); - autostart=false; + autostart = false; } - void Timer::set_active(bool p_active) { if (active == p_active) return; active = p_active; _set_process(processing); - } bool Timer::is_active() const { @@ -137,7 +130,7 @@ bool Timer::is_active() const { float Timer::get_time_left() const { - return time_left >0 ? time_left : 0; + return time_left > 0 ? time_left : 0; } void Timer::set_timer_process_mode(TimerProcessMode p_mode) { @@ -151,25 +144,23 @@ void Timer::set_timer_process_mode(TimerProcessMode p_mode) { set_fixed_process_internal(false); set_process_internal(true); } - break; + break; case TIMER_PROCESS_IDLE: if (is_processing_internal()) { set_process_internal(false); set_fixed_process_internal(true); } - break; + break; } timer_process_mode = p_mode; } -Timer::TimerProcessMode Timer::get_timer_process_mode() const{ +Timer::TimerProcessMode Timer::get_timer_process_mode() const { return timer_process_mode; } - -void Timer::_set_process(bool p_process, bool p_force) -{ +void Timer::_set_process(bool p_process, bool p_force) { switch (timer_process_mode) { case TIMER_PROCESS_FIXED: set_fixed_process_internal(p_process && active); break; case TIMER_PROCESS_IDLE: set_process_internal(p_process && active); break; @@ -179,43 +170,42 @@ void Timer::_set_process(bool p_process, bool p_force) void Timer::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_wait_time","time_sec"),&Timer::set_wait_time); - ClassDB::bind_method(D_METHOD("get_wait_time"),&Timer::get_wait_time); + ClassDB::bind_method(D_METHOD("set_wait_time", "time_sec"), &Timer::set_wait_time); + ClassDB::bind_method(D_METHOD("get_wait_time"), &Timer::get_wait_time); - ClassDB::bind_method(D_METHOD("set_one_shot","enable"),&Timer::set_one_shot); - ClassDB::bind_method(D_METHOD("is_one_shot"),&Timer::is_one_shot); + ClassDB::bind_method(D_METHOD("set_one_shot", "enable"), &Timer::set_one_shot); + ClassDB::bind_method(D_METHOD("is_one_shot"), &Timer::is_one_shot); - ClassDB::bind_method(D_METHOD("set_autostart","enable"),&Timer::set_autostart); - ClassDB::bind_method(D_METHOD("has_autostart"),&Timer::has_autostart); + ClassDB::bind_method(D_METHOD("set_autostart", "enable"), &Timer::set_autostart); + ClassDB::bind_method(D_METHOD("has_autostart"), &Timer::has_autostart); - ClassDB::bind_method(D_METHOD("start"),&Timer::start); - ClassDB::bind_method(D_METHOD("stop"),&Timer::stop); + ClassDB::bind_method(D_METHOD("start"), &Timer::start); + ClassDB::bind_method(D_METHOD("stop"), &Timer::stop); ClassDB::bind_method(D_METHOD("set_active", "active"), &Timer::set_active); ClassDB::bind_method(D_METHOD("is_active"), &Timer::is_active); - ClassDB::bind_method(D_METHOD("get_time_left"),&Timer::get_time_left); + ClassDB::bind_method(D_METHOD("get_time_left"), &Timer::get_time_left); ClassDB::bind_method(D_METHOD("set_timer_process_mode", "mode"), &Timer::set_timer_process_mode); ClassDB::bind_method(D_METHOD("get_timer_process_mode"), &Timer::get_timer_process_mode); - ADD_SIGNAL( MethodInfo("timeout") ); - - ADD_PROPERTY( PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), "set_timer_process_mode", "get_timer_process_mode") ; - ADD_PROPERTY( PropertyInfo(Variant::REAL, "wait_time", PROPERTY_HINT_EXP_RANGE, "0.01,4096,0.01" ), "set_wait_time", "get_wait_time") ; - ADD_PROPERTY( PropertyInfo(Variant::BOOL, "one_shot" ), "set_one_shot", "is_one_shot") ; - ADD_PROPERTY( PropertyInfo(Variant::BOOL, "autostart" ), "set_autostart", "has_autostart") ; + ADD_SIGNAL(MethodInfo("timeout")); - BIND_CONSTANT( TIMER_PROCESS_FIXED ); - BIND_CONSTANT( TIMER_PROCESS_IDLE ); + ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), "set_timer_process_mode", "get_timer_process_mode"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "wait_time", PROPERTY_HINT_EXP_RANGE, "0.01,4096,0.01"), "set_wait_time", "get_wait_time"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "one_shot"), "set_one_shot", "is_one_shot"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "autostart"), "set_autostart", "has_autostart"); + BIND_CONSTANT(TIMER_PROCESS_FIXED); + BIND_CONSTANT(TIMER_PROCESS_IDLE); } Timer::Timer() { timer_process_mode = TIMER_PROCESS_IDLE; - autostart=false; - wait_time=1; - one_shot=false; + autostart = false; + wait_time = 1; + one_shot = false; time_left = -1; processing = false; active = true; |