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

[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.

Browse Source
This commit is contained in:
Chris Galvan
2021-04-29 16:45:39 -05:00
parent 54e06b0f63
commit 217ba1e816
18 changed files with 142 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
+2 -49
View File
@@ -110,7 +110,6 @@ void CComponentEntityObject::AssignEntity(AZ::Entity* entity, bool destroyOld)
if (m_entityId.IsValid())
{
AzToolsFramework::EntitySelectionEvents::Bus::Handler::BusDisconnect();
AZ::TransformNotificationBus::Handler::BusDisconnect();
LmbrCentral::RenderBoundsNotificationBus::Handler::BusDisconnect();
LmbrCentral::MeshComponentNotificationBus::Handler::BusDisconnect();
@@ -157,7 +156,6 @@ void CComponentEntityObject::AssignEntity(AZ::Entity* entity, bool destroyOld)
EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, AddRequiredComponents, *entity);
AzToolsFramework::EntitySelectionEvents::Bus::Handler::BusConnect(m_entityId);
AZ::TransformNotificationBus::Handler::BusConnect(m_entityId);
LmbrCentral::RenderBoundsNotificationBus::Handler::BusConnect(m_entityId);
LmbrCentral::MeshComponentNotificationBus::Handler::BusConnect(m_entityId);
@@ -306,39 +304,6 @@ void CComponentEntityObject::OnEntityNameChanged(const AZStd::string& name)
}
}
void CComponentEntityObject::OnSelected()
{
if (GetIEditor()->IsNewViewportInteractionModelEnabled())
{
return;
}
if (m_selectionReentryGuard)
{
EditorActionScope selectionChange(m_selectionReentryGuard);
// Invoked when selected via tools application, so we notify sandbox.
const bool wasSelected = IsSelected();
GetIEditor()->GetObjectManager()->SelectObject(this);
}
}
void CComponentEntityObject::OnDeselected()
{
if (GetIEditor()->IsNewViewportInteractionModelEnabled())
{
return;
}
if (m_selectionReentryGuard)
{
EditorActionScope selectionChange(m_selectionReentryGuard);
// Invoked when selected via tools application, so we notify sandbox.
GetIEditor()->GetObjectManager()->UnselectObject(this);
}
}
void CComponentEntityObject::AttachChild(CBaseObject* child, bool /*bKeepPos*/)
{
if (child->GetType() == OBJTYPE_AZENTITY)
@@ -997,24 +962,12 @@ bool CComponentEntityObject::IsIsolated() const
bool CComponentEntityObject::IsSelected() const
{
if (GetIEditor()->IsNewViewportInteractionModelEnabled())
{
return AzToolsFramework::IsSelected(m_entityId);
}
// legacy is selected call
return CBaseObject::IsSelected();
return AzToolsFramework::IsSelected(m_entityId);
}
bool CComponentEntityObject::IsSelectable() const
{
if (GetIEditor()->IsNewViewportInteractionModelEnabled())
{
return AzToolsFramework::IsSelectableInViewport(m_entityId);
}
// legacy is selectable call
return CBaseObject::IsSelectable();
return AzToolsFramework::IsSelectableInViewport(m_entityId);
}
void CComponentEntityObject::SetWorldPos(const Vec3& pos, int flags)