Fix Anim Tree blending inconsistency

Co-authored-by: Marios Staikopoulos [email protected]
godotengine · Oct 17, 2021 · 3ebb58c · 3ebb58c
1 parent c2a616f
commit 3ebb58c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
@@ -934,7 +934,6 @@ void AnimationTree::_process_graph(real_t p_delta) {
 							t->process_pass = process_pass;
 							t->loc = Vector3();
 							t->rot = Quaternion();
-							t->rot_blend_accum = 0;
 							t->scale = Vector3(1, 1, 1);
 						}
 
@@ -995,7 +994,6 @@ void AnimationTree::_process_graph(real_t p_delta) {
 							t->process_pass = process_pass;
 							t->loc = Vector3();
 							t->rot = Quaternion();
-							t->rot_blend_accum = 0;
 							t->scale = Vector3(1, 1, 1);
 						}
 
@@ -1047,14 +1045,7 @@ void AnimationTree::_process_graph(real_t p_delta) {
 								continue;
 							}
 
-							if (t->rot_blend_accum == 0) {
-								t->rot = rot;
-								t->rot_blend_accum = blend;
-							} else {
-								real_t rot_total = t->rot_blend_accum + blend;
-								t->rot = rot.slerp(t->rot, t->rot_blend_accum / rot_total).normalized();
-								t->rot_blend_accum = rot_total;
-							}
+							t->rot = (t->rot * Quaternion().slerp(rot, blend)).normalized();
 						}
 #endif // _3D_DISABLED
 					} break;
@@ -1066,7 +1057,6 @@ void AnimationTree::_process_graph(real_t p_delta) {
 							t->process_pass = process_pass;
 							t->loc = Vector3();
 							t->rot = Quaternion();
-							t->rot_blend_accum = 0;
 							t->scale = Vector3(1, 1, 1);
 						}
 

diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
@@ -202,7 +202,6 @@ class AnimationTree : public Node {
 		bool scale_used = false;
 		Vector3 loc;
 		Quaternion rot;
-		real_t rot_blend_accum = 0.0;
 		Vector3 scale;
 
 		TrackCacheTransform() {