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

AnimationTree: set value track property per frame, not per track.

Browse source
This commit is contained in:
Josh Grams 2016-04-24 04:39:32 -04:00
parent 7d89a8b748
commit 2272824ee2
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scene/animation/animation_tree_player.cpp
View file

@ -816,16 +816,9 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
if (a->value_track_is_continuous(tr.local_track)) {
Variant value = a->value_track_interpolate(tr.local_track,anim_list->time);
Variant::blend(tr.track->value,value,blend,tr.track->value);
tr.track->object->set(tr.track->property,tr.track->value);
} else {
List<int> indices;
a->value_track_get_key_indices(tr.local_track,anim_list->time,anim_list->step,&indices);
for(List<int>::Element *E=indices.front();E;E=E->next()) {
Variant value = a->track_get_key_value(tr.local_track,E->get());
tr.track->object->set(tr.track->property,value);
}
int index = a->track_find_key(tr.local_track,anim_list->time+anim_list->step);
tr.track->value = a->track_get_key_value(tr.local_track, index);
}
} break;
case Animation::TYPE_METHOD: { ///< Call any method on a specific node.
@ -857,8 +850,10 @@ void AnimationTreePlayer::_process_animation(float p_delta) {
if (!t.object)
continue;
if(t.property) // value track; was applied in step 2
if(t.property) { // value track
t.object->set(t.property,t.value);
continue;
}
Transform xform;
xform.basis=t.rot;