birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fixes for Gems

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 14:51:12 -07:00
parent 9245a31196
commit ea2f74dc0f
66 changed files with 62 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Tests/AnimGraphStateMachineInterruptionTests.cpp
+6 -9
View File
@@ -137,9 +137,9 @@ namespace EMotionFX
m_eventHandler->m_numStatesEnded -= 1;
Simulate(20.0f/*simulationTime*/, 60.0f/*expectedFps*/, 0.0f/*fpsVariance*/,
/*preCallback*/[this]([[maybe_unused]] AnimGraphInstance* animGraphInstance){},
/*postCallback*/[this]([[maybe_unused]] AnimGraphInstance* animGraphInstance){},
/*preUpdateCallback*/[this](AnimGraphInstance*, float, float, int) {},
/*preCallback*/[]([[maybe_unused]] AnimGraphInstance* animGraphInstance){},
/*postCallback*/[]([[maybe_unused]] AnimGraphInstance* animGraphInstance){},
/*preUpdateCallback*/[](AnimGraphInstance*, float, float, int) {},
/*postUpdateCallback*/[this](AnimGraphInstance* animGraphInstance, [[maybe_unused]] float time, [[maybe_unused]] float timeDelta, int frame)
{
const std::vector<AnimGraphStateMachine_InterruptionTestData::ActiveObjectsAtFrame>& activeObjectsAtFrame = GetParam().m_activeObjectsAtFrame;
@@ -457,14 +457,11 @@ namespace EMotionFX
float prevBlendWeight = 0.0f;
Simulate(2.0f /*simulationTime*/, 10.0f /*expectedFps*/, 0.0f /*fpsVariance*/,
/*preCallback*/[this]([[maybe_unused]] AnimGraphInstance* animGraphInstance) {},
/*postCallback*/[this]([[maybe_unused]] AnimGraphInstance* animGraphInstance) {},
/*preUpdateCallback*/[this](AnimGraphInstance*, float, float, int) {},
/*preCallback*/[]([[maybe_unused]] AnimGraphInstance* animGraphInstance) {},
/*postCallback*/[]([[maybe_unused]] AnimGraphInstance* animGraphInstance) {},
/*preUpdateCallback*/[](AnimGraphInstance*, float, float, int) {},
/*postUpdateCallback*/[this, &prevGotInterrupted, &prevBlendWeight](AnimGraphInstance* animGraphInstance, [[maybe_unused]] float time, [[maybe_unused]] float timeDelta, [[maybe_unused]] int frame)
{
const AnimGraphStateMachine_InterruptionPropertiesTestData param = GetParam();
const AnimGraphStateTransition::EInterruptionMode interruptionMode = m_transitionLeft->GetInterruptionMode();
const float maxInterruptionBlendWeight = m_transitionLeft->GetMaxInterruptionBlendWeight();
const bool gotInterrupted = m_transitionLeft->GotInterrupted(animGraphInstance);
const bool gotInterruptedThisFrame = gotInterrupted && !prevGotInterrupted;