summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorJakub Grzesik <kubecz3k@gmail.com>2016-04-14 17:19:20 +0200
committerJakub Grzesik <kubecz3k@gmail.com>2016-04-14 17:19:20 +0200
commitfd9b82a082c5122df5dffeda4d2d90adf31e2a42 (patch)
tree7af9d27997c587a98293291a57ea0daaa018252b /scene
parentc0576c64da3fb03f63922fa572897b1a80e606e4 (diff)
animation_started signal to AnimationPlayer
Diffstat (limited to 'scene')
-rw-r--r--scene/animation/animation_player.cpp3
-rw-r--r--scene/scene_string_names.cpp1
-rw-r--r--scene/scene_string_names.h1
3 files changed, 5 insertions, 0 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 32958112e5..25f49a8a8b 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -1012,6 +1012,8 @@ void AnimationPlayer::play(const StringName& p_name, float p_custom_blend, float
queued.clear();
_set_process(true); // always process when starting an animation
playing = true;
+
+ emit_signal(SceneStringNames::get_singleton()->animation_started, c.assigned);
if (is_inside_tree() && get_tree()->is_editor_hint())
return; // no next in this case
@@ -1347,6 +1349,7 @@ void AnimationPlayer::_bind_methods() {
ADD_SIGNAL( MethodInfo("finished") );
ADD_SIGNAL( MethodInfo("animation_changed", PropertyInfo(Variant::STRING,"old_name"), PropertyInfo(Variant::STRING,"new_name")) );
+ ADD_SIGNAL( MethodInfo("animation_started", PropertyInfo(Variant::STRING,"name")) );
BIND_CONSTANT( ANIMATION_PROCESS_FIXED );
BIND_CONSTANT( ANIMATION_PROCESS_IDLE );
diff --git a/scene/scene_string_names.cpp b/scene/scene_string_names.cpp
index f47b61001c..28834c732d 100644
--- a/scene/scene_string_names.cpp
+++ b/scene/scene_string_names.cpp
@@ -52,6 +52,7 @@ SceneStringNames::SceneStringNames() {
finished=StaticCString::create("finished");
animation_changed=StaticCString::create("animation_changed");
+ animation_started=StaticCString::create("animation_started");
mouse_enter=StaticCString::create("mouse_enter");
mouse_exit=StaticCString::create("mouse_exit");
diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h
index fc45351c33..f85a858423 100644
--- a/scene/scene_string_names.h
+++ b/scene/scene_string_names.h
@@ -79,6 +79,7 @@ public:
StringName finished;
StringName animation_changed;
+ StringName animation_started;
StringName body_enter_shape;
StringName body_enter;