summaryrefslogtreecommitdiff
path: root/scene/animation/animation_tree_player.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-10 18:02:19 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-10 18:04:33 -0300
commitf3f4a11cfb9767e1d691aec431dd2f1a87a31977 (patch)
tree7918ff8c7b366df911374c93d5077d27d788f9c3 /scene/animation/animation_tree_player.cpp
parent6eeb994a7bbd3cb1500c42af8f3ac1227f323ce4 (diff)
- _ready() callback only happens once now, if you want to receive it again, use request_ready()
- C++ Nodes mostly do an internal process callback, so it does not conflict with users willing to use their own process callbacks - callbacks such as _input, _process, _fixed_process _unhandled_input, _unhandled_key_input do not requiere calling a function to enable them. They are enabled automatically if found on the script.
Diffstat (limited to 'scene/animation/animation_tree_player.cpp')
-rw-r--r--scene/animation/animation_tree_player.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index 4df37af7a1..dbcdb284be 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -58,8 +58,8 @@ void AnimationTreePlayer::_set_process(bool p_process, bool p_force)
switch (animation_process_mode) {
- case ANIMATION_PROCESS_FIXED: set_fixed_process(p_process && active); break;
- case ANIMATION_PROCESS_IDLE: set_process(p_process && active); break;
+ case ANIMATION_PROCESS_FIXED: set_fixed_process_internal(p_process && active); break;
+ case ANIMATION_PROCESS_IDLE: set_process_internal(p_process && active); break;
}
processing = p_process;
@@ -416,8 +416,8 @@ void AnimationTreePlayer::_notification(int p_what) {
if (!processing) {
//make sure that a previous process state was not saved
//only process if "processing" is set
- set_fixed_process(false);
- set_process(false);
+ set_fixed_process_internal(false);
+ set_process_internal(false);
}
} break;
case NOTIFICATION_READY: {
@@ -426,14 +426,14 @@ void AnimationTreePlayer::_notification(int p_what) {
_update_sources();
}
} break;
- case NOTIFICATION_PROCESS: {
+ case NOTIFICATION_INTERNAL_PROCESS: {
if (animation_process_mode==ANIMATION_PROCESS_FIXED)
break;
if (processing)
_process_animation( get_process_delta_time() );
} break;
- case NOTIFICATION_FIXED_PROCESS: {
+ case NOTIFICATION_INTERNAL_FIXED_PROCESS: {
if (animation_process_mode==ANIMATION_PROCESS_IDLE)
break;