1 files changed, 33 insertions, 40 deletions

diff --git a/scene/2d/animated_sprite_2d.cpp b/scene/2d/animated_sprite_2d.cpp
index 50892b72e2..a4a965aa41 100644
--- a/scene/2d/animated_sprite_2d.cpp
+++ b/scene/2d/animated_sprite_2d.cpp
@@ -72,7 +72,7 @@ bool AnimatedSprite2D::_edit_use_rect() const {
 
 	Ref<Texture2D> t;
 	if (animation) {
-		t = frames->get_frame(animation, frame);
+		t = frames->get_frame_texture(animation, frame);
 	}
 	return t.is_valid();
 }
@@ -92,7 +92,7 @@ Rect2 AnimatedSprite2D::_get_rect() const {
 
 	Ref<Texture2D> t;
 	if (animation) {
-		t = frames->get_frame(animation, frame);
+		t = frames->get_frame_texture(animation, frame);
 	}
 	if (t.is_null()) {
 		return Rect2();
@@ -172,17 +172,21 @@ void AnimatedSprite2D::_notification(int p_what) {
 				return;
 			}
 
-			double speed = frames->get_animation_speed(animation) * Math::abs(speed_scale);
-			if (speed == 0) {
-				return; // Do nothing.
-			}
-			int last_frame = frames->get_frame_count(animation) - 1;
-
 			double remaining = get_process_delta_time();
+			int i = 0;
 			while (remaining) {
-				if (timeout <= 0) {
-					timeout = _get_frame_duration();
+				// Animation speed may be changed by animation_finished or frame_changed signals.
+				double speed = frames->get_animation_speed(animation) * Math::abs(speed_scale);
 
+				if (speed == 0) {
+					return; // Do nothing.
+				}
+
+				// Frame count may be changed by animation_finished or frame_changed signals.
+				int fc = frames->get_frame_count(animation);
+
+				if (timeout <= 0) {
+					int last_frame = fc - 1;
 					if (!playing_backwards) {
 						// Forward.
 						if (frame >= last_frame) {
@@ -217,14 +221,21 @@ void AnimatedSprite2D::_notification(int p_what) {
 						}
 					}
 
+					timeout = _get_frame_duration();
+
 					queue_redraw();
 
 					emit_signal(SceneStringNames::get_singleton()->frame_changed);
 				}
 
-				double to_process = MIN(timeout, remaining);
+				double to_process = MIN(timeout / speed, remaining);
+				timeout -= to_process * speed;
 				remaining -= to_process;
-				timeout -= to_process;
+
+				i++;
+				if (i > fc) {
+					return; // Prevents freezing if to_process is each time much less than remaining.
+				}
 			}
 		} break;
 
@@ -233,7 +244,7 @@ void AnimatedSprite2D::_notification(int p_what) {
 				return;
 			}
 
-			Ref<Texture2D> texture = frames->get_frame(animation, frame);
+			Ref<Texture2D> texture = frames->get_frame_texture(animation, frame);
 			if (texture.is_null()) {
 				return;
 			}
@@ -312,7 +323,6 @@ void AnimatedSprite2D::set_frame(int p_frame) {
 	frame = p_frame;
 	_reset_timeout();
 	queue_redraw();
-
 	emit_signal(SceneStringNames::get_singleton()->frame_changed);
 }
 
@@ -320,22 +330,12 @@ int AnimatedSprite2D::get_frame() const {
 	return frame;
 }
 
-void AnimatedSprite2D::set_speed_scale(double p_speed_scale) {
-	if (speed_scale == p_speed_scale) {
-		return;
-	}
-
-	double elapsed = _get_frame_duration() - timeout;
-
+void AnimatedSprite2D::set_speed_scale(float p_speed_scale) {
 	speed_scale = p_speed_scale;
 	playing_backwards = signbit(speed_scale) != backwards;
-
-	// We adapt the timeout so that the animation speed adapts as soon as the speed scale is changed.
-	_reset_timeout();
-	timeout -= elapsed;
 }
 
-double AnimatedSprite2D::get_speed_scale() const {
+float AnimatedSprite2D::get_speed_scale() const {
 	return speed_scale;
 }
 
@@ -379,8 +379,8 @@ bool AnimatedSprite2D::is_flipped_v() const {
 
 void AnimatedSprite2D::_res_changed() {
 	set_frame(frame);
-
 	queue_redraw();
+	notify_property_list_changed();
 }
 
 void AnimatedSprite2D::set_playing(bool p_playing) {
@@ -388,7 +388,7 @@ void AnimatedSprite2D::set_playing(bool p_playing) {
 		return;
 	}
 	playing = p_playing;
-	_reset_timeout();
+	playing_backwards = signbit(speed_scale) != backwards;
 	set_process_internal(playing);
 	notify_property_list_changed();
 }
@@ -414,23 +414,18 @@ void AnimatedSprite2D::play(const StringName &p_animation, bool p_backwards) {
 
 void AnimatedSprite2D::stop() {
 	set_playing(false);
+	backwards = false;
+	_reset_timeout();
 }
 
 double AnimatedSprite2D::_get_frame_duration() {
 	if (frames.is_valid() && frames->has_animation(animation)) {
-		double speed = frames->get_animation_speed(animation) * Math::abs(speed_scale);
-		if (speed > 0) {
-			return 1.0 / speed;
-		}
+		return frames->get_frame_duration(animation, frame);
 	}
 	return 0.0;
 }
 
 void AnimatedSprite2D::_reset_timeout() {
-	if (!playing) {
-		return;
-	}
-
 	timeout = _get_frame_duration();
 	is_over = false;
 }
@@ -444,8 +439,8 @@ void AnimatedSprite2D::set_animation(const StringName &p_animation) {
 	}
 
 	animation = p_animation;
-	_reset_timeout();
 	set_frame(0);
+	_reset_timeout();
 	notify_property_list_changed();
 	queue_redraw();
 }
@@ -455,12 +450,10 @@ StringName AnimatedSprite2D::get_animation() const {
 }
 
 PackedStringArray AnimatedSprite2D::get_configuration_warnings() const {
-	PackedStringArray warnings = Node::get_configuration_warnings();
-
+	PackedStringArray warnings = Node2D::get_configuration_warnings();
 	if (frames.is_null()) {
 		warnings.push_back(RTR("A SpriteFrames resource must be created or set in the \"Frames\" property in order for AnimatedSprite2D to display frames."));
 	}
-
 	return warnings;
 }