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

Merge pull request #1959 from aws-lumberyard-dev/cgalvan/SupportVectorMinAttributes

Browse Source 
Fixed EMFX nodes min/max attributes.
This commit is contained in:
Chris Galvan
2021-07-08 12:26:42 -05:00
committed by GitHub
parent c132b00f6e cb069d68f0
commit 5bba645521
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeLookAtNode.cpp
+4 -4
View File
@@ -433,12 +433,12 @@ namespace EMotionFX
->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeLookAtNode::m_limitMin, "Yaw/pitch min", "The minimum rotational yaw and pitch angle limits, in degrees.")
->Attribute(AZ::Edit::Attributes::Visibility, &BlendTreeLookAtNode::GetLimitWidgetsVisibility)
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector2(-90.0f, -90.0f))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector2(90.0f, 90.0f))
->Attribute(AZ::Edit::Attributes::Min, -90.0f)
->Attribute(AZ::Edit::Attributes::Max, 90.0f)
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeLookAtNode::m_limitMax, "Yaw/pitch max", "The maximum rotational yaw and pitch angle limits, in degrees.")
->Attribute(AZ::Edit::Attributes::Visibility, &BlendTreeLookAtNode::GetLimitWidgetsVisibility)
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector2(-90.0f, -90.0f))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector2(90.0f, 90.0f))
->Attribute(AZ::Edit::Attributes::Min, -90.0f)
->Attribute(AZ::Edit::Attributes::Max, 90.0f)
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeLookAtNode::m_constraintRotation, "Constraint rotation", "A rotation that rotates the constraint space.")
->Attribute(AZ::Edit::Attributes::Visibility, &BlendTreeLookAtNode::GetLimitWidgetsVisibility)
->DataElement(AZ::Edit::UIHandlers::ComboBox, &BlendTreeLookAtNode::m_twistAxis, "Roll axis", "The axis used for twist/roll.")
Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeTransformNode.cpp
+4 -12
View File
@@ -261,23 +261,15 @@ namespace EMotionFX
->Attribute(AZ::Edit::Attributes::ChangeNotify, &BlendTreeTransformNode::Reinit)
->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_minTranslation, "Min Translation", "The minimum translation value, used when the input translation amount equals zero.")
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_maxTranslation, "Max Translation", "The maximum translation value, used when the input translation amount equals one.")
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_minRotation, "Min Rotation", "The minimum rotation value, in degrees, used when the input rotation amount equals zero.")
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-360.0f, -360.0f, -360.0f))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(360.0f, 360.0f, 360.0f))
->Attribute(AZ::Edit::Attributes::Min, -360.0f)
->Attribute(AZ::Edit::Attributes::Max, 360.0f)
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_maxRotation, "Max Rotation", "The maximum rotation value, in degrees, used when the input rotation amount equals one.")
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-360.0f, -360.0f, -360.0f))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(360.0f, 360.0f, 360.0f))
->Attribute(AZ::Edit::Attributes::Min, -360.0f)
->Attribute(AZ::Edit::Attributes::Max, 360.0f)
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_minScale, "Min Scale", "The minimum scale value, used when the input scale amount equals zero.")
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeTransformNode::m_maxScale, "Max Scale", "The maximum scale value, used when the input scale amount equals one.")
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
;
}
} // namespace EMotionFX
Gems/EMotionFX/Code/EMotionFX/Source/BlendTreeVector3Math2Node.cpp
-2
View File
@@ -254,8 +254,6 @@ namespace EMotionFX
->EnumAttribute(MATHFUNCTION_DIVIDE, "Divide")
->EnumAttribute(MATHFUNCTION_ANGLEDEGREES, "AngleDegrees")
->DataElement(AZ::Edit::UIHandlers::Default, &BlendTreeVector3Math2Node::m_defaultValue, "Default Value", "The default value for x or y when one of them has no incomming connection.")
->Attribute(AZ::Edit::Attributes::Min, AZ::Vector3(-std::numeric_limits<float>::max()))
->Attribute(AZ::Edit::Attributes::Max, AZ::Vector3(std::numeric_limits<float>::max()))
;
}
} // namespace EMotionFX