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

Fix switching cameras rapidly in the Editor accidentally copying camera positions

Browse Source 
Signed-off-by: nvsickle <nvsickle@amazon.com>
This commit is contained in:
nvsickle
2021-06-28 15:43:37 -07:00
parent c7d000e14b
commit 4874a48c18
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/EditorViewportWidget.cpp
+15 -20
View File
@@ -452,8 +452,19 @@ void EditorViewportWidget::Update()
return;
}
m_updatingCameraPosition = true;
if (!ed_useNewCameraSystem)
if (m_updateCameraPositionNextTick)
{
auto cameraState = m_renderViewport->GetCameraState();
AZ::Matrix3x4 matrix;
matrix.SetBasisAndTranslation(cameraState.m_side, cameraState.m_forward, cameraState.m_up, cameraState.m_position);
auto m = AZMatrix3x4ToLYMatrix3x4(matrix);
SetViewTM(m);
SetFOV(cameraState.m_fovOrZoom);
m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
m_updateCameraPositionNextTick = false;
}
else if (!ed_useNewCameraSystem)
{
m_renderViewport->GetViewportContext()->SetCameraTransform(LYTransformToAZTransform(m_Camera.GetMatrix()));
}
@@ -472,8 +483,6 @@ void EditorViewportWidget::Update()
);
m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
}
m_updatingCameraPosition = false;
// Don't wait for changes to update the focused viewport.
if (CheckRespondToInput())
@@ -2894,22 +2903,8 @@ void EditorViewportWidget::UpdateScene()
void EditorViewportWidget::UpdateCameraFromViewportContext()
{
// If we're not updating because the cry camera position changed, we should make sure our position gets copied back to the Cry Camera
if (m_updatingCameraPosition)
{
return;
}
auto cameraState = m_renderViewport->GetCameraState();
AZ::Matrix3x4 matrix;
matrix.SetBasisAndTranslation(cameraState.m_side, cameraState.m_forward, cameraState.m_up, cameraState.m_position);
auto m = AZMatrix3x4ToLYMatrix3x4(matrix);
m_updatingCameraPosition = true;
SetViewTM(m);
SetFOV(cameraState.m_fovOrZoom);
m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
m_updatingCameraPosition = false;
// Queue a sync for the next tick, to ensure the latest version of the viewport context transform is used
m_updateCameraPositionNextTick = true;
}
void EditorViewportWidget::SetAsActiveViewport()
Code/Sandbox/Editor/EditorViewportWidget.h
+1 -1
View File
@@ -579,7 +579,7 @@ private:
AZStd::unique_ptr<AZ::ViewportHelpers::EditorEntityNotifications> m_editorEntityNotifications;
AtomToolsFramework::RenderViewportWidget* m_renderViewport = nullptr;
bool m_updatingCameraPosition = false;
bool m_updateCameraPositionNextTick = false;
AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraProjectionMatrixChangeHandler;
AzFramework::DebugDisplayRequests* m_debugDisplay = nullptr;
Gems/Camera/Code/Source/CameraComponentController.cpp
+1 -1
View File
@@ -101,9 +101,9 @@ namespace Camera
OnTransformChanged(localTransform, worldTransform);
// Push the Atom camera after we make sure we're up-to-date with our component's transform to ensure the viewport reads the correct state
UpdateCamera();
atomViewportRequests->PushView(contextName, m_atomCamera);
AZ::RPI::ViewportContextNotificationBus::Handler::BusConnect(contextName);
UpdateCamera();
}
}