Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

- Implemented support for fixed process on timer. Useful for cooldowns without the influence from framerate

Browse Source 
similar to animation player (idle/fixed mode), where idle mode = old timer, fixed mode = fixed process implementation:
Example of the behaviour with a stream of bullets with timers on different frame rates:
https://gfycat.com/HeartyImpressiveIndiancow

- A change for more uniform ticks on fixed/idle

without this fix:
http://i.imgur.com/0TMQ6CG.png
with this fix:
http://i.imgur.com/3zYx16c.png
This commit is contained in:
Hearto Lazor 2015-05-10 10:00:26 -04:00
parent d1e4d6e997
commit bd1e54a8b7
2 changed files with 74 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
scene/main/timer.cpp
View File

@ -45,14 +45,14 @@ void Timer::_notification(int p_what) {
}
} break;
case NOTIFICATION_PROCESS: {
if (!is_processing())
if (timer_process_mode == TIMER_PROCESS_FIXED || !is_processing())
return;
time_left -= get_process_delta_time();
if (time_left<0) {
if (!one_shot)
time_left=wait_time+time_left;
//time_left=wait_time+time_left;
time_left = wait_time;
else
stop();
@ -60,13 +60,27 @@ void Timer::_notification(int p_what) {
}
} break;
case NOTIFICATION_FIXED_PROCESS: {
if (timer_process_mode == TIMER_PROCESS_IDLE || !is_fixed_processing())
return;
time_left -= get_fixed_process_delta_time();
if (time_left<0) {
if (!one_shot)
//time_left = wait_time + time_left;
time_left = wait_time;
else
stop();
emit_signal("timeout");
}
} break;
}
}
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;
@ -96,14 +110,13 @@ bool Timer::has_autostart() const {
}
void Timer::start() {
time_left=wait_time;
set_process(true);
_set_process(true);
}
void Timer::stop() {
time_left=-1;
set_process(false);
_set_process(false);
autostart=false;
}
@ -112,6 +125,41 @@ float Timer::get_time_left() const {
return time_left >0 ? time_left : 0;
}
void Timer::set_timer_process_mode(TimerProcessMode p_mode) {
if (timer_process_mode == p_mode)
return;
switch (timer_process_mode) {
case TIMER_PROCESS_FIXED:
if (is_fixed_processing()) {
set_fixed_process(false);
set_process(true);
}
break;
case TIMER_PROCESS_IDLE:
if (is_processing()) {
set_process(false);
set_fixed_process(true);
}
break;
}
timer_process_mode = p_mode;
}
Timer::TimerProcessMode Timer::get_timer_process_mode() const{
return timer_process_mode;
}
void Timer::_set_process(bool p_process, bool p_force)
{
switch (timer_process_mode) {
case TIMER_PROCESS_FIXED: set_fixed_process(p_process); break;
case TIMER_PROCESS_IDLE: set_process(p_process); break;
}
}
void Timer::_bind_methods() {
@ -129,8 +177,12 @@ void Timer::_bind_methods() {
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("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"), _SCS("set_timer_process_mode"), _SCS("get_timer_process_mode"));
ADD_PROPERTY( PropertyInfo(Variant::REAL, "wait_time", PROPERTY_HINT_EXP_RANGE, "0.01,4096,0.01" ), _SCS("set_wait_time"), _SCS("get_wait_time") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "one_shot" ), _SCS("set_one_shot"), _SCS("is_one_shot") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "autostart" ), _SCS("set_autostart"), _SCS("has_autostart") );
@ -138,8 +190,7 @@ void Timer::_bind_methods() {
}
Timer::Timer() {
timer_process_mode = TIMER_PROCESS_IDLE;
autostart=false;
wait_time=1;
one_shot=false;

14
scene/main/timer.h
View File

@ -46,6 +46,11 @@ protected:
static void _bind_methods();
public:
enum TimerProcessMode {
TIMER_PROCESS_FIXED,
TIMER_PROCESS_IDLE,
};
void set_wait_time(float p_time);
float get_wait_time() const;
@ -60,7 +65,16 @@ public:
float get_time_left() const;
void set_timer_process_mode(TimerProcessMode p_mode);
TimerProcessMode get_timer_process_mode() const;
Timer();
private:
TimerProcessMode timer_process_mode;
void _set_process(bool p_process, bool p_force = false);
};
VARIANT_ENUM_CAST(Timer::TimerProcessMode);
#endif // TIMER_H