From 0b6d4e92b549d60c1e319e663de3c0af16e27b37 Mon Sep 17 00:00:00 2001 From: Wilhem Barbier Date: Mon, 2 Jan 2017 12:24:37 +0100 Subject: [PATCH] Add the 'finished' signal to AnimatedSprite (cherry picked from commit f6262fde11cac8b7d1a3d299042c1af6b321cf24) --- doc/base/classes.xml | 5 +++++ scene/2d/animated_sprite.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 5e8ca535186..c096287a2e8 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -2503,6 +2503,11 @@ Emitted when frame is changed. + + + Emitted when the animation is finished (when it plays the last frame). If the animation is looping, this signal is emitted everytime the last frame is drawn, before looping. + + diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp index 5a509395798..2ead6b2c969 100644 --- a/scene/2d/animated_sprite.cpp +++ b/scene/2d/animated_sprite.cpp @@ -362,6 +362,9 @@ void AnimatedSprite::_notification(int p_what) { } } else { frame++; + if (frame==fc-1) { + emit_signal(SceneStringNames::get_singleton()->finished); + } } update(); @@ -696,6 +699,7 @@ void AnimatedSprite::_bind_methods() { ObjectTypeDB::bind_method(_MD("_res_changed"),&AnimatedSprite::_res_changed); ADD_SIGNAL(MethodInfo("frame_changed")); + ADD_SIGNAL(MethodInfo("finished")); ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "frames",PROPERTY_HINT_RESOURCE_TYPE,"SpriteFrames"), _SCS("set_sprite_frames"),_SCS("get_sprite_frames")); ADD_PROPERTY( PropertyInfo( Variant::STRING, "animation"), _SCS("set_animation"),_SCS("get_animation"));