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

Improve a8eca76cd1

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-01 23:32:12 +02:00
parent 3e7ec2b28d
commit 311a7b8c02
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1447,8 +1447,8 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
const auto aData = node->Values[4 + aIndex * 2].AsFloat4(); const auto aData = node->Values[4 + aIndex * 2].AsFloat4();
AnimSampleData a(node->Assets[aIndex].As<Animation>(), aData.W, aIndex); AnimSampleData a(node->Assets[aIndex].As<Animation>(), aData.W, aIndex);
// Check single A case or the last valid animation // Check single A case
if (x <= aData.X + ANIM_GRAPH_BLEND_THRESHOLD || i + 2 == data.Count) if (x <= aData.X + ANIM_GRAPH_BLEND_THRESHOLD)
{ {
MultiBlendAnimData::BeforeSample(context, bucket, prevList, a, speed); MultiBlendAnimData::BeforeSample(context, bucket, prevList, a, speed);
value = SampleAnimation(node, loop, startTimePos, a); value = SampleAnimation(node, loop, startTimePos, a);
@@ -1480,6 +1480,16 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
MultiBlendAnimData::AfterSample(newList, b); MultiBlendAnimData::AfterSample(newList, b);
break; break;
} }
if (newList.IsEmpty())
{
// Sample the last animation if had no result
const auto aIndex = data.IndicesSorted[data.Count - 1];
const auto aData = node->Values[4 + aIndex * 2].AsFloat4();
AnimSampleData a(node->Assets[aIndex].As<Animation>(), aData.W, aIndex);
MultiBlendAnimData::BeforeSample(context, bucket, prevList, a, speed);
value = SampleAnimation(node, loop, startTimePos, a);
MultiBlendAnimData::AfterSample(newList, a);
}
MultiBlendAnimData::SetList(bucket, newList); MultiBlendAnimData::SetList(bucket, newList);
bucket.LastUpdateFrame = context.CurrentFrameIndex; bucket.LastUpdateFrame = context.CurrentFrameIndex;
@@ -1734,7 +1744,7 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
break; break;
} }
// Blend Pose // Blend Poses
case 14: case 14:
{ {
ASSERT(box->ID == 0); ASSERT(box->ID == 0);