Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix AnimationSprite2D/3D::play using wrong end_frame

Browse Source 
On playing a different animation to the current backwards will start the new animation on the last animations last frame not the new ones
This commit is contained in:
Robocraft999 2024-06-24 14:30:25 +02:00
parent 95110ddcb4
commit dc6e664fda
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/2d/animated_sprite_2d.cpp
View File

@ -473,9 +473,10 @@ void AnimatedSprite2D::play(const StringName &p_name, float p_custom_scale, bool
playing = true; playing = true;
custom_speed_scale = p_custom_scale; custom_speed_scale = p_custom_scale;
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
if (name != animation) { if (name != animation) {
animation = name; animation = name;
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
if (p_from_end) { if (p_from_end) {
set_frame_and_progress(end_frame, 1.0); set_frame_and_progress(end_frame, 1.0);
} else { } else {
@ -483,7 +484,9 @@ void AnimatedSprite2D::play(const StringName &p_name, float p_custom_scale, bool
} }
emit_signal(SceneStringName(animation_changed)); emit_signal(SceneStringName(animation_changed));
} else { } else {
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
bool is_backward = signbit(speed_scale * custom_speed_scale); bool is_backward = signbit(speed_scale * custom_speed_scale);
if (p_from_end && is_backward && frame == 0 && frame_progress <= 0.0) { if (p_from_end && is_backward && frame == 0 && frame_progress <= 0.0) {
set_frame_and_progress(end_frame, 1.0); set_frame_and_progress(end_frame, 1.0);
} else if (!p_from_end && !is_backward && frame == end_frame && frame_progress >= 1.0) { } else if (!p_from_end && !is_backward && frame == end_frame && frame_progress >= 1.0) {

5
scene/3d/sprite_3d.cpp
View File

@ -1334,9 +1334,10 @@ void AnimatedSprite3D::play(const StringName &p_name, float p_custom_scale, bool
playing = true; playing = true;
custom_speed_scale = p_custom_scale; custom_speed_scale = p_custom_scale;
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
if (name != animation) { if (name != animation) {
animation = name; animation = name;
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
if (p_from_end) { if (p_from_end) {
set_frame_and_progress(end_frame, 1.0); set_frame_and_progress(end_frame, 1.0);
} else { } else {
@ -1344,7 +1345,9 @@ void AnimatedSprite3D::play(const StringName &p_name, float p_custom_scale, bool
} }
emit_signal(SceneStringName(animation_changed)); emit_signal(SceneStringName(animation_changed));
} else { } else {
int end_frame = MAX(0, frames->get_frame_count(animation) - 1);
bool is_backward = signbit(speed_scale * custom_speed_scale); bool is_backward = signbit(speed_scale * custom_speed_scale);
if (p_from_end && is_backward && frame == 0 && frame_progress <= 0.0) { if (p_from_end && is_backward && frame == 0 && frame_progress <= 0.0) {
set_frame_and_progress(end_frame, 1.0); set_frame_and_progress(end_frame, 1.0);
} else if (!p_from_end && !is_backward && frame == end_frame && frame_progress >= 1.0) { } else if (!p_from_end && !is_backward && frame == end_frame && frame_progress >= 1.0) {