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

Fix nested animations sampling

Browse Source 
#2472
This commit is contained in:
Wojtek Figat
2024-04-22 13:29:29 +02:00
parent 568a69081d
commit 5f02b4173a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,6 +247,7 @@ void AnimGraphExecutor::ProcessAnimation(AnimGraphImpulse* nodes, AnimGraphNode*
{ {
// Per-channel bit to indicate which channels were used by nested // Per-channel bit to indicate which channels were used by nested
usedNodesThis.Resize(nodes->Nodes.Count()); usedNodesThis.Resize(nodes->Nodes.Count());
usedNodesThis.SetAll(false);
usedNodes = &usedNodesThis; usedNodes = &usedNodesThis;
} }
@@ -286,11 +287,11 @@ void AnimGraphExecutor::ProcessAnimation(AnimGraphImpulse* nodes, AnimGraphNode*
SkinnedModel::SkeletonMapping sourceMapping; SkinnedModel::SkeletonMapping sourceMapping;
if (retarget) if (retarget)
sourceMapping = _graph.BaseModel->GetSkeletonMapping(mapping.SourceSkeleton); sourceMapping = _graph.BaseModel->GetSkeletonMapping(mapping.SourceSkeleton);
for (int32 i = 0; i < nodes->Nodes.Count(); i++) for (int32 nodeIndex = 0; nodeIndex < nodes->Nodes.Count(); nodeIndex++)
{ {
const int32 nodeToChannel = mapping.NodesMapping[i]; const int32 nodeToChannel = mapping.NodesMapping[nodeIndex];
Transform& dstNode = nodes->Nodes[i]; Transform& dstNode = nodes->Nodes[nodeIndex];
Transform srcNode = emptyNodes->Nodes[i]; Transform srcNode = emptyNodes->Nodes[nodeIndex];
if (nodeToChannel != -1) if (nodeToChannel != -1)
{ {
// Calculate the animated node transformation // Calculate the animated node transformation
@@ -299,14 +300,14 @@ void AnimGraphExecutor::ProcessAnimation(AnimGraphImpulse* nodes, AnimGraphNode*
// Optionally retarget animation into the skeleton used by the Anim Graph // Optionally retarget animation into the skeleton used by the Anim Graph
if (retarget) if (retarget)
{ {
RetargetSkeletonNode(mapping.SourceSkeleton->Skeleton, mapping.TargetSkeleton->Skeleton, sourceMapping, srcNode, i); RetargetSkeletonNode(mapping.SourceSkeleton->Skeleton, mapping.TargetSkeleton->Skeleton, sourceMapping, srcNode, nodeIndex);
} }
// Mark node as used // Mark node as used
if (usedNodes) if (usedNodes)
usedNodes->Set(i, true); usedNodes->Set(nodeIndex, true);
} }
else if (usedNodes && usedNodes != &usedNodesThis) else if (usedNodes && (usedNodes != &usedNodesThis || usedNodes->Get(nodeIndex)))
{ {
// Skip for nested animations so other one or top-level anim will update remaining nodes // Skip for nested animations so other one or top-level anim will update remaining nodes
continue; continue;