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

Merge pull request #27577 from guilhermefelipecgs/continuation_of_27562

Browse source 
Continuation of #27562
This commit is contained in:
Rémi Verschelde 2019-04-21 13:16:35 +02:00 committed by GitHub
commit 36a54ffebb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/animation/animation_tree.cpp
View file

@ -891,7 +891,7 @@ void AnimationTree::_process_graph(float p_delta) {
t->loc = Vector3(); t->loc = Vector3();
t->rot = Quat(); t->rot = Quat();
t->rot_blend_accum = 0; t->rot_blend_accum = 0;
t->scale = Vector3(); t->scale = Vector3(1, 1, 1);
} }
float prev_time = time - delta; float prev_time = time - delta;
@ -952,11 +952,9 @@ void AnimationTree::_process_graph(float p_delta) {
t->loc = loc; t->loc = loc;
t->rot = rot; t->rot = rot;
t->rot_blend_accum = 0; t->rot_blend_accum = 0;
t->scale = Vector3(); t->scale = scale;
} }
scale -= Vector3(1.0, 1.0, 1.0); //helps make it work properly with Add nodes
if (err != OK) if (err != OK)
continue; continue;
@ -1241,8 +1239,6 @@ void AnimationTree::_process_graph(float p_delta) {
Transform xform; Transform xform;
xform.origin = t->loc; xform.origin = t->loc;
t->scale += Vector3(1.0, 1.0, 1.0); //helps make it work properly with Add nodes and root motion
xform.basis.set_quat_scale(t->rot, t->scale); xform.basis.set_quat_scale(t->rot, t->scale);
if (t->root_motion) { if (t->root_motion) {