diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-02 11:37:40 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-02 11:37:40 +0200 |
| commit | 479cfb1d361bcf1863d69a464ed404efa7fe3b40 (patch) | |
| tree | 155e1cc9810f4a95381816ec00f9b959bf7bd912 /scene | |
| parent | 85c2dbe0697ed58d69f4c13b6250f6ce52b55de2 (diff) | |
| parent | f9fafb75dc30486818ea7d8972f013343c68edd9 (diff) | |
Merge pull request #4518 from AlexHolly/animationplayer-finished-name
added name parameter on animationplayer finished
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/animation_player.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 25f49a8a8b..9d5d52b816 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -728,10 +728,11 @@ void AnimationPlayer::_animation_process(float p_delta) { emit_signal(SceneStringNames::get_singleton()->animation_changed, old, new_name); } else { //stop(); + String name = playback.assigned; playing = false; _set_process(false); end_notify=false; - emit_signal(SceneStringNames::get_singleton()->finished); + emit_signal(SceneStringNames::get_singleton()->finished, name); } } @@ -1347,7 +1348,7 @@ void AnimationPlayer::_bind_methods() { ADD_PROPERTY( PropertyInfo( Variant::REAL, "playback/default_blend_time", PROPERTY_HINT_RANGE, "0,4096,0.01"), _SCS("set_default_blend_time"), _SCS("get_default_blend_time")); ADD_PROPERTY( PropertyInfo( Variant::NODE_PATH, "root/root"), _SCS("set_root"), _SCS("get_root")); - ADD_SIGNAL( MethodInfo("finished") ); + ADD_SIGNAL( MethodInfo("finished", PropertyInfo(Variant::STRING,"name")) ); ADD_SIGNAL( MethodInfo("animation_changed", PropertyInfo(Variant::STRING,"old_name"), PropertyInfo(Variant::STRING,"new_name")) ); ADD_SIGNAL( MethodInfo("animation_started", PropertyInfo(Variant::STRING,"name")) ); |