asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Reset animation on playback stop

Browse source
This commit is contained in:
Tomasz Chabora 2019-11-19 14:39:10 +01:00 committed by kobewi
parent 3c9bf4bc21
commit 4668a186db
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scene/animation/animation_player.cpp
View file

@ -745,7 +745,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
} break; } break;
case Animation::TYPE_METHOD: { case Animation::TYPE_METHOD: {
if (!nc->node) { if (!nc->node || is_stopping) {
continue; continue;
} }
if (!p_is_current) { if (!p_is_current) {
@ -808,7 +808,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
} break; } break;
case Animation::TYPE_AUDIO: { case Animation::TYPE_AUDIO: {
if (!nc->node) { if (!nc->node || is_stopping) {
continue; continue;
} }
@ -915,6 +915,10 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, double
} break; } break;
case Animation::TYPE_ANIMATION: { case Animation::TYPE_ANIMATION: {
if (is_stopping) {
continue;
}
AnimationPlayer *player = Object::cast_to<AnimationPlayer>(nc->node); AnimationPlayer *player = Object::cast_to<AnimationPlayer>(nc->node);
if (!player) { if (!player) {
continue; continue;
@ -1658,7 +1662,7 @@ void AnimationPlayer::play(const StringName &p_name, double p_custom_blend, floa
} }
if (get_current_animation() != p_name) { if (get_current_animation() != p_name) {
_stop_playing_caches(); _stop_playing_caches(false);
} }
c.current.from = &animation_set[name]; c.current.from = &animation_set[name];
@ -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) { for (TrackNodeCache *E : playing_caches) {
if (E->node && E->audio_playing) { if (E->node && E->audio_playing) {
E->node->call(SNAME("stop")); E->node->call(SNAME("stop"));
@ -1818,7 +1822,12 @@ void AnimationPlayer::_stop_playing_caches() {
if (!player) { if (!player) {
continue; continue;
} }
player->stop();
if (p_reset) {
player->stop();
} else {
player->pause();
}
} }
} }
@ -1830,7 +1839,7 @@ void AnimationPlayer::_node_removed(Node *p_node) {
} }
void AnimationPlayer::clear_caches() { void AnimationPlayer::clear_caches() {
_stop_playing_caches(); _stop_playing_caches(true);
node_cache_map.clear(); node_cache_map.clear();
@ -1952,13 +1961,15 @@ void AnimationPlayer::_set_process(bool p_process, bool p_force) {
} }
void AnimationPlayer::_stop_internal(bool p_reset) { void AnimationPlayer::_stop_internal(bool p_reset) {
_stop_playing_caches(); _stop_playing_caches(p_reset);
Playback &c = playback; Playback &c = playback;
c.blend.clear(); c.blend.clear();
if (p_reset) { if (p_reset) {
is_stopping = true;
seek(0, true);
is_stopping = false;
c.current.from = nullptr; c.current.from = nullptr;
c.current.speed_scale = 1; c.current.speed_scale = 1;
c.current.pos = 0;
} }
_set_process(false); _set_process(false);
queued.clear(); queued.clear();

3
scene/animation/animation_player.h
View file

@ -192,6 +192,7 @@ private:
uint64_t accum_pass = 1; uint64_t accum_pass = 1;
float speed_scale = 1.0; float speed_scale = 1.0;
double default_blend_time = 0.0; double default_blend_time = 0.0;
bool is_stopping = false;
struct AnimationData { struct AnimationData {
String name; String name;
@ -277,7 +278,7 @@ private:
void _animation_process(double p_delta); void _animation_process(double p_delta);
void _node_removed(Node *p_node); void _node_removed(Node *p_node);
void _stop_playing_caches(); void _stop_playing_caches(bool p_reset);
// bind helpers // bind helpers
Vector<String> _get_animation_list() const { Vector<String> _get_animation_list() const {