From 38efd581738e7a8789734f6122cff1a3e2c93496 Mon Sep 17 00:00:00 2001
From: rhhong <rhhong@amazon.com>
Date: Thu, 7 Oct 2021 14:54:30 -0700
Subject: [PATCH] Fix merging issue with camera input

Signed-off-by: rhhong <rhhong@amazon.com>
---
 .../Code/Tools/EMStudio/AnimViewportWidget.cpp   | 16 ++++++++--------
 .../Code/Tools/EMStudio/AnimViewportWidget.h     |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp
index d3fd719d38..6a6c9df901 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp
@@ -38,17 +38,17 @@ namespace EMStudio
 
     void AnimViewportWidget::SetupCameras()
     {
-        m_pivotRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(EMStudio::ViewportUtil::BuildRotateCameraInputId());
+        m_rotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(EMStudio::ViewportUtil::BuildRotateCameraInputId());
 
         const auto translateCameraInputChannelIds = EMStudio::ViewportUtil::BuildTranslateCameraInputChannelIds();
-        m_pivotTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(
-            translateCameraInputChannelIds, AzFramework::LookTranslation, AzFramework::TranslatePivot);
-        m_pivotTranslateCamera.get()->m_translateSpeedFn = []
+        m_translateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(
+            translateCameraInputChannelIds, AzFramework::LookTranslation, AzFramework::TranslatePivotLook);
+        m_translateCamera.get()->m_translateSpeedFn = []
         {
             return 3.0f;
         };
 
-        m_pivotDollyScrollCamera = AZStd::make_shared<AzFramework::PivotDollyScrollCameraInput>();
+        m_orbitDollyScrollCamera = AZStd::make_shared<AzFramework::OrbitDollyScrollCameraInput>();
     }
 
     void AnimViewportWidget::SetupCameraController()
@@ -94,9 +94,9 @@ namespace EMStudio
         controller->SetCameraListBuilderCallback(
             [this](AzFramework::Cameras& cameras)
             {
-                cameras.AddCamera(m_pivotRotateCamera);
-                cameras.AddCamera(m_pivotTranslateCamera);
-                cameras.AddCamera(m_pivotDollyScrollCamera);
+                cameras.AddCamera(m_rotateCamera);
+                cameras.AddCamera(m_translateCamera);
+                cameras.AddCamera(m_orbitDollyScrollCamera);
             });
         GetControllerList()->Add(controller);
     }
diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h
index 70b4e1e667..7c2e085f84 100644
--- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h
+++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.h
@@ -26,8 +26,8 @@ namespace EMStudio
         void SetupCameraController();
 
         AZStd::unique_ptr<AnimViewportRenderer> m_renderer;
-        AZStd::shared_ptr<AzFramework::RotateCameraInput> m_pivotRotateCamera;
-        AZStd::shared_ptr<AzFramework::TranslateCameraInput> m_pivotTranslateCamera;
-        AZStd::shared_ptr<AzFramework::PivotDollyScrollCameraInput> m_pivotDollyScrollCamera;
+        AZStd::shared_ptr<AzFramework::RotateCameraInput> m_rotateCamera;
+        AZStd::shared_ptr<AzFramework::TranslateCameraInput> m_translateCamera;
+        AZStd::shared_ptr<AzFramework::OrbitDollyScrollCameraInput> m_orbitDollyScrollCamera;
     };
 }