godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18851 from groud/fix_animatedsprite 

Updates frame timeout when changing speed scale
This commit is contained in:
Rémi Verschelde 2018-05-14 08:30:22 +02:00 committed by GitHub
parent dd2aba021c d7f25f7adb
commit aba499965c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scene/2d/animated_sprite.cpp
View File

@ -361,7 +361,7 @@ void AnimatedSprite::_notification(int p_what) {
if (timeout <= 0) {
timeout = 1.0 / speed;
timeout = _get_frame_duration();
int fc = frames->get_frame_count(animation);
if (frame >= fc - 1) {
@ -483,7 +483,13 @@ int AnimatedSprite::get_frame() const {
void AnimatedSprite::set_speed_scale(float p_speed_scale) {
float elapsed = _get_frame_duration() - timeout;
speed_scale = MAX(p_speed_scale, 0.0f);
// We adapt the timeout so that the animation speed adapts as soon as the speed scale is changed
_reset_timeout();
timeout -= elapsed;
}
float AnimatedSprite::get_speed_scale() const {
@ -574,21 +580,22 @@ bool AnimatedSprite::is_playing() const {
return playing;
}
float AnimatedSprite::_get_frame_duration() {
if (frames.is_valid() && frames->has_animation(animation)) {
float speed = frames->get_animation_speed(animation) * speed_scale;
if (speed > 0) {
return 1.0 / speed;
}
}
return 0.0;
}
void AnimatedSprite::_reset_timeout() {
if (!playing)
return;
if (frames.is_valid() && frames->has_animation(animation)) {
float speed = frames->get_animation_speed(animation) * speed_scale;
if (speed > 0) {
timeout = 1.0 / speed;
} else {
timeout = 0;
}
} else {
timeout = 0;
}
timeout = _get_frame_duration();
}
void AnimatedSprite::set_animation(const StringName &p_animation) {

1
scene/2d/animated_sprite.h
View File

@ -141,6 +141,7 @@ class AnimatedSprite : public Node2D {
void _res_changed();
float _get_frame_duration();
void _reset_timeout();
void _set_playing(bool p_playing);
bool _is_playing() const;