diff options
Diffstat (limited to 'scene/animation/animation_tree_player.cpp')
| -rw-r--r-- | scene/animation/animation_tree_player.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index ce341e2b09..c732dd54cf 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -766,9 +766,8 @@ void AnimationTreePlayer::_process_animation(float p_delta) { t.scale.y=0; t.scale.z=0; - Variant value = t.node->get(t.property); - value.zero(); - t.node->set(t.property, value); + t.value = t.object->get(t.property); + t.value.zero(); } @@ -815,9 +814,9 @@ void AnimationTreePlayer::_process_animation(float p_delta) { case Animation::TYPE_VALUE: { ///< Set a value in a property, can be interpolated. if (a->value_track_is_continuous(tr.local_track)) { - Variant blended, value = a->value_track_interpolate(tr.local_track,anim_list->time); - Variant::blend(tr.track->node->get(tr.track->property),value,blend,blended); - tr.track->node->set(tr.track->property,blended); + 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; @@ -825,7 +824,7 @@ void AnimationTreePlayer::_process_animation(float p_delta) { 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->node->set(tr.track->property,value); + tr.track->object->set(tr.track->property,value); } } } break; @@ -838,7 +837,7 @@ void AnimationTreePlayer::_process_animation(float p_delta) { StringName method = a->method_track_get_name(tr.local_track,E->get()); Vector<Variant> args=a->method_track_get_params(tr.local_track,E->get()); args.resize(VARIANT_ARG_MAX); - tr.track->node->call(method,args[0],args[1],args[2],args[3],args[4]); + tr.track->object->call(method,args[0],args[1],args[2],args[3],args[4]); } } break; } @@ -855,7 +854,7 @@ void AnimationTreePlayer::_process_animation(float p_delta) { Track &t = E->get(); - if (!t.node) + if (!t.object) continue; if(t.property) // value track; was applied in step 2 @@ -1494,7 +1493,8 @@ AnimationTreePlayer::Track* AnimationTreePlayer::_find_track(const NodePath& p_p Node *parent=get_node(base_path); ERR_FAIL_COND_V(!parent,NULL); - Node *child=parent->get_node(p_path); + RES resource; + Node *child=parent->get_node_and_resource(p_path,resource); if (!child) { String err = "Animation track references unknown Node: '"+String(p_path)+"'."; WARN_PRINT(err.ascii().get_data()); @@ -1522,7 +1522,7 @@ AnimationTreePlayer::Track* AnimationTreePlayer::_find_track(const NodePath& p_p Track tr; tr.id=id; - tr.node=child; + tr.object=resource.is_valid()?(Object*)resource.ptr():(Object*)child; tr.skeleton=child->cast_to<Skeleton>(); tr.spatial=child->cast_to<Spatial>(); tr.bone_idx=bone_idx; @@ -1855,7 +1855,6 @@ AnimationTreePlayer::AnimationTreePlayer() { out_name="out"; out->pos=Point2(40,40); node_map.insert( out_name , out); - AnimationProcessMode animation_process_mode; animation_process_mode = ANIMATION_PROCESS_IDLE; processing = false; active=false; |