Merge pull request #470 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-2

Updates to new Camera System (part 2 - still in progress)

Code/Sandbox/Editor/CryEditDoc.cpp

@@ -28,6 +28,11 @@
 #include <AzFramework/Archive/IArchive.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/API/AtomActiveInterface.h>
+#include <AzFramework/Viewport/CameraInput.h>
+
+// Atom
+#include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
 
 // AzToolsFramework
 #include <AzToolsFramework/Slice/SliceUtilities.h>
@@ -647,13 +652,21 @@ void CCryEditDoc::SerializeViewSettings(CXmlArchive& xmlAr)
 
             CViewport* pVP = GetIEditor()->GetViewManager()->GetView(i);
 
+            Matrix34 tm = Matrix34::CreateRotationXYZ(va);
+            tm.SetTranslation(vp);
+
             if (pVP)
             {
-                Matrix34 tm = Matrix34::CreateRotationXYZ(va);
-                tm.SetTranslation(vp);
                 pVP->SetViewTM(tm);
             }
 
+            if (auto viewportContext = AZ::Interface<AZ::RPI::ViewportContextRequestsInterface>::Get()->GetDefaultViewportContext())
+            {
+                AzFramework::ModernViewportCameraControllerRequestBus::Event(
+                    viewportContext->GetId(), &AzFramework::ModernViewportCameraControllerRequestBus::Events::SetTargetCameraTransform,
+                    LYTransformToAZTransform(tm));
+            }
+
             // Load grid.
             auto gridName = QString("Grid%1").arg(useOldViewFormat ? "" : QString::number(i));
             XmlNodeRef gridNode = xmlAr.root->newChild(gridName.toUtf8().constData());

Code/Sandbox/Editor/EditorViewportWidget.cpp

@@ -1626,8 +1626,8 @@ void EditorViewportWidget::keyPressEvent(QKeyEvent* event)
         QCoreApplication::sendEvent(GetIEditor()->GetEditorMainWindow(), event);
     }
 
-    // NOTE: we keep track of keypresses and releases explicitly because the OS/Qt will insert a slight delay between sending
-    // keyevents when the key is held down. This is standard, but makes responding to key events for game style input silly
+    // NOTE: we keep track of key presses and releases explicitly because the OS/Qt will insert a slight delay between sending
+    // key events when the key is held down. This is standard, but makes responding to key events for game style input silly
     // because we want the movement to be butter smooth.
     if (!event->isAutoRepeat())
     {

Code/Sandbox/Editor/ModernViewportCameraController.cpp

@@ -14,9 +14,13 @@
 
 #include <Atom/RPI.Public/ViewportContext.h>
 #include <Atom/RPI.Public/ViewportContextBus.h>
+#include <AzCore/Console/IConsole.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzFramework/Viewport/ScreenGeometry.h>
 #include <AzFramework/Windowing/WindowBus.h>
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+
+AZ_CVAR(bool, ed_newCameraSystemDebug, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Enable debug drawing for the new camera system");
 
 namespace SandboxEditor
 {
@@ -73,6 +77,15 @@ namespace SandboxEditor
 
             m_camera = m_targetCamera;
         }
+
+        AzFramework::ViewportDebugDisplayEventBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
+        AzFramework::ModernViewportCameraControllerRequestBus::Handler::BusConnect(viewportId);
+    }
+
+    ModernViewportCameraControllerInstance::~ModernViewportCameraControllerInstance()
+    {
+        AzFramework::ModernViewportCameraControllerRequestBus::Handler::BusDisconnect();
+        AzFramework::ViewportDebugDisplayEventBus::Handler::BusDisconnect();
     }
 
     bool ModernViewportCameraControllerInstance::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
@@ -80,8 +93,7 @@ namespace SandboxEditor
         AzFramework::WindowSize windowSize;
         AzFramework::WindowRequestBus::EventResult(
             windowSize, event.m_windowHandle, &AzFramework::WindowRequestBus::Events::GetClientAreaSize);
-        m_cameraSystem.HandleEvents(AzFramework::BuildInputEvent(event.m_inputChannel, windowSize));
-        return true; // consume event
+        return m_cameraSystem.HandleEvents(AzFramework::BuildInputEvent(event.m_inputChannel, windowSize));
     }
 
     void ModernViewportCameraControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
@@ -89,9 +101,25 @@ namespace SandboxEditor
         if (auto viewportContext = RetrieveViewportContext(GetViewportId()))
         {
             m_targetCamera = m_cameraSystem.StepCamera(m_targetCamera, event.m_deltaTime.count());
-            m_camera = AzFramework::SmoothCamera(m_camera, m_targetCamera, m_smoothProps, event.m_deltaTime.count());
+            m_camera =
+                AzFramework::SmoothCamera(m_camera, m_targetCamera, m_smoothProps, event.m_deltaTime.count());
 
             viewportContext->SetCameraTransform(m_camera.Transform());
         }
     }
+
+    void ModernViewportCameraControllerInstance::DisplayViewport(
+        [[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay)
+    {
+        if (ed_newCameraSystemDebug)
+        {
+            debugDisplay.SetColor(AZ::Colors::White);
+            debugDisplay.DrawWireSphere(m_targetCamera.m_lookAt, 0.5f);
+        }
+    }
+
+    void ModernViewportCameraControllerInstance::SetTargetCameraTransform(const AZ::Transform& transform)
+    {
+        m_targetCamera.m_lookAt = transform.GetTranslation();
+    }
 } // namespace SandboxEditor

Code/Sandbox/Editor/ModernViewportCameraController.h

@@ -12,20 +12,30 @@
 
 #pragma once
 
+#include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Viewport/CameraInput.h>
 #include <AzFramework/Viewport/MultiViewportController.h>
 
 namespace SandboxEditor
 {
-    class ModernViewportCameraControllerInstance final : public AzFramework::MultiViewportControllerInstanceInterface
+    class ModernViewportCameraControllerInstance final : public AzFramework::MultiViewportControllerInstanceInterface,
+                                                         private AzFramework::ViewportDebugDisplayEventBus::Handler,
+                                                         private AzFramework::ModernViewportCameraControllerRequestBus::Handler
     {
     public:
         explicit ModernViewportCameraControllerInstance(AzFramework::ViewportId viewportId);
+        ~ModernViewportCameraControllerInstance();
 
         // MultiViewportControllerInstanceInterface overrides ...
         bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
         void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
 
+        // AzFramework::ViewportDebugDisplayEventBus overrides ...
+        void DisplayViewport(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
+
+        // ModernViewportCameraControllerRequestBus overrides ...
+        void SetTargetCameraTransform(const AZ::Transform& transform) override;
+
     private:
         AzFramework::Camera m_camera;
         AzFramework::Camera m_targetCamera;