mirror of
https://github.com/godotengine/godot
synced 2024-09-05 06:38:25 +00:00
Merge pull request #93548 from Robocraft999/patch-1
Fix `AnimatedSprite2D/3D::play` using wrong end_frame
This commit is contained in:
commit
cafe7042b1
|
@ -473,9 +473,10 @@ void AnimatedSprite2D::play(const StringName &p_name, float p_custom_scale, bool
|
|||
playing = true;
|
||||
custom_speed_scale = p_custom_scale;
|
||||
|
||||
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
|
||||
if (name != animation) {
|
||||
animation = name;
|
||||
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
|
||||
|
||||
if (p_from_end) {
|
||||
set_frame_and_progress(end_frame, 1.0);
|
||||
} else {
|
||||
|
@ -483,7 +484,9 @@ void AnimatedSprite2D::play(const StringName &p_name, float p_custom_scale, bool
|
|||
}
|
||||
emit_signal(SceneStringName(animation_changed));
|
||||
} else {
|
||||
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
|
||||
bool is_backward = signbit(speed_scale * custom_speed_scale);
|
||||
|
||||
if (p_from_end && is_backward && frame == 0 && frame_progress <= 0.0) {
|
||||
set_frame_and_progress(end_frame, 1.0);
|
||||
} else if (!p_from_end && !is_backward && frame == end_frame && frame_progress >= 1.0) {
|
||||
|
|
|
@ -1334,9 +1334,10 @@ void AnimatedSprite3D::play(const StringName &p_name, float p_custom_scale, bool
|
|||
playing = true;
|
||||
custom_speed_scale = p_custom_scale;
|
||||
|
||||
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
|
||||
if (name != animation) {
|
||||
animation = name;
|
||||
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
|
||||
|
||||
if (p_from_end) {
|
||||
set_frame_and_progress(end_frame, 1.0);
|
||||
} else {
|
||||
|
@ -1344,7 +1345,9 @@ void AnimatedSprite3D::play(const StringName &p_name, float p_custom_scale, bool
|
|||
}
|
||||
emit_signal(SceneStringName(animation_changed));
|
||||
} else {
|
||||
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
|
||||
bool is_backward = signbit(speed_scale * custom_speed_scale);
|
||||
|
||||
if (p_from_end && is_backward && frame == 0 && frame_progress <= 0.0) {
|
||||
set_frame_and_progress(end_frame, 1.0);
|
||||
} else if (!p_from_end && !is_backward && frame == end_frame && frame_progress >= 1.0) {
|
||||
|
|
Loading…
Reference in a new issue