Merge remote-tracking branch 'upstream/main' into nvsickle/ViewportControllerAPI

Code/Sandbox/Editor/ModernViewportCameraController.h

@@ -12,17 +12,22 @@
 
 #pragma once
 
+#include <Atom/RPI.Public/ViewportContext.h>
+#include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Viewport/CameraInput.h>
 #include <AzFramework/Viewport/MultiViewportController.h>
 
 namespace SandboxEditor
 {
     class ModernViewportCameraControllerInstance;
-    class ModernViewportCameraController : public AzFramework::MultiViewportController<ModernViewportCameraControllerInstance>
+    class ModernViewportCameraController 
+        : public AzFramework::MultiViewportController<ModernViewportCameraControllerInstance>
+        , private AzFramework::ViewportDebugDisplayEventBus::Handler
     {
     public:
         AzFramework::Cameras GetCameras() const;
     };
+        ~ModernViewportCameraControllerInstance();
 
     class ModernViewportCameraControllerInstance final : public AzFramework::MultiViewportControllerInstanceInterface<ModernViewportCameraController>
     {
@@ -33,10 +38,25 @@ namespace SandboxEditor
         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;
+
     private:
+        enum class CameraMode
+        {
+            Control,
+            Animation
+        };
+
         AzFramework::Camera m_camera;
         AzFramework::Camera m_targetCamera;
-        AzFramework::SmoothProps m_smoothProps;
         AzFramework::CameraSystem m_cameraSystem;
+
+        AZ::Transform m_transformStart = AZ::Transform::CreateIdentity();
+        AZ::Transform m_transformEnd = AZ::Transform::CreateIdentity();
+        float m_animationT = 0.0f;
+        CameraMode m_cameraMode = CameraMode::Control;
+
+        AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
     };
 } // namespace SandboxEditor