godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Merge pull request #12107 from RandomShaper/fix-anim-before-first-key

Browse Source 
Fix animation before first key
This commit is contained in:
Rémi Verschelde
2017-10-20 23:08:02 +02:00
committed by GitHub
parent f2f75d1f11 f4959ee32b
commit 08ebbc90a8
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/animation/animation_player.cpp
View File

@@ -405,6 +405,10 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float
if (a->value_track_get_update_mode(i) == Animation::UPDATE_CONTINUOUS || (p_delta == 0 && a->value_track_get_update_mode(i) == Animation::UPDATE_DISCRETE)) { //delta == 0 means seek if (a->value_track_get_update_mode(i) == Animation::UPDATE_CONTINUOUS || (p_delta == 0 && a->value_track_get_update_mode(i) == Animation::UPDATE_DISCRETE)) { //delta == 0 means seek
Variant value = a->value_track_interpolate(i, p_time); Variant value = a->value_track_interpolate(i, p_time);
if (value == Variant())
continue;
//thanks to trigger mode, this should be solved now.. //thanks to trigger mode, this should be solved now..
/* /*
if (p_delta==0 && value.get_type()==Variant::STRING) if (p_delta==0 && value.get_type()==Variant::STRING)

17
scene/resources/animation.cpp
View File

@@ -1171,9 +1171,7 @@ T Animation::_interpolate(const Vector<TKey<T> > &p_keys, float p_time, Interpol
ERR_FAIL_COND_V(idx == -2, T()); ERR_FAIL_COND_V(idx == -2, T());
if (p_ok) bool result = true;
*p_ok = true;
int next = 0; int next = 0;
float c = 0; float c = 0;
// prepare for all cases of interpolation // prepare for all cases of interpolation
@@ -1243,10 +1241,19 @@ T Animation::_interpolate(const Vector<TKey<T> > &p_keys, float p_time, Interpol
} else if (idx < 0) { } else if (idx < 0) {
idx = next = 0; // only allow extending first key to anim start if looping
if (loop)
idx = next = 0;
else
result = false;
} }
} }
if (p_ok)
*p_ok = result;
if (!result)
return T();
float tr = p_keys[idx].transition; float tr = p_keys[idx].transition;
if (tr == 0 || idx == next) { if (tr == 0 || idx == next) {
@@ -1298,7 +1305,7 @@ Error Animation::transform_track_interpolate(int p_track, float p_time, Vector3
TransformKey tk = _interpolate(tt->transforms, p_time, tt->interpolation, tt->loop_wrap, &ok); TransformKey tk = _interpolate(tt->transforms, p_time, tt->interpolation, tt->loop_wrap, &ok);
if (!ok) // ?? if (!ok)
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;
if (r_loc) if (r_loc)