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

EMotionFX

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-25 16:29:00 -07:00
committed by Esteban Papp
parent c14c23c9c7
commit bed57208da
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphBindPoseNode.h
+2 -2
View File
@@ -28,12 +28,12 @@ namespace EMotionFX
AZ_CLASS_ALLOCATOR_DECL
//
enum
enum : uint16
{
OUTPUTPORT_RESULT = 0
};
enum
enum : uint16
{
PORTID_OUTPUT_POSE = 0
};
Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.h
+2 -2
View File
@@ -32,7 +32,7 @@ namespace EMotionFX
AZ_RTTI(AnimGraphMotionNode, "{B8B8AAE6-E532-4BF8-898F-3D40AA41BC82}", AnimGraphNode)
AZ_CLASS_ALLOCATOR_DECL
enum
enum : uint16
{
INPUTPORT_PLAYSPEED = 0,
INPUTPORT_INPLACE = 1,
@@ -41,7 +41,7 @@ namespace EMotionFX
OUTPUTPORT_MOTION = 1
};
enum
enum : uint16
{
PORTID_INPUT_PLAYSPEED = 0,
PORTID_INPUT_INPLACE = 1,
Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlend2NodeBase.h
+2 -2
View File
@@ -26,7 +26,7 @@ namespace EMotionFX
using WeightedMaskEntry = AZStd::pair<AZStd::string, float>;
enum
enum : uint16
{
INPUTPORT_POSE_A = 0,
INPUTPORT_POSE_B = 1,
@@ -34,7 +34,7 @@ namespace EMotionFX
OUTPUTPORT_POSE = 0
};
enum
enum : uint16
{
PORTID_INPUT_POSE_A = 0,
PORTID_INPUT_POSE_B = 1,
Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeBlendNNode.h
+2 -2
View File
@@ -49,7 +49,7 @@ namespace EMotionFX
AZ_RTTI(BlendTreeBlendNNode, "{CBFFDE41-008D-45A1-AC2A-E9A25C8CE62A}", AnimGraphNode)
AZ_CLASS_ALLOCATOR_DECL
enum
enum : uint16
{
INPUTPORT_POSE_0 = 0,
INPUTPORT_POSE_1 = 1,
@@ -65,7 +65,7 @@ namespace EMotionFX
OUTPUTPORT_POSE = 0
};
enum
enum : uint16
{
PORTID_INPUT_POSE_0 = 0,
PORTID_INPUT_POSE_1 = 1,
Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeFloatConditionNode.h
+2 -2
View File
@@ -26,7 +26,7 @@ namespace EMotionFX
AZ_CLASS_ALLOCATOR_DECL
//
enum
enum : uint16
{
INPUTPORT_X = 0,
INPUTPORT_Y = 1,
@@ -34,7 +34,7 @@ namespace EMotionFX
OUTPUTPORT_BOOL = 1
};
enum
enum : uint16
{
PORTID_INPUT_X = 0,
PORTID_INPUT_Y = 1,
Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTwoLinkIKNode.h
+2 -2
View File
@@ -27,7 +27,7 @@ namespace EMotionFX
AZ_RTTI(BlendTreeTwoLinkIKNode, "{0C3E8B7F-F810-47A6-B1A9-27BD4E4B5500}", AnimGraphNode)
AZ_CLASS_ALLOCATOR_DECL
enum
enum : uint16
{
INPUTPORT_POSE = 0,
INPUTPORT_GOALPOS = 1,
@@ -37,7 +37,7 @@ namespace EMotionFX
OUTPUTPORT_POSE = 0
};
enum
enum : uint16
{
PORTID_INPUT_POSE = 0,
PORTID_INPUT_GOALPOS = 1,
Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/NodeWindow/NodeGroupInfo.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ namespace EMStudio
const size_t numGroupNodes = nodeGroup->GetNumNodes();
for (size_t j = 0; j < numGroupNodes; ++j)
{
const uint16 nodeIndex = nodeGroup->GetNode(j);
const uint16 nodeIndex = nodeGroup->GetNode(static_cast<uint16>(j));
const EMotionFX::Node* node = actor->GetSkeleton()->GetNode(nodeIndex);
m_nodes.emplace_back(node->GetNameString());
}
Gems/EMotionFX/Code/Tests/AnimGraphDeferredInitTests.cpp
+3 -3
View File
@@ -126,8 +126,8 @@ namespace EMotionFX
blendNNode->SetName(blendNNodeName);
blendTree->AddChildNode(blendNNode);
const int motionNodeCount = 5;
for (AZ::u32 i = 0; i < motionNodeCount; ++i)
const uint16 motionNodeCount = 5;
for (uint16 i = 0; i < motionNodeCount; ++i)
{
AnimGraphMotionNode* motionNode = aznew AnimGraphMotionNode();
motionNode->SetName(AZStd::string::format("Motion %i (%s)", i, blendNNodeName).c_str());
@@ -172,7 +172,7 @@ namespace EMotionFX
finalNode->AddConnection(blendNNode, BlendTreeBlendNNode::PORTID_OUTPUT_POSE, BlendTreeFinalNode::PORTID_INPUT_POSE);
// Creates 5x blend N nodes as input for the blend N node created here. Each of these five blend N nodes have 5x input motions.
for (AZ::u32 i = 0; i < 5; ++i)
for (uint16 i = 0; i < 5; ++i)
{
BlendTreeBlendNNode* inputNode = CreateBlendNNode(testBlendTree, parameterNode, AZStd::string::format("InputBlendNode%i", i).c_str());
blendNNode->AddConnection(inputNode, AnimGraphMotionNode::PORTID_OUTPUT_POSE, i);
Gems/EMotionFX/Code/Tests/BlendTreeBlendNNodeTests.cpp
+3 -3
View File
@@ -51,8 +51,8 @@ namespace EMotionFX
m_blendTree->AddChildNode(finalNode);
finalNode->AddConnection(m_blendNNode, BlendTreeBlendNNode::PORTID_OUTPUT_POSE, BlendTreeFinalNode::PORTID_INPUT_POSE);
const int motionNodeCount = 3;
for (int i = 0; i < motionNodeCount; ++i)
const uint16 motionNodeCount = 3;
for (uint16 i = 0; i < motionNodeCount; ++i)
{
AnimGraphMotionNode* motionNode = aznew AnimGraphMotionNode();
m_blendTree->AddChildNode(motionNode);
@@ -213,7 +213,7 @@ namespace EMotionFX
finalNode->AddConnection(m_blendNNode, BlendTreeBlendNNode::PORTID_OUTPUT_POSE, BlendTreeFinalNode::PORTID_INPUT_POSE);
ASSERT_TRUE(param.m_motionNodeCount <= 10) << "The blend N node only has 10 pose inputs.";
for (AZ::u32 i = 0; i < param.m_motionNodeCount; ++i)
for (uint16 i = 0; i < param.m_motionNodeCount; ++i)
{
AnimGraphMotionNode* motionNode = aznew AnimGraphMotionNode();
m_blendTree->AddChildNode(motionNode);
Gems/EMotionFX/Code/Tests/BlendTreeMaskNodeTests.cpp
+1 -1
View File
@@ -173,7 +173,7 @@ namespace EMotionFX
m_blendTree->AddChildNode(m_basePoseNode);
m_maskNode->AddConnection(m_basePoseNode, BlendTreeTestInputNode::OUTPUTPORT_RESULT, BlendTreeMaskNode::INPUTPORT_BASEPOSE);
for (AZ::u32 i = 0; i < m_numMaskInputNodes; ++i)
for (uint16 i = 0; i < m_numMaskInputNodes; ++i)
{
BlendTreeTestInputNode* inputNode = aznew BlendTreeTestInputNode(static_cast<float>(i));
m_blendTree->AddChildNode(inputNode);
Gems/EMotionFX/Code/Tests/BoolLogicNodeTests.cpp
+2 -2
View File
@@ -53,8 +53,8 @@ namespace EMotionFX
m_blendTree->AddChildNode(finalNode);
finalNode->AddConnection(m_blendNNode, BlendTreeBlendNNode::PORTID_OUTPUT_POSE, BlendTreeFinalNode::PORTID_INPUT_POSE);
const int motionNodeCount = 2;
for (int i = 0; i < motionNodeCount; ++i)
const uint16 motionNodeCount = 2;
for (uint16 i = 0; i < motionNodeCount; ++i)
{
AnimGraphMotionNode* motionNode = aznew AnimGraphMotionNode();
m_blendTree->AddChildNode(motionNode);
Gems/EMotionFX/Code/Tests/Vector2ToVector3CompatibilityTests.cpp
+2 -2
View File
@@ -46,8 +46,8 @@ namespace EMotionFX
m_blendTree->AddChildNode(finalNode);
finalNode->AddUnitializedConnection(m_blendNNode, BlendTreeBlendNNode::PORTID_OUTPUT_POSE, BlendTreeFinalNode::PORTID_INPUT_POSE);
const int motionNodeCount = 3;
for (int i = 0; i < motionNodeCount; ++i)
const uint16 motionNodeCount = 3;
for (uint16 i = 0; i < motionNodeCount; ++i)
{
AnimGraphMotionNode* motionNode = aznew AnimGraphMotionNode();
m_blendTree->AddChildNode(motionNode);