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

Merge pull request #4194 from HeartoLazor/timerpause 

Now the timer could be paused
This commit is contained in:
Rémi Verschelde 2016-04-01 07:38:49 +02:00
parent 8708a284f7 995890d5b2
commit 3cc7b6fa5d
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scene/main/timer.cpp
View File

@ -121,6 +121,20 @@ void Timer::stop() {
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 {
return active;
}
float Timer::get_time_left() const { float Timer::get_time_left() const {
return time_left >0 ? time_left : 0; return time_left >0 ? time_left : 0;
@ -157,9 +171,10 @@ Timer::TimerProcessMode Timer::get_timer_process_mode() const{
void Timer::_set_process(bool p_process, bool p_force) void Timer::_set_process(bool p_process, bool p_force)
{ {
switch (timer_process_mode) { switch (timer_process_mode) {
case TIMER_PROCESS_FIXED: set_fixed_process(p_process); break; case TIMER_PROCESS_FIXED: set_fixed_process(p_process && active); break;
case TIMER_PROCESS_IDLE: set_process(p_process); break; case TIMER_PROCESS_IDLE: set_process(p_process && active); break;
} }
processing = p_process;
} }
void Timer::_bind_methods() { void Timer::_bind_methods() {
@ -176,6 +191,9 @@ void Timer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("start"),&Timer::start); ObjectTypeDB::bind_method(_MD("start"),&Timer::start);
ObjectTypeDB::bind_method(_MD("stop"),&Timer::stop); ObjectTypeDB::bind_method(_MD("stop"),&Timer::stop);
ObjectTypeDB::bind_method(_MD("set_active", "active"), &Timer::set_active);
ObjectTypeDB::bind_method(_MD("is_active"), &Timer::is_active);
ObjectTypeDB::bind_method(_MD("get_time_left"),&Timer::get_time_left); ObjectTypeDB::bind_method(_MD("get_time_left"),&Timer::get_time_left);
ObjectTypeDB::bind_method(_MD("set_timer_process_mode", "mode"), &Timer::set_timer_process_mode); ObjectTypeDB::bind_method(_MD("set_timer_process_mode", "mode"), &Timer::set_timer_process_mode);
@ -198,5 +216,7 @@ Timer::Timer() {
autostart=false; autostart=false;
wait_time=1; wait_time=1;
one_shot=false; one_shot=false;
time_left=-1; time_left = -1;
processing = false;
active = true;
} }

4
scene/main/timer.h
View File

@ -38,6 +38,8 @@ class Timer : public Node {
float wait_time; float wait_time;
bool one_shot; bool one_shot;
bool autostart; bool autostart;
bool processing;
bool active;
double time_left; double time_left;
protected: protected:
@ -62,6 +64,8 @@ public:
void start(); void start();
void stop(); void stop();
void set_active(bool p_active);
bool is_active() const;
float get_time_left() const; float get_time_left() const;