Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset animation on playback stop #33733

Merged
merged 1 commit into from
Jan 13, 2023
+21 −9
Merged

Reset animation on playback stop #33733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions scene/animation/animation_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double

} break;
case Animation::TYPE_METHOD: {
if (!nc->node) {
if (!nc->node || is_stopping) {
continue;
}
if (!p_is_current) {
Expand Down Expand Up @@ -808,7 +808,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double

} break;
case Animation::TYPE_AUDIO: {
if (!nc->node) {
if (!nc->node || is_stopping) {
continue;
}

Expand Down Expand Up @@ -915,6 +915,10 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double

} break;
case Animation::TYPE_ANIMATION: {
if (is_stopping) {
continue;
}

AnimationPlayer *player = Object::cast_to<AnimationPlayer>(nc->node);
if (!player) {
continue;
Expand Down Expand Up @@ -1658,7 +1662,7 @@ void AnimationPlayer::play(const StringName &p_name, double p_custom_blend, floa
}

if (get_current_animation() != p_name) {
_stop_playing_caches();
_stop_playing_caches(false);
}

c.current.from = &animation_set[name];
Expand Down Expand Up @@ -1808,7 +1812,7 @@ void AnimationPlayer::_animation_changed(const StringName &p_name) {
}
}

void AnimationPlayer::_stop_playing_caches() {
void AnimationPlayer::_stop_playing_caches(bool p_reset) {
for (TrackNodeCache *E : playing_caches) {
if (E->node && E->audio_playing) {
E->node->call(SNAME("stop"));
Expand All @@ -1818,7 +1822,12 @@ void AnimationPlayer::_stop_playing_caches() {
if (!player) {
continue;
}
player->stop();

if (p_reset) {
player->stop();
} else {
player->pause();
}
}
}

Expand All @@ -1830,7 +1839,7 @@ void AnimationPlayer::_node_removed(Node *p_node) {
}

void AnimationPlayer::clear_caches() {
_stop_playing_caches();
_stop_playing_caches(true);

node_cache_map.clear();

Expand Down Expand Up @@ -1952,13 +1961,15 @@ void AnimationPlayer::_set_process(bool p_process, bool p_force) {
}

void AnimationPlayer::_stop_internal(bool p_reset) {
_stop_playing_caches();
_stop_playing_caches(p_reset);
Playback &c = playback;
c.blend.clear();
if (p_reset) {
is_stopping = true;
seek(0, true);
is_stopping = false;
c.current.from = nullptr;
c.current.speed_scale = 1;
c.current.pos = 0;
}
_set_process(false);
queued.clear();
Expand Down
3 changes: 2 additions & 1 deletion scene/animation/animation_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ class AnimationPlayer : public Node {
uint64_t accum_pass = 1;
float speed_scale = 1.0;
double default_blend_time = 0.0;
bool is_stopping = false;

struct AnimationData {
String name;
Expand Down Expand Up @@ -277,7 +278,7 @@ class AnimationPlayer : public Node {
void _animation_process(double p_delta);

void _node_removed(Node *p_node);
void _stop_playing_caches();
void _stop_playing_caches(bool p_reset);

// bind helpers
Vector<String> _get_animation_list() const {
Expand Down