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

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
@@ -13,7 +13,7 @@
#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
#include <Source/EditorFixedJointComponent.h>
#include <Editor/EditorJointComponentMode.h>
#include <Editor/Source/ComponentModes/Joints/JointsComponentMode.h>
#include <Source/FixedJointComponent.h>
namespace PhysX
@@ -70,9 +70,8 @@ namespace PhysX
AzToolsFramework::EditorComponentSelectionNotificationsBus::Handler::BusConnect(entityId);
AzToolsFramework::EditorComponentSelectionRequestsBus::Handler* selection = this;
m_componentModeDelegate.ConnectWithSingleComponentMode <
EditorFixedJointComponent, EditorFixedJointComponentMode>(
AZ::EntityComponentIdPair(entityId, GetId()), selection);
m_componentModeDelegate.ConnectWithSingleComponentMode<EditorFixedJointComponent, JointsComponentMode>(
AZ::EntityComponentIdPair(entityId, GetId()), selection);
PhysX::EditorJointRequestBus::Handler::BusConnect(AZ::EntityComponentIdPair(entityId, GetId()));
}
@@ -91,4 +90,9 @@ namespace PhysX
m_config.m_followerEntity = GetEntityId(); // joint is always in the same entity as the follower body.
gameEntity->CreateComponent<FixedJointComponent>(m_config.ToGameTimeConfig(), m_config.ToGenericProperties());
}
AZStd::vector<JointsComponentModeCommon::SubModeParamaterState> EditorFixedJointComponent::GetSubComponentModesState()
{
return EditorJointComponent::GetSubComponentModesState();
}
}