Merge pull request #1243 from aws-lumberyard-dev/cgalvan/FixCreateCameraFromView
[LYN-4390] Implemented EditorCameraRequestBus::GetActiveCameraState on the EditorViewportWidget so that the "Create camera entity from view" action works again.
This commit is contained in:
@@ -2664,6 +2664,18 @@ bool EditorViewportWidget::GetActiveCameraPosition(AZ::Vector3& cameraPos)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& cameraState)
|
||||||
|
{
|
||||||
|
if (m_pPrimaryViewport == this)
|
||||||
|
{
|
||||||
|
cameraState = GetCameraState();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void EditorViewportWidget::OnStartPlayInEditor()
|
void EditorViewportWidget::OnStartPlayInEditor()
|
||||||
{
|
{
|
||||||
if (m_viewEntityId.IsValid())
|
if (m_viewEntityId.IsValid())
|
||||||
|
|||||||
@@ -184,6 +184,7 @@ public:
|
|||||||
void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
|
void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
|
||||||
AZ::EntityId GetCurrentViewEntityId() override { return m_viewEntityId; }
|
AZ::EntityId GetCurrentViewEntityId() override { return m_viewEntityId; }
|
||||||
bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
|
bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
|
||||||
|
bool GetActiveCameraState(AzFramework::CameraState& cameraState) override;
|
||||||
|
|
||||||
// AzToolsFramework::EditorEntityContextNotificationBus (handler moved to cpp to resolve link issues in unity builds)
|
// AzToolsFramework::EditorEntityContextNotificationBus (handler moved to cpp to resolve link issues in unity builds)
|
||||||
virtual void OnStartPlayInEditor();
|
virtual void OnStartPlayInEditor();
|
||||||
|
|||||||
Reference in New Issue
Block a user