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

Gems/EMotionFX

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-10 21:07:26 -07:00
parent 90cad016de
commit a6cdb1e58c
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Tests/AnimGraphDeferredInitTests.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ namespace EMotionFX
m_blendTree->AddChildNode(paramNode);
paramNode->InitAfterLoading(m_animGraph.get());
paramNode->InvalidateUniqueData(m_animGraphInstance);
m_blend2Node->AddConnection(paramNode, paramNode->FindOutputPortByName("weightParam")->m_portId, BlendTreeBlend2Node::PORTID_INPUT_WEIGHT);
m_blend2Node->AddConnection(paramNode, static_cast<uint16>(paramNode->FindOutputPortByName("weightParam")->m_portId), BlendTreeBlend2Node::PORTID_INPUT_WEIGHT);
}
void ConstructGraph()
Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp
+1 -1
View File
@@ -303,7 +303,7 @@ namespace EMotionFX
TEST_F(AnimGraphMotionNodeFixture, InPlaceInputAndNoEffectOutputsCorrectMotionAndPose)
{
m_motionNode->AddConnection(m_paramNode, m_paramNode->FindOutputPortByName("InPlace")->m_portId, AnimGraphMotionNode::INPUTPORT_INPLACE);
m_motionNode->AddConnection(m_paramNode, static_cast<uint16>(m_paramNode->FindOutputPortByName("InPlace")->m_portId), AnimGraphMotionNode::INPUTPORT_INPLACE);
ParamSetValue<MCore::AttributeBool, bool>("InPlace", true);
m_animGraphInstance->FindOrCreateUniqueNodeData(m_motionNode);
Gems/EMotionFX/Code/Tests/BlendTreeFloatMath1NodeTests.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ namespace EMotionFX
void TestInput(const AZStd::string& paramName, std::vector<inputType> xInputs)
{
BlendTreeConnection* connection = m_floatMath1Node->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName(paramName)->m_portId, BlendTreeFloatMath1Node::PORTID_INPUT_X);
aznumeric_cast<uint16>(m_paramNode->FindOutputPortByName(paramName)->m_portId), BlendTreeFloatMath1Node::PORTID_INPUT_X);
for (inputType i : xInputs)
{
Gems/EMotionFX/Code/Tests/BlendTreeTwoLinkIKNodeTests.cpp
+15 -15
View File
@@ -137,9 +137,9 @@ namespace EMotionFX
TEST_P(BlendTreeTwoLinkIKNodeFixture, ReachablePositionsOutputCorrectPose)
{
// Set values for vector3 and twoLinkIKNode weight parameter
m_twoLinkIKNode->AddConnection(m_paramNode, m_paramNode->FindOutputPortByName("WeightParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_WEIGHT);
m_twoLinkIKNode->AddConnection(m_paramNode, aznumeric_cast<uint16>(m_paramNode->FindOutputPortByName("WeightParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_WEIGHT);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
aznumeric_cast<uint16>(m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
GetEMotionFX().Update(1.0f / 60.0f);
const float weight = testing::get<0>(GetParam());
@@ -179,7 +179,7 @@ namespace EMotionFX
TEST_P(BlendTreeTwoLinkIKNodeFixture, ReachableAlignToNodeOutputCorrectPose)
{
m_twoLinkIKNode->AddConnection(m_paramNode, m_paramNode->FindOutputPortByName("WeightParam")->m_portId,
m_twoLinkIKNode->AddConnection(m_paramNode, aznumeric_cast<uint16>(m_paramNode->FindOutputPortByName("WeightParam")->m_portId),
BlendTreeTwoLinkIKNode::INPUTPORT_WEIGHT);
GetEMotionFX().Update(1.0f / 60.0f);
@@ -224,10 +224,10 @@ namespace EMotionFX
TEST_P(BlendTreeTwoLinkIKNodeFixture, UnreachablePositionsOutputCorrectPose)
{
m_twoLinkIKNode->AddConnection(m_paramNode, m_paramNode->FindOutputPortByName("WeightParam")->m_portId,
m_twoLinkIKNode->AddConnection(m_paramNode, aznumeric_cast<uint16>(m_paramNode->FindOutputPortByName("WeightParam")->m_portId),
BlendTreeTwoLinkIKNode::INPUTPORT_WEIGHT);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
static_cast<uint16>(m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
GetEMotionFX().Update(1.0f / 60.0f);
const float weight = testing::get<0>(GetParam());
@@ -272,12 +272,12 @@ namespace EMotionFX
TEST_P(BlendTreeTwoLinkIKNodeFixture, RotatedPositionsOutputCorrectPose)
{
m_twoLinkIKNode->AddConnection(m_paramNode, m_paramNode->FindOutputPortByName("WeightParam")->m_portId,
m_twoLinkIKNode->AddConnection(m_paramNode, static_cast<uint16>(m_paramNode->FindOutputPortByName("WeightParam")->m_portId),
BlendTreeTwoLinkIKNode::INPUTPORT_WEIGHT);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
aznumeric_cast<uint16>(m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("RotationParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_GOALROT);
static_cast<uint16>(m_paramNode->FindOutputPortByName("RotationParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_GOALROT);
m_twoLinkIKNode->SetRotationEnabled(true);
GetEMotionFX().Update(1.0f / 60.0f);
@@ -315,12 +315,12 @@ namespace EMotionFX
TEST_P(BlendTreeTwoLinkIKNodeFixture, BendDirectionOutputCorrectPose)
{
m_twoLinkIKNode->AddConnection(m_paramNode, m_paramNode->FindOutputPortByName("WeightParam")->m_portId,
m_twoLinkIKNode->AddConnection(m_paramNode, static_cast<uint16>(m_paramNode->FindOutputPortByName("WeightParam")->m_portId),
BlendTreeTwoLinkIKNode::INPUTPORT_WEIGHT);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
static_cast<uint16>(m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("BendDirParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_BENDDIR);
static_cast<uint16>(m_paramNode->FindOutputPortByName("BendDirParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_BENDDIR);
m_twoLinkIKNode->SetRelativeBendDir(true);
GetEMotionFX().Update(1.0f / 60.0f);
@@ -382,14 +382,14 @@ namespace EMotionFX
TEST_P(BlendTreeTwoLinkIKNodeFixture, CombinedFunctionsOutputCorrectPose)
{
// Two Link IK Node should not break when using all of its functions at the same time
m_twoLinkIKNode->AddConnection(m_paramNode, m_paramNode->FindOutputPortByName("WeightParam")->m_portId,
m_twoLinkIKNode->AddConnection(m_paramNode, static_cast<uint16>(m_paramNode->FindOutputPortByName("WeightParam")->m_portId),
BlendTreeTwoLinkIKNode::INPUTPORT_WEIGHT);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
static_cast<uint16>(m_paramNode->FindOutputPortByName("GoalPosParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_GOALPOS);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("RotationParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_GOALROT);
static_cast<uint16>(m_paramNode->FindOutputPortByName("RotationParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_GOALROT);
m_twoLinkIKNode->AddConnection(m_paramNode,
m_paramNode->FindOutputPortByName("BendDirParam")->m_portId, BlendTreeTwoLinkIKNode::INPUTPORT_BENDDIR);
static_cast<uint16>(m_paramNode->FindOutputPortByName("BendDirParam")->m_portId), BlendTreeTwoLinkIKNode::INPUTPORT_BENDDIR);
m_twoLinkIKNode->SetRotationEnabled(true);
m_twoLinkIKNode->SetRelativeBendDir(true);
GetEMotionFX().Update(1.0f / 60.0f);