more updates to camera code

Code/Sandbox/Editor/EditorViewportWidget.cpp

@@ -1633,8 +1633,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())
     {
@@ -2428,7 +2428,10 @@ void EditorViewportWidget::SetDefaultCamera()
         return;
     }
     ResetToViewSourceType(ViewSourceType::None);
-    gEnv->p3DEngine->GetPostEffectBaseGroup()->SetParam("Dof_Active", 0.0f);
+    if (gEnv->p3DEngine)
+    {
+        gEnv->p3DEngine->GetPostEffectBaseGroup()->SetParam("Dof_Active", 0.0f);
+    }
     GetViewManager()->SetCameraObjectId(m_cameraObjectId);
     SetName(m_defaultViewName);
     SetViewTM(m_defaultViewTM);

Code/Sandbox/Editor/ModernViewportCameraController.cpp

@@ -14,9 +14,14 @@
 
 #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/CameraInput.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
 {
@@ -37,8 +42,17 @@ namespace SandboxEditor
         return viewportContext;
     }
 
+    struct ModernViewportCameraControllerInstance::Impl
+    {
+        AzFramework::Camera m_camera;
+        AzFramework::Camera m_targetCamera;
+        AzFramework::SmoothProps m_smoothProps;
+        AzFramework::CameraSystem m_cameraSystem;
+    };
+
     ModernViewportCameraControllerInstance::ModernViewportCameraControllerInstance(const AzFramework::ViewportId viewportId)
         : MultiViewportControllerInstanceInterface(viewportId)
+        , m_impl(AZStd::make_unique<Impl>())
     {
         // LYN-2315 TODO - move setup out of constructor, pass cameras in
         auto firstPersonRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(AzFramework::InputDeviceMouse::Button::Right);
@@ -58,21 +72,28 @@ namespace SandboxEditor
         orbitCamera->m_orbitCameras.AddCamera(orbitDollyMoveCamera);
         orbitCamera->m_orbitCameras.AddCamera(orbitPanCamera);
 
-        m_cameraSystem.m_cameras.AddCamera(firstPersonRotateCamera);
-        m_cameraSystem.m_cameras.AddCamera(firstPersonPanCamera);
-        m_cameraSystem.m_cameras.AddCamera(firstPersonTranslateCamera);
-        m_cameraSystem.m_cameras.AddCamera(firstPersonWheelCamera);
-        m_cameraSystem.m_cameras.AddCamera(orbitCamera);
+        m_impl->m_cameraSystem.m_cameras.AddCamera(firstPersonRotateCamera);
+        m_impl->m_cameraSystem.m_cameras.AddCamera(firstPersonPanCamera);
+        m_impl->m_cameraSystem.m_cameras.AddCamera(firstPersonTranslateCamera);
+        m_impl->m_cameraSystem.m_cameras.AddCamera(firstPersonWheelCamera);
+        m_impl->m_cameraSystem.m_cameras.AddCamera(orbitCamera);
 
         if (const auto viewportContext = RetrieveViewportContext(viewportId))
         {
             // set position but not orientation
-            m_targetCamera.m_lookAt = viewportContext->GetCameraTransform().GetTranslation();
+            m_impl->m_targetCamera.m_lookAt = viewportContext->GetCameraTransform().GetTranslation();
 
             // LYN-2315 TODO https://www.geometrictools.com/Documentation/EulerAngles.pdf
 
-            m_camera = m_targetCamera;
+            m_impl->m_camera = m_impl->m_targetCamera;
         }
+
+        AzFramework::ViewportDebugDisplayEventBus::Handler::BusConnect(AzToolsFramework::GetEntityContextId());
+    }
+
+    ModernViewportCameraControllerInstance::~ModernViewportCameraControllerInstance()
+    {
+        AzFramework::ViewportDebugDisplayEventBus::Handler::BusDisconnect();
     }
 
     bool ModernViewportCameraControllerInstance::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
@@ -80,18 +101,28 @@ 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_impl->m_cameraSystem.HandleEvents(AzFramework::BuildInputEvent(event.m_inputChannel, windowSize));
     }
 
     void ModernViewportCameraControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
     {
         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_impl->m_targetCamera = m_impl->m_cameraSystem.StepCamera(m_impl->m_targetCamera, event.m_deltaTime.count());
+            m_impl->m_camera =
+                AzFramework::SmoothCamera(m_impl->m_camera, m_impl->m_targetCamera, m_impl->m_smoothProps, event.m_deltaTime.count());
 
-            viewportContext->SetCameraTransform(m_camera.Transform());
+            viewportContext->SetCameraTransform(m_impl->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_impl->m_targetCamera.m_lookAt, 0.5f);
         }
     }
 } // namespace SandboxEditor

Code/Sandbox/Editor/ModernViewportCameraController.h

@@ -12,25 +12,28 @@
 
 #pragma once
 
-#include <AzFramework/Viewport/CameraInput.h>
+#include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Viewport/MultiViewportController.h>
 
 namespace SandboxEditor
 {
-    class ModernViewportCameraControllerInstance final : public AzFramework::MultiViewportControllerInstanceInterface
+    class ModernViewportCameraControllerInstance final : public AzFramework::MultiViewportControllerInstanceInterface,
+                                                         private AzFramework::ViewportDebugDisplayEventBus::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 ...
+        void DisplayViewport(const AzFramework::ViewportInfo& viewportInfo, AzFramework::DebugDisplayRequests& debugDisplay) override;
+
     private:
-        AzFramework::Camera m_camera;
-        AzFramework::Camera m_targetCamera;
-        AzFramework::SmoothProps m_smoothProps;
-        AzFramework::CameraSystem m_cameraSystem;
+        struct Impl;
+        AZStd::unique_ptr<Impl> m_impl;
     };
 
     using ModernViewportCameraController = AzFramework::MultiViewportController<ModernViewportCameraControllerInstance>;