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

Fix crash when sampling animation in Anim Graph that uses it's length to calculate start position

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-10 12:27:10 +02:00
parent fe4e8f3dd2
commit aab3d494ff
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -747,9 +747,6 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
{
const auto anim = node->Assets[0].As<Animation>();
auto& bucket = context.Data->State[node->BucketIndex].Animation;
const float speed = (float)tryGetValue(node->GetBox(5), node->Values[1]);
const bool loop = (bool)tryGetValue(node->GetBox(6), node->Values[2]);
const float startTimePos = (float)tryGetValue(node->GetBox(7), node->Values[3]);
switch (box->ID)
{
@@ -757,6 +754,9 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
case 0:
{
ANIM_GRAPH_PROFILE_EVENT("Animation");
const float speed = (float)tryGetValue(node->GetBox(5), node->Values[1]);
const bool loop = (bool)tryGetValue(node->GetBox(6), node->Values[2]);
const float startTimePos = (float)tryGetValue(node->GetBox(7), node->Values[3]);
const float length = anim ? anim->GetLength() : 0.0f;
// Calculate new time position
@@ -776,14 +776,20 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
}
// Normalized Time
case 1:
{
const float startTimePos = (float)tryGetValue(node->GetBox(7), node->Values[3]);
value = startTimePos + bucket.TimePosition;
if (anim && anim->IsLoaded())
value.AsFloat /= anim->GetLength();
break;
}
// Time
case 2:
{
const float startTimePos = (float)tryGetValue(node->GetBox(7), node->Values[3]);
value = startTimePos + bucket.TimePosition;
break;
}
// Length
case 3:
value = anim ? anim->GetLength() : 0.0f;