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

update joints to use cluster viewport ui. (#4352)

Browse Source 
also some joints Component mode cleanup.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
This commit is contained in:
amzn-sean
2021-09-30 13:39:22 +01:00
committed by GitHub
parent 9eb9a13d99
commit 43748c37fd
77 changed files with 3006 additions and 3026 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/EditorJointComponent.cpp
+24 -28
View File
@@ -14,7 +14,7 @@
#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
#include <PhysX/Configuration/PhysXConfiguration.h>
#include <Editor/EditorJointComponentMode.h>
#include <Editor/Source/ComponentModes/Joints/JointsComponentModeCommon.h>
#include <Source/EditorColliderComponent.h>
#include <Source/EditorJointComponent.h>
#include <Source/EditorRigidBodyComponent.h>
@@ -134,21 +134,18 @@ namespace PhysX
bool EditorJointComponent::GetBoolValue(const AZStd::string& parameterName)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterComponentMode)
if (parameterName == JointsComponentModeCommon::ParamaterNames::ComponentMode)
{
return m_config.m_inComponentMode;
}
else if (parameterName == PhysX::EditorJointComponentMode::s_parameterSelectOnSnap)
{
return m_config.m_selectLeadOnSnap;
}
AZ_Error("EditorJointComponent::GetBoolValue", false, "bool parameter not recognized: %s", parameterName.c_str());
return false;
}
AZ::EntityId EditorJointComponent::GetEntityIdValue(const AZStd::string& parameterName)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterLeadEntity)
if (parameterName == JointsComponentModeCommon::ParamaterNames::LeadEntity)
{
return m_config.m_leadEntity;
}
@@ -160,11 +157,11 @@ namespace PhysX
float EditorJointComponent::GetLinearValue(const AZStd::string& parameterName)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterMaxForce)
if (parameterName == JointsComponentModeCommon::ParamaterNames::MaxForce)
{
return m_config.m_forceMax;
}
else if (parameterName == PhysX::EditorJointComponentMode::s_parameterMaxTorque)
else if (parameterName == JointsComponentModeCommon::ParamaterNames::MaxTorque)
{
return m_config.m_torqueMax;
}
@@ -181,7 +178,7 @@ namespace PhysX
AZ::Transform EditorJointComponent::GetTransformValue(const AZStd::string& parameterName)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterTransform)
if (parameterName == JointsComponentModeCommon::ParamaterNames::Transform)
{
return AZ::Transform::CreateFromQuaternionAndTranslation(AZ::Quaternion::CreateFromEulerAnglesDegrees(m_config.m_localRotation),
m_config.m_localPosition);
@@ -192,11 +189,11 @@ namespace PhysX
AZ::Vector3 EditorJointComponent::GetVector3Value(const AZStd::string& parameterName)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterPosition)
if (parameterName == JointsComponentModeCommon::ParamaterNames::Position)
{
return m_config.m_localPosition;
}
if (parameterName == PhysX::EditorJointComponentMode::s_parameterRotation)
if (parameterName == JointsComponentModeCommon::ParamaterNames::Rotation)
{
return m_config.m_localRotation;
}
@@ -204,24 +201,27 @@ namespace PhysX
return AZ::Vector3::CreateZero();
}
bool EditorJointComponent::IsParameterUsed(const AZStd::string& parameterName)
AZStd::vector<JointsComponentModeCommon::SubModeParamaterState> EditorJointComponent::GetSubComponentModesState()
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterMaxForce
|| parameterName == PhysX::EditorJointComponentMode::s_parameterMaxTorque
)
AZStd::vector<JointsComponentModeCommon::SubModeParamaterState> subModes;
if (m_config.m_breakable)
{
return m_config.m_breakable;
subModes.emplace_back(JointsComponentModeCommon::SubModeParamaterState{
JointsComponentModeCommon::SubComponentModes::ModeType::MaxForce, JointsComponentModeCommon::ParamaterNames::MaxForce });
subModes.emplace_back(JointsComponentModeCommon::SubModeParamaterState{
JointsComponentModeCommon::SubComponentModes::ModeType::MaxTorque,
JointsComponentModeCommon::ParamaterNames::MaxTorque });
}
return true; // Sub-component mode always enabled unless disabled explicitly.
return subModes;
}
void EditorJointComponent::SetLinearValue(const AZStd::string& parameterName, float value)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterMaxForce)
if (parameterName == JointsComponentModeCommon::ParamaterNames::MaxForce)
{
m_config.m_forceMax = value;
}
else if (parameterName == PhysX::EditorJointComponentMode::s_parameterMaxTorque)
else if (parameterName == JointsComponentModeCommon::ParamaterNames::MaxTorque)
{
m_config.m_torqueMax = value;
}
@@ -235,11 +235,11 @@ namespace PhysX
void EditorJointComponent::SetVector3Value(const AZStd::string& parameterName, const AZ::Vector3& value)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterPosition)
if (parameterName == JointsComponentModeCommon::ParamaterNames::Position)
{
m_config.m_localPosition = value;
}
else if (parameterName == PhysX::EditorJointComponentMode::s_parameterRotation)
else if (parameterName == JointsComponentModeCommon::ParamaterNames::Rotation)
{
m_config.m_localRotation = value;
}
@@ -247,7 +247,7 @@ namespace PhysX
void EditorJointComponent::SetBoolValue(const AZStd::string& parameterName, bool value)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterComponentMode)
if (parameterName == JointsComponentModeCommon::ParamaterNames::ComponentMode)
{
m_config.m_inComponentMode = value;
@@ -255,15 +255,11 @@ namespace PhysX
&AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay
, AzToolsFramework::Refresh_EntireTree);
}
else if (parameterName == PhysX::EditorJointComponentMode::s_parameterSelectOnSnap)
{
m_config.m_selectLeadOnSnap = value;
}
}
void EditorJointComponent::SetEntityIdValue(const AZStd::string& parameterName, AZ::EntityId value)
{
if (parameterName == PhysX::EditorJointComponentMode::s_parameterLeadEntity)
if (parameterName == JointsComponentModeCommon::ParamaterNames::LeadEntity)
{
m_config.SetLeadEntityId(value);
}