GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix blending additive animations.

Browse Source
This commit is contained in:
Chandler Cox
2023-12-07 20:27:24 -06:00
parent 74b77bfa4c
commit e9285410e2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Engine/Animations/Graph/AnimGroup.Animation.cpp
View File

@@ -1075,11 +1075,16 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
{ {
tA = nodesA->Nodes[i]; tA = nodesA->Nodes[i];
tB = nodesB->Nodes[i]; tB = nodesB->Nodes[i];
t.Translation = tA.Translation + tB.Translation; t.Translation = tA.Translation * (1 - alpha) + tB.Translation * alpha;
t.Orientation = tA.Orientation * tB.Orientation; auto originalOrientation = (1 - alpha) * tA.Orientation;
t.Scale = tA.Scale * tB.Scale; auto additiveOrientation = alpha * tB.Orientation;
if (Quaternion::Dot(originalOrientation, additiveOrientation) < 0)
additiveOrientation *= -1;
t.Orientation = originalOrientation + additiveOrientation;
t.Scale = tA.Scale * (1 - alpha) + tB.Scale * alpha;
t.Orientation.Normalize(); t.Orientation.Normalize();
Transform::Lerp(tA, t, alpha, nodes->Nodes[i]); nodes->Nodes[i] = t;
//Transform::Lerp(tA, t, alpha, nodes->Nodes[i]);
} }
Transform::Lerp(nodesA->RootMotion, nodesA->RootMotion + nodesB->RootMotion, alpha, nodes->RootMotion); Transform::Lerp(nodesA->RootMotion, nodesA->RootMotion + nodesB->RootMotion, alpha, nodes->RootMotion);
value = nodes; value = nodes;