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

fix unintentional object rotation by animation tree

Browse source 
(cherry picked from commit ddac0e95dc)
This commit is contained in:
Tokage 2020-08-21 13:56:04 +09:00 committed by Rémi Verschelde
parent c318cf6ed2
commit 0454848f4d
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/animation/animation_tree.cpp
View file

@ -599,9 +599,9 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
if (path.get_subname_count() == 1 && Object::cast_to<Skeleton>(spatial)) { if (path.get_subname_count() == 1 && Object::cast_to<Skeleton>(spatial)) {
Skeleton *sk = Object::cast_to<Skeleton>(spatial); Skeleton *sk = Object::cast_to<Skeleton>(spatial);
track_xform->skeleton = sk;
int bone_idx = sk->find_bone(path.get_subname(0)); int bone_idx = sk->find_bone(path.get_subname(0));
if (bone_idx != -1) { if (bone_idx != -1) {
track_xform->skeleton = sk;
track_xform->bone_idx = bone_idx; track_xform->bone_idx = bone_idx;
} }
} }
@ -1207,7 +1207,7 @@ void AnimationTree::_process_graph(float p_delta) {
} else if (t->skeleton && t->bone_idx >= 0) { } else if (t->skeleton && t->bone_idx >= 0) {
t->skeleton->set_bone_pose(t->bone_idx, xform); t->skeleton->set_bone_pose(t->bone_idx, xform);
} else { } else if (!t->skeleton) {
t->spatial->set_transform(xform); t->spatial->set_transform(xform);
} }