diff options
| author | Juan Linietsky | 2018-05-07 16:12:27 -0300 |
|---|---|---|
| committer | GitHub | 2018-05-07 16:12:27 -0300 |
| commit | 6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab (patch) | |
| tree | 13c691ec60e4307a9ece3272ceaee10d098514f1 /scene/animation/animation_player.cpp | |
| parent | dff3a2f3789ee2fb7eebb1d115097b944b439a18 (diff) | |
| parent | 9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26 (diff) | |
| download | godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.tar.gz godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.tar.zst godot-6d46f73ec3e3eadaf25927633bdc0aa1eaca93ab.zip | |
Merge pull request #11973 from AndreaCatania/ragdoll
Ragdoll - Physical bone node
Diffstat (limited to 'scene/animation/animation_player.cpp')
| -rw-r--r-- | scene/animation/animation_player.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index eb3954af2..c0d1e62e0 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -246,8 +246,9 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) { if (a->track_get_path(i).get_subname_count() == 1 && Object::cast_to<Skeleton>(child)) { - bone_idx = Object::cast_to<Skeleton>(child)->find_bone(a->track_get_path(i).get_subname(0)); - if (bone_idx == -1) { + Skeleton *sk = Object::cast_to<Skeleton>(child); + bone_idx = sk->find_bone(a->track_get_path(i).get_subname(0)); + if (bone_idx == -1 || sk->is_bone_ignore_animation(bone_idx)) { continue; } @@ -579,16 +580,14 @@ void AnimationPlayer::_animation_process2(float p_delta) { } void AnimationPlayer::_animation_update_transforms() { + { + Transform t; + for (int i = 0; i < cache_update_size; i++) { - for (int i = 0; i < cache_update_size; i++) { + TrackNodeCache *nc = cache_update[i]; - TrackNodeCache *nc = cache_update[i]; + ERR_CONTINUE(nc->accum_pass != accum_pass); - ERR_CONTINUE(nc->accum_pass != accum_pass); - - if (nc->spatial) { - - Transform t; t.origin = nc->loc_accum; t.basis.set_quat_scale(nc->rot_accum, nc->scale_accum); if (nc->skeleton && nc->bone_idx >= 0) { |