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

Merge pull request #1637 from aws-lumberyard-dev/nvsickle/FixRapidCameraSwitch

Browse Source 
Fix switching cameras rapidly in the Editor accidentally copying camera positions
This commit is contained in:
Nicholas Van Sickle
2021-06-29 12:37:04 -07:00
committed by GitHub
parent 149863c527 26c123dd56
commit f570925c0d
4 changed files with 49 additions and 34 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()