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

Remove TrackView-related camera logic

Browse Source 
TrackView uses 'normal' camera entities now

Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
This commit is contained in:
Yuriy Toporovskyy
2021-08-04 16:48:41 -04:00
parent 83099a7f5b
commit ca96f0055d
2 changed files with 3 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp
+2 -60
View File
@@ -39,7 +39,6 @@ namespace Camera
{
CameraListItem::CameraListItem(const AZ::EntityId& cameraId)
: m_cameraId(cameraId)
, m_sequenceId(AZ::EntityId())
{
if (cameraId.IsValid())
{
@@ -52,44 +51,24 @@ namespace Camera
}
}
// Used for a virtual camera that is really whatever camera is being
// used for a Track View Sequence.
CameraListItem::CameraListItem(const char* cameraName, const AZ::EntityId& sequenceId)
: m_cameraName(cameraName)
, m_sequenceId(sequenceId)
{
Maestro::SequenceComponentNotificationBus::Handler::BusConnect(sequenceId);
}
CameraListItem::~CameraListItem()
{
Maestro::SequenceComponentNotificationBus::Handler::BusDisconnect();
if (m_cameraId.IsValid())
{
AZ::EntityBus::Handler::BusDisconnect(m_cameraId);
}
}
//////////////////////////////////////////////////////////////////////////
/// Maestro::SequenceComponentNotificationBus::Handler
void CameraListItem::OnCameraChanged(const AZ::EntityId& oldCameraEntityId, const AZ::EntityId& newCameraEntityId)
{
AZ_UNUSED(oldCameraEntityId);
m_cameraId = newCameraEntityId;
}
bool CameraListItem::operator<(const CameraListItem& rhs)
{
return m_cameraId < rhs.m_cameraId;
}
CameraListModel::CameraListModel(ViewportCameraSelectorWindow* myParent)
: QAbstractListModel(myParent), m_parent(myParent)
CameraListModel::CameraListModel(QWidget* myParent)
: QAbstractListModel(myParent)
{
m_cameraItems.push_back(AZ::EntityId());
CameraNotificationBus::Handler::BusConnect();
Maestro::EditorSequenceNotificationBus::Handler::BusConnect();
}
CameraListModel::~CameraListModel()
@@ -97,7 +76,6 @@ namespace Camera
// set the view entity id back to Invalid, thus enabling the editor camera
EditorCameraRequests::Bus::Broadcast(&EditorCameraRequests::SetViewFromEntityPerspective, AZ::EntityId());
Maestro::EditorSequenceNotificationBus::Handler::BusDisconnect();
CameraNotificationBus::Handler::BusDisconnect();
}
@@ -154,12 +132,6 @@ namespace Camera
}
}
//////////////////////////////////////////////////////////////////////////
/// Maestro::EditorSequenceNotificationBus::Handler
void CameraListModel::OnSequenceSelected(const AZ::EntityId& )
{
}
QModelIndex CameraListModel::GetIndexForEntityId(const AZ::EntityId entityId)
{
int row = 0;
@@ -203,17 +175,10 @@ namespace Camera
// bus connections
EditorCameraNotificationBus::Handler::BusConnect();
AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
Maestro::EditorSequenceNotificationBus::Handler::BusConnect();
}
ViewportCameraSelectorWindow::~ViewportCameraSelectorWindow()
{
if (Maestro::SequenceComponentNotificationBus::Handler::BusIsConnected())
{
Maestro::SequenceComponentNotificationBus::Handler::BusDisconnect();
}
Maestro::EditorSequenceNotificationBus::Handler::BusDisconnect();
AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
EditorCameraNotificationBus::Handler::BusDisconnect();
}
@@ -257,29 +222,6 @@ namespace Camera
setDisabled(false);
}
//////////////////////////////////////////////////////////////////////////
/// Maestro::EditorSequenceNotificationBus::Handler
void ViewportCameraSelectorWindow::OnSequenceSelected(const AZ::EntityId& sequenceEntityId)
{
// Connect to the Sequence Component Bus when a sequence is selected for OnCameraChanged.
if (Maestro::SequenceComponentNotificationBus::Handler::BusIsConnected())
{
Maestro::SequenceComponentNotificationBus::Handler::BusDisconnect();
}
if (sequenceEntityId.IsValid())
{
Maestro::SequenceComponentNotificationBus::Handler::BusConnect(sequenceEntityId);
}
}
//////////////////////////////////////////////////////////////////////////
/// Maestro::SequenceComponentNotificationBus::Handler
void ViewportCameraSelectorWindow::OnCameraChanged(const AZ::EntityId& oldCameraEntityId, const AZ::EntityId& newCameraEntityId)
{
AZ_UNUSED(oldCameraEntityId);
AZ_UNUSED(newCameraEntityId);
}
// swallow mouse move events so we can disable sloppy selection
void ViewportCameraSelectorWindow::mouseMoveEvent(QMouseEvent*) {}