Overhaul of how camera orbit/pivot behavior works (#4345)

* overhaul to how camera orbit/pivot behavior works Signed-off-by: hultonha <hultonha@amazon.co.uk> * update naming from orbit to pivot Signed-off-by: hultonha <hultonha@amazon.co.uk> * fix camera unit tests Signed-off-by: hultonha <hultonha@amazon.co.uk> * add additional tests for new camera pivot behavior Signed-off-by: hultonha <hultonha@amazon.co.uk> * fix comment and add additional info for tests Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-09-29 10:11:49 +01:00
parent f765dc0942
commit c34b6ffe3b
11 changed files with 410 additions and 334 deletions
@@ -13,6 +13,7 @@
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/Render/IntersectorInterface.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
 #include <EditorViewportSettings.h>

 namespace SandboxEditor
@@ -94,7 +95,7 @@ namespace SandboxEditor
                cameras.AddCamera(m_firstPersonPanCamera);
                cameras.AddCamera(m_firstPersonTranslateCamera);
                cameras.AddCamera(m_firstPersonScrollCamera);
-                cameras.AddCamera(m_orbitCamera);
+                cameras.AddCamera(m_pivotCamera);
            });

        return controller;
@@ -131,8 +132,8 @@ namespace SandboxEditor
        m_firstPersonRotateCamera->SetActivationBeganFn(hideCursor);
        m_firstPersonRotateCamera->SetActivationEndedFn(showCursor);

-        m_firstPersonPanCamera =
-            AZStd::make_shared<AzFramework::PanCameraInput>(SandboxEditor::CameraFreePanChannelId(), AzFramework::LookPan);
+        m_firstPersonPanCamera = AZStd::make_shared<AzFramework::PanCameraInput>(
+            SandboxEditor::CameraFreePanChannelId(), AzFramework::LookPan, AzFramework::TranslatePivot);

        m_firstPersonPanCamera->m_panSpeedFn = []
        {
@@ -151,8 +152,8 @@ namespace SandboxEditor

        const auto translateCameraInputChannelIds = BuildTranslateCameraInputChannelIds();

-        m_firstPersonTranslateCamera =
-            AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::LookTranslation, translateCameraInputChannelIds);
+        m_firstPersonTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(
+            translateCameraInputChannelIds, AzFramework::LookTranslation, AzFramework::TranslatePivot);

        m_firstPersonTranslateCamera->m_translateSpeedFn = []
        {
@@ -171,10 +172,10 @@ namespace SandboxEditor
            return SandboxEditor::CameraScrollSpeed();
        };

-        m_orbitCamera = AZStd::make_shared<AzFramework::OrbitCameraInput>(SandboxEditor::CameraOrbitChannelId());
+        m_pivotCamera = AZStd::make_shared<AzFramework::PivotCameraInput>(SandboxEditor::CameraPivotChannelId());

-        m_orbitCamera->SetLookAtFn(
-            [viewportId = m_viewportId](const AZ::Vector3& position, const AZ::Vector3& direction) -> AZStd::optional<AZ::Vector3>
+        m_pivotCamera->SetPivotFn(
+            [viewportId = m_viewportId]([[maybe_unused]] const AZ::Vector3& position, [[maybe_unused]] const AZ::Vector3& direction)
            {
                AZStd::optional<AZ::Vector3> lookAtAfterInterpolation;
                AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
@@ -182,109 +183,98 @@ namespace SandboxEditor
                    &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::LookAtAfterInterpolation);

                // initially attempt to use the last set look at point after an interpolation has finished
-                if (lookAtAfterInterpolation.has_value())
+                // note: ignore this if it is the same location as the camera (e.g. after go to position)
+                if (lookAtAfterInterpolation.has_value() && !lookAtAfterInterpolation->IsClose(position))
                {
                    return *lookAtAfterInterpolation;
                }

-                const float RayDistance = 1000.0f;
-                AzFramework::RenderGeometry::RayRequest ray;
-                ray.m_startWorldPosition = position;
-                ray.m_endWorldPosition = position + direction * RayDistance;
-                ray.m_onlyVisible = true;
+                // otherwise fall back to the selected entity pivot
+                AZStd::optional<AZ::Transform> entityPivot;
+                AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+                    entityPivot, AzToolsFramework::GetEntityContextId(),
+                    &AzToolsFramework::EditorTransformComponentSelectionRequestBus::Events::GetManipulatorTransform);

-                AzFramework::RenderGeometry::RayResult renderGeometryIntersectionResult;
-                AzFramework::RenderGeometry::IntersectorBus::EventResult(
-                    renderGeometryIntersectionResult, AzToolsFramework::GetEntityContextId(),
-                    &AzFramework::RenderGeometry::IntersectorBus::Events::RayIntersect, ray);
-
-                // attempt a ray intersection with any visible mesh and return the intersection position if successful
-                if (renderGeometryIntersectionResult)
-                {
-                    return renderGeometryIntersectionResult.m_worldPosition;
-                }
-
-                // if there is no selection or no intersection, fallback to default camera orbit behavior (ground plane
-                // intersection)
-                return {};
+                // finally just use the identity
+                return entityPivot.value_or(AZ::Transform::CreateIdentity()).GetTranslation();
            });

-        m_orbitRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(SandboxEditor::CameraOrbitLookChannelId());
+        m_pivotRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(SandboxEditor::CameraPivotLookChannelId());

-        m_orbitRotateCamera->m_rotateSpeedFn = []
+        m_pivotRotateCamera->m_rotateSpeedFn = []
        {
            return SandboxEditor::CameraRotateSpeed();
        };

-        m_orbitRotateCamera->m_invertYawFn = []
+        m_pivotRotateCamera->m_invertYawFn = []
        {
-            return SandboxEditor::CameraOrbitYawRotationInverted();
+            return SandboxEditor::CameraPivotYawRotationInverted();
        };

-        m_orbitTranslateCamera =
-            AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::OrbitTranslation, translateCameraInputChannelIds);
+        m_pivotTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(
+            translateCameraInputChannelIds, AzFramework::LookTranslation, AzFramework::TranslateOffset);

-        m_orbitTranslateCamera->m_translateSpeedFn = []
+        m_pivotTranslateCamera->m_translateSpeedFn = []
        {
            return SandboxEditor::CameraTranslateSpeed();
        };

-        m_orbitTranslateCamera->m_boostMultiplierFn = []
+        m_pivotTranslateCamera->m_boostMultiplierFn = []
        {
            return SandboxEditor::CameraBoostMultiplier();
        };

-        m_orbitDollyScrollCamera = AZStd::make_shared<AzFramework::OrbitDollyScrollCameraInput>();
+        m_pivotDollyScrollCamera = AZStd::make_shared<AzFramework::PivotDollyScrollCameraInput>();

-        m_orbitDollyScrollCamera->m_scrollSpeedFn = []
+        m_pivotDollyScrollCamera->m_scrollSpeedFn = []
        {
            return SandboxEditor::CameraScrollSpeed();
        };

-        m_orbitDollyMoveCamera =
-            AZStd::make_shared<AzFramework::OrbitDollyCursorMoveCameraInput>(SandboxEditor::CameraOrbitDollyChannelId());
+        m_pivotDollyMoveCamera = AZStd::make_shared<AzFramework::PivotDollyMotionCameraInput>(SandboxEditor::CameraPivotDollyChannelId());

-        m_orbitDollyMoveCamera->m_cursorSpeedFn = []
+        m_pivotDollyMoveCamera->m_motionSpeedFn = []
        {
            return SandboxEditor::CameraDollyMotionSpeed();
        };

-        m_orbitPanCamera = AZStd::make_shared<AzFramework::PanCameraInput>(SandboxEditor::CameraOrbitPanChannelId(), AzFramework::OrbitPan);
+        m_pivotPanCamera = AZStd::make_shared<AzFramework::PanCameraInput>(
+            SandboxEditor::CameraPivotPanChannelId(), AzFramework::LookPan, AzFramework::TranslateOffset);

-        m_orbitPanCamera->m_panSpeedFn = []
+        m_pivotPanCamera->m_panSpeedFn = []
        {
            return SandboxEditor::CameraPanSpeed();
        };

-        m_orbitPanCamera->m_invertPanXFn = []
+        m_pivotPanCamera->m_invertPanXFn = []
        {
            return SandboxEditor::CameraPanInvertedX();
        };

-        m_orbitPanCamera->m_invertPanYFn = []
+        m_pivotPanCamera->m_invertPanYFn = []
        {
            return SandboxEditor::CameraPanInvertedY();
        };

-        m_orbitCamera->m_orbitCameras.AddCamera(m_orbitRotateCamera);
-        m_orbitCamera->m_orbitCameras.AddCamera(m_orbitTranslateCamera);
-        m_orbitCamera->m_orbitCameras.AddCamera(m_orbitDollyScrollCamera);
-        m_orbitCamera->m_orbitCameras.AddCamera(m_orbitDollyMoveCamera);
-        m_orbitCamera->m_orbitCameras.AddCamera(m_orbitPanCamera);
+        m_pivotCamera->m_pivotCameras.AddCamera(m_pivotRotateCamera);
+        m_pivotCamera->m_pivotCameras.AddCamera(m_pivotTranslateCamera);
+        m_pivotCamera->m_pivotCameras.AddCamera(m_pivotDollyScrollCamera);
+        m_pivotCamera->m_pivotCameras.AddCamera(m_pivotDollyMoveCamera);
+        m_pivotCamera->m_pivotCameras.AddCamera(m_pivotPanCamera);
    }

    void EditorModularViewportCameraComposer::OnEditorModularViewportCameraComposerSettingsChanged()
    {
        const auto translateCameraInputChannelIds = BuildTranslateCameraInputChannelIds();
        m_firstPersonTranslateCamera->SetTranslateCameraInputChannelIds(translateCameraInputChannelIds);
-        m_orbitTranslateCamera->SetTranslateCameraInputChannelIds(translateCameraInputChannelIds);
-
        m_firstPersonPanCamera->SetPanInputChannelId(SandboxEditor::CameraFreePanChannelId());
-        m_orbitPanCamera->SetPanInputChannelId(SandboxEditor::CameraOrbitPanChannelId());
        m_firstPersonRotateCamera->SetRotateInputChannelId(SandboxEditor::CameraFreeLookChannelId());
-        m_orbitRotateCamera->SetRotateInputChannelId(SandboxEditor::CameraOrbitLookChannelId());
-        m_orbitCamera->SetOrbitInputChannelId(SandboxEditor::CameraOrbitChannelId());
-        m_orbitDollyMoveCamera->SetDollyInputChannelId(SandboxEditor::CameraOrbitDollyChannelId());
+
+        m_pivotCamera->SetPivotInputChannelId(SandboxEditor::CameraPivotChannelId());
+        m_pivotTranslateCamera->SetTranslateCameraInputChannelIds(translateCameraInputChannelIds);
+        m_pivotPanCamera->SetPanInputChannelId(SandboxEditor::CameraPivotPanChannelId());
+        m_pivotRotateCamera->SetRotateInputChannelId(SandboxEditor::CameraPivotLookChannelId());
+        m_pivotDollyMoveCamera->SetDollyInputChannelId(SandboxEditor::CameraPivotDollyChannelId());
    }

    void EditorModularViewportCameraComposer::OnViewportViewEntityChanged(const AZ::EntityId& viewEntityId)
@@ -295,8 +285,7 @@ namespace SandboxEditor
            AZ::TransformBus::EventResult(worldFromLocal, viewEntityId, &AZ::TransformBus::Events::GetWorldTM);

            AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
-                m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame,
-                worldFromLocal);
+                m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, worldFromLocal);
        }
        else
        {
@@ -42,12 +42,12 @@ namespace SandboxEditor
        AZStd::shared_ptr<AzFramework::PanCameraInput> m_firstPersonPanCamera;
        AZStd::shared_ptr<AzFramework::TranslateCameraInput> m_firstPersonTranslateCamera;
        AZStd::shared_ptr<AzFramework::ScrollTranslationCameraInput> m_firstPersonScrollCamera;
-        AZStd::shared_ptr<AzFramework::OrbitCameraInput> m_orbitCamera;
-        AZStd::shared_ptr<AzFramework::RotateCameraInput> m_orbitRotateCamera;
-        AZStd::shared_ptr<AzFramework::TranslateCameraInput> m_orbitTranslateCamera;
-        AZStd::shared_ptr<AzFramework::OrbitDollyScrollCameraInput> m_orbitDollyScrollCamera;
-        AZStd::shared_ptr<AzFramework::OrbitDollyCursorMoveCameraInput> m_orbitDollyMoveCamera;
-        AZStd::shared_ptr<AzFramework::PanCameraInput> m_orbitPanCamera;
+        AZStd::shared_ptr<AzFramework::PivotCameraInput> m_pivotCamera;
+        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::PivotDollyMotionCameraInput> m_pivotDollyMoveCamera;
+        AZStd::shared_ptr<AzFramework::PanCameraInput> m_pivotPanCamera;

        AzFramework::ViewportId m_viewportId;
    };
@@ -61,7 +61,7 @@ static AZStd::vector<AZStd::string> GetEditorInputNames()
 void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serialize)
 {
    serialize.Class<CameraMovementSettings>()
-        ->Version(2)
+        ->Version(3)
        ->Field("TranslateSpeed", &CameraMovementSettings::m_translateSpeed)
        ->Field("RotateSpeed", &CameraMovementSettings::m_rotateSpeed)
        ->Field("BoostMultiplier", &CameraMovementSettings::m_boostMultiplier)
@@ -73,12 +73,12 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
        ->Field("TranslateSmoothing", &CameraMovementSettings::m_translateSmoothing)
        ->Field("TranslateSmoothness", &CameraMovementSettings::m_translateSmoothness)
        ->Field("CaptureCursorLook", &CameraMovementSettings::m_captureCursorLook)
-        ->Field("OrbitYawRotationInverted", &CameraMovementSettings::m_orbitYawRotationInverted)
+        ->Field("PivotYawRotationInverted", &CameraMovementSettings::m_pivotYawRotationInverted)
        ->Field("PanInvertedX", &CameraMovementSettings::m_panInvertedX)
        ->Field("PanInvertedY", &CameraMovementSettings::m_panInvertedY);

    serialize.Class<CameraInputSettings>()
-        ->Version(1)
+        ->Version(2)
        ->Field("TranslateForward", &CameraInputSettings::m_translateForwardChannelId)
        ->Field("TranslateBackward", &CameraInputSettings::m_translateBackwardChannelId)
        ->Field("TranslateLeft", &CameraInputSettings::m_translateLeftChannelId)
@@ -86,12 +86,12 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
        ->Field("TranslateUp", &CameraInputSettings::m_translateUpChannelId)
        ->Field("TranslateDown", &CameraInputSettings::m_translateDownChannelId)
        ->Field("Boost", &CameraInputSettings::m_boostChannelId)
-        ->Field("Orbit", &CameraInputSettings::m_orbitChannelId)
+        ->Field("Pivot", &CameraInputSettings::m_pivotChannelId)
        ->Field("FreeLook", &CameraInputSettings::m_freeLookChannelId)
        ->Field("FreePan", &CameraInputSettings::m_freePanChannelId)
-        ->Field("OrbitLook", &CameraInputSettings::m_orbitLookChannelId)
-        ->Field("OrbitDolly", &CameraInputSettings::m_orbitDollyChannelId)
-        ->Field("OrbitPan", &CameraInputSettings::m_orbitPanChannelId);
+        ->Field("PivotLook", &CameraInputSettings::m_pivotLookChannelId)
+        ->Field("PivotDolly", &CameraInputSettings::m_pivotDollyChannelId)
+        ->Field("PivotPan", &CameraInputSettings::m_pivotPanChannelId);

    serialize.Class<CEditorPreferencesPage_ViewportCamera>()
        ->Version(1)
@@ -143,8 +143,8 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->Attribute(AZ::Edit::Attributes::Visibility, &CameraMovementSettings::TranslateSmoothingVisibility)
            ->DataElement(
-                AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_orbitYawRotationInverted, "Camera Orbit Yaw Inverted",
-                "Inverted yaw rotation while orbiting")
+                AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_pivotYawRotationInverted, "Camera Pivot Yaw Inverted",
+                "Inverted yaw rotation while pivoting")
            ->DataElement(
                AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_panInvertedX, "Invert Pan X",
                "Invert direction of pan in local X axis")
@@ -185,8 +185,8 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
                "Key/button to move the camera more quickly")
            ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames)
            ->DataElement(
-                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_orbitChannelId, "Orbit",
-                "Key/button to begin the camera orbit behavior")
+                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_pivotChannelId, "Pivot",
+                "Key/button to begin the camera pivot behavior")
            ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames)
            ->DataElement(
                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_freeLookChannelId, "Free Look",
@@ -196,16 +196,16 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_freePanChannelId, "Free Pan", "Key/button to begin camera free pan")
            ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames)
            ->DataElement(
-                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_orbitLookChannelId, "Orbit Look",
-                "Key/button to begin camera orbit look")
+                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_pivotLookChannelId, "Pivot Look",
+                "Key/button to begin camera pivot look")
            ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames)
            ->DataElement(
-                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_orbitDollyChannelId, "Orbit Dolly",
-                "Key/button to begin camera orbit dolly")
+                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_pivotDollyChannelId, "Pivot Dolly",
+                "Key/button to begin camera pivot dolly")
            ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames)
            ->DataElement(
-                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_orbitPanChannelId, "Orbit Pan",
-                "Key/button to begin camera orbit pan")
+                AZ::Edit::UIHandlers::ComboBox, &CameraInputSettings::m_pivotPanChannelId, "Pivot Pan",
+                "Key/button to begin camera pivot pan")
            ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames);

        editContext->Class<CEditorPreferencesPage_ViewportCamera>("Viewport Preferences", "Viewport Preferences")
@@ -264,7 +264,7 @@ void CEditorPreferencesPage_ViewportCamera::OnApply()
    SandboxEditor::SetCameraTranslateSmoothness(m_cameraMovementSettings.m_translateSmoothness);
    SandboxEditor::SetCameraTranslateSmoothingEnabled(m_cameraMovementSettings.m_translateSmoothing);
    SandboxEditor::SetCameraCaptureCursorForLook(m_cameraMovementSettings.m_captureCursorLook);
-    SandboxEditor::SetCameraOrbitYawRotationInverted(m_cameraMovementSettings.m_orbitYawRotationInverted);
+    SandboxEditor::SetCameraPivotYawRotationInverted(m_cameraMovementSettings.m_pivotYawRotationInverted);
    SandboxEditor::SetCameraPanInvertedX(m_cameraMovementSettings.m_panInvertedX);
    SandboxEditor::SetCameraPanInvertedY(m_cameraMovementSettings.m_panInvertedY);

@@ -275,12 +275,12 @@ void CEditorPreferencesPage_ViewportCamera::OnApply()
    SandboxEditor::SetCameraTranslateUpChannelId(m_cameraInputSettings.m_translateUpChannelId);
    SandboxEditor::SetCameraTranslateDownChannelId(m_cameraInputSettings.m_translateDownChannelId);
    SandboxEditor::SetCameraTranslateBoostChannelId(m_cameraInputSettings.m_boostChannelId);
-    SandboxEditor::SetCameraOrbitChannelId(m_cameraInputSettings.m_orbitChannelId);
+    SandboxEditor::SetCameraPivotChannelId(m_cameraInputSettings.m_pivotChannelId);
    SandboxEditor::SetCameraFreeLookChannelId(m_cameraInputSettings.m_freeLookChannelId);
    SandboxEditor::SetCameraFreePanChannelId(m_cameraInputSettings.m_freePanChannelId);
-    SandboxEditor::SetCameraOrbitLookChannelId(m_cameraInputSettings.m_orbitLookChannelId);
-    SandboxEditor::SetCameraOrbitDollyChannelId(m_cameraInputSettings.m_orbitDollyChannelId);
-    SandboxEditor::SetCameraOrbitPanChannelId(m_cameraInputSettings.m_orbitPanChannelId);
+    SandboxEditor::SetCameraPivotLookChannelId(m_cameraInputSettings.m_pivotLookChannelId);
+    SandboxEditor::SetCameraPivotDollyChannelId(m_cameraInputSettings.m_pivotDollyChannelId);
+    SandboxEditor::SetCameraPivotPanChannelId(m_cameraInputSettings.m_pivotPanChannelId);

    SandboxEditor::EditorModularViewportCameraComposerNotificationBus::Broadcast(
        &SandboxEditor::EditorModularViewportCameraComposerNotificationBus::Events::OnEditorModularViewportCameraComposerSettingsChanged);
@@ -299,7 +299,7 @@ void CEditorPreferencesPage_ViewportCamera::InitializeSettings()
    m_cameraMovementSettings.m_translateSmoothness = SandboxEditor::CameraTranslateSmoothness();
    m_cameraMovementSettings.m_translateSmoothing = SandboxEditor::CameraTranslateSmoothingEnabled();
    m_cameraMovementSettings.m_captureCursorLook = SandboxEditor::CameraCaptureCursorForLook();
-    m_cameraMovementSettings.m_orbitYawRotationInverted = SandboxEditor::CameraOrbitYawRotationInverted();
+    m_cameraMovementSettings.m_pivotYawRotationInverted = SandboxEditor::CameraPivotYawRotationInverted();
    m_cameraMovementSettings.m_panInvertedX = SandboxEditor::CameraPanInvertedX();
    m_cameraMovementSettings.m_panInvertedY = SandboxEditor::CameraPanInvertedY();

@@ -310,10 +310,10 @@ void CEditorPreferencesPage_ViewportCamera::InitializeSettings()
    m_cameraInputSettings.m_translateUpChannelId = SandboxEditor::CameraTranslateUpChannelId().GetName();
    m_cameraInputSettings.m_translateDownChannelId = SandboxEditor::CameraTranslateDownChannelId().GetName();
    m_cameraInputSettings.m_boostChannelId = SandboxEditor::CameraTranslateBoostChannelId().GetName();
-    m_cameraInputSettings.m_orbitChannelId = SandboxEditor::CameraOrbitChannelId().GetName();
+    m_cameraInputSettings.m_pivotChannelId = SandboxEditor::CameraPivotChannelId().GetName();
    m_cameraInputSettings.m_freeLookChannelId = SandboxEditor::CameraFreeLookChannelId().GetName();
    m_cameraInputSettings.m_freePanChannelId = SandboxEditor::CameraFreePanChannelId().GetName();
-    m_cameraInputSettings.m_orbitLookChannelId = SandboxEditor::CameraOrbitLookChannelId().GetName();
-    m_cameraInputSettings.m_orbitDollyChannelId = SandboxEditor::CameraOrbitDollyChannelId().GetName();
-    m_cameraInputSettings.m_orbitPanChannelId = SandboxEditor::CameraOrbitPanChannelId().GetName();
+    m_cameraInputSettings.m_pivotLookChannelId = SandboxEditor::CameraPivotLookChannelId().GetName();
+    m_cameraInputSettings.m_pivotDollyChannelId = SandboxEditor::CameraPivotDollyChannelId().GetName();
+    m_cameraInputSettings.m_pivotPanChannelId = SandboxEditor::CameraPivotPanChannelId().GetName();
 }
@@ -54,7 +54,7 @@ private:
        float m_translateSmoothness;
        bool m_translateSmoothing;
        bool m_captureCursorLook;
-        bool m_orbitYawRotationInverted;
+        bool m_pivotYawRotationInverted;
        bool m_panInvertedX;
        bool m_panInvertedY;

@@ -80,12 +80,12 @@ private:
        AZStd::string m_translateUpChannelId;
        AZStd::string m_translateDownChannelId;
        AZStd::string m_boostChannelId;
-        AZStd::string m_orbitChannelId;
+        AZStd::string m_pivotChannelId;
        AZStd::string m_freeLookChannelId;
        AZStd::string m_freePanChannelId;
-        AZStd::string m_orbitLookChannelId;
-        AZStd::string m_orbitDollyChannelId;
-        AZStd::string m_orbitPanChannelId;
+        AZStd::string m_pivotLookChannelId;
+        AZStd::string m_pivotDollyChannelId;
+        AZStd::string m_pivotPanChannelId;
    };

    CameraMovementSettings m_cameraMovementSettings;
@@ -28,7 +28,7 @@ namespace SandboxEditor
    constexpr AZStd::string_view CameraRotateSpeedSetting = "/Amazon/Preferences/Editor/Camera/RotateSpeed";
    constexpr AZStd::string_view CameraScrollSpeedSetting = "/Amazon/Preferences/Editor/Camera/DollyScrollSpeed";
    constexpr AZStd::string_view CameraDollyMotionSpeedSetting = "/Amazon/Preferences/Editor/Camera/DollyMotionSpeed";
-    constexpr AZStd::string_view CameraOrbitYawRotationInvertedSetting = "/Amazon/Preferences/Editor/Camera/YawRotationInverted";
+    constexpr AZStd::string_view CameraPivotYawRotationInvertedSetting = "/Amazon/Preferences/Editor/Camera/YawRotationInverted";
    constexpr AZStd::string_view CameraPanInvertedXSetting = "/Amazon/Preferences/Editor/Camera/PanInvertedX";
    constexpr AZStd::string_view CameraPanInvertedYSetting = "/Amazon/Preferences/Editor/Camera/PanInvertedY";
    constexpr AZStd::string_view CameraPanSpeedSetting = "/Amazon/Preferences/Editor/Camera/PanSpeed";
@@ -44,12 +44,12 @@ namespace SandboxEditor
    constexpr AZStd::string_view CameraTranslateUpIdSetting = "/Amazon/Preferences/Editor/Camera/CameraTranslateUpId";
    constexpr AZStd::string_view CameraTranslateDownIdSetting = "/Amazon/Preferences/Editor/Camera/CameraTranslateUpDownId";
    constexpr AZStd::string_view CameraTranslateBoostIdSetting = "/Amazon/Preferences/Editor/Camera/TranslateBoostId";
-    constexpr AZStd::string_view CameraOrbitIdSetting = "/Amazon/Preferences/Editor/Camera/OrbitId";
+    constexpr AZStd::string_view CameraPivotIdSetting = "/Amazon/Preferences/Editor/Camera/PivotId";
    constexpr AZStd::string_view CameraFreeLookIdSetting = "/Amazon/Preferences/Editor/Camera/FreeLookId";
    constexpr AZStd::string_view CameraFreePanIdSetting = "/Amazon/Preferences/Editor/Camera/FreePanId";
-    constexpr AZStd::string_view CameraOrbitLookIdSetting = "/Amazon/Preferences/Editor/Camera/OrbitLookId";
-    constexpr AZStd::string_view CameraOrbitDollyIdSetting = "/Amazon/Preferences/Editor/Camera/OrbitDollyId";
-    constexpr AZStd::string_view CameraOrbitPanIdSetting = "/Amazon/Preferences/Editor/Camera/OrbitPanId";
+    constexpr AZStd::string_view CameraPivotLookIdSetting = "/Amazon/Preferences/Editor/Camera/PivotLookId";
+    constexpr AZStd::string_view CameraPivotDollyIdSetting = "/Amazon/Preferences/Editor/Camera/PivotDollyId";
+    constexpr AZStd::string_view CameraPivotPanIdSetting = "/Amazon/Preferences/Editor/Camera/PivotPanId";

    template<typename T>
    void SetRegistry(const AZStd::string_view setting, T&& value)
@@ -239,14 +239,14 @@ namespace SandboxEditor
        SetRegistry(CameraDollyMotionSpeedSetting, speed);
    }

-    bool CameraOrbitYawRotationInverted()
+    bool CameraPivotYawRotationInverted()
    {
-        return GetRegistry(CameraOrbitYawRotationInvertedSetting, false);
+        return GetRegistry(CameraPivotYawRotationInvertedSetting, false);
    }

-    void SetCameraOrbitYawRotationInverted(const bool inverted)
+    void SetCameraPivotYawRotationInverted(const bool inverted)
    {
-        SetRegistry(CameraOrbitYawRotationInvertedSetting, inverted);
+        SetRegistry(CameraPivotYawRotationInvertedSetting, inverted);
    }

    bool CameraPanInvertedX()
@@ -403,14 +403,14 @@ namespace SandboxEditor
        SetRegistry(CameraTranslateBoostIdSetting, cameraTranslateBoostId);
    }

-    AzFramework::InputChannelId CameraOrbitChannelId()
+    AzFramework::InputChannelId CameraPivotChannelId()
    {
-        return AzFramework::InputChannelId(GetRegistry(CameraOrbitIdSetting, AZStd::string("keyboard_key_modifier_alt_l")).c_str());
+        return AzFramework::InputChannelId(GetRegistry(CameraPivotIdSetting, AZStd::string("keyboard_key_modifier_alt_l")).c_str());
    }

-    void SetCameraOrbitChannelId(AZStd::string_view cameraOrbitId)
+    void SetCameraPivotChannelId(AZStd::string_view cameraPivotId)
    {
-        SetRegistry(CameraOrbitIdSetting, cameraOrbitId);
+        SetRegistry(CameraPivotIdSetting, cameraPivotId);
    }

    AzFramework::InputChannelId CameraFreeLookChannelId()
@@ -433,33 +433,33 @@ namespace SandboxEditor
        SetRegistry(CameraFreePanIdSetting, cameraFreePanId);
    }

-    AzFramework::InputChannelId CameraOrbitLookChannelId()
+    AzFramework::InputChannelId CameraPivotLookChannelId()
    {
-        return AzFramework::InputChannelId(GetRegistry(CameraOrbitLookIdSetting, AZStd::string("mouse_button_left")).c_str());
+        return AzFramework::InputChannelId(GetRegistry(CameraPivotLookIdSetting, AZStd::string("mouse_button_left")).c_str());
    }

-    void SetCameraOrbitLookChannelId(AZStd::string_view cameraOrbitLookId)
+    void SetCameraPivotLookChannelId(AZStd::string_view cameraPivotLookId)
    {
-        SetRegistry(CameraOrbitLookIdSetting, cameraOrbitLookId);
+        SetRegistry(CameraPivotLookIdSetting, cameraPivotLookId);
    }

-    AzFramework::InputChannelId CameraOrbitDollyChannelId()
+    AzFramework::InputChannelId CameraPivotDollyChannelId()
    {
-        return AzFramework::InputChannelId(GetRegistry(CameraOrbitDollyIdSetting, AZStd::string("mouse_button_right")).c_str());
+        return AzFramework::InputChannelId(GetRegistry(CameraPivotDollyIdSetting, AZStd::string("mouse_button_right")).c_str());
    }

-    void SetCameraOrbitDollyChannelId(AZStd::string_view cameraOrbitDollyId)
+    void SetCameraPivotDollyChannelId(AZStd::string_view cameraPivotDollyId)
    {
-        SetRegistry(CameraOrbitDollyIdSetting, cameraOrbitDollyId);
+        SetRegistry(CameraPivotDollyIdSetting, cameraPivotDollyId);
    }

-    AzFramework::InputChannelId CameraOrbitPanChannelId()
+    AzFramework::InputChannelId CameraPivotPanChannelId()
    {
-        return AzFramework::InputChannelId(GetRegistry(CameraOrbitPanIdSetting, AZStd::string("mouse_button_middle")).c_str());
+        return AzFramework::InputChannelId(GetRegistry(CameraPivotPanIdSetting, AZStd::string("mouse_button_middle")).c_str());
    }

-    void SetCameraOrbitPanChannelId(AZStd::string_view cameraOrbitPanId)
+    void SetCameraPivotPanChannelId(AZStd::string_view cameraPivotPanId)
    {
-        SetRegistry(CameraOrbitPanIdSetting, cameraOrbitPanId);
+        SetRegistry(CameraPivotPanIdSetting, cameraPivotPanId);
    }
 } // namespace SandboxEditor
@@ -71,8 +71,8 @@ namespace SandboxEditor
    SANDBOX_API float CameraDollyMotionSpeed();
    SANDBOX_API void SetCameraDollyMotionSpeed(float speed);

-    SANDBOX_API bool CameraOrbitYawRotationInverted();
-    SANDBOX_API void SetCameraOrbitYawRotationInverted(bool inverted);
+    SANDBOX_API bool CameraPivotYawRotationInverted();
+    SANDBOX_API void SetCameraPivotYawRotationInverted(bool inverted);

    SANDBOX_API bool CameraPanInvertedX();
    SANDBOX_API void SetCameraPanInvertedX(bool inverted);
@@ -119,8 +119,8 @@ namespace SandboxEditor
    SANDBOX_API AzFramework::InputChannelId CameraTranslateBoostChannelId();
    SANDBOX_API void SetCameraTranslateBoostChannelId(AZStd::string_view cameraTranslateBoostId);

-    SANDBOX_API AzFramework::InputChannelId CameraOrbitChannelId();
-    SANDBOX_API void SetCameraOrbitChannelId(AZStd::string_view cameraOrbitId);
+    SANDBOX_API AzFramework::InputChannelId CameraPivotChannelId();
+    SANDBOX_API void SetCameraPivotChannelId(AZStd::string_view cameraPivotId);

    SANDBOX_API AzFramework::InputChannelId CameraFreeLookChannelId();
    SANDBOX_API void SetCameraFreeLookChannelId(AZStd::string_view cameraFreeLookId);
@@ -128,12 +128,12 @@ namespace SandboxEditor
    SANDBOX_API AzFramework::InputChannelId CameraFreePanChannelId();
    SANDBOX_API void SetCameraFreePanChannelId(AZStd::string_view cameraFreePanId);

-    SANDBOX_API AzFramework::InputChannelId CameraOrbitLookChannelId();
-    SANDBOX_API void SetCameraOrbitLookChannelId(AZStd::string_view cameraOrbitLookId);
+    SANDBOX_API AzFramework::InputChannelId CameraPivotLookChannelId();
+    SANDBOX_API void SetCameraPivotLookChannelId(AZStd::string_view cameraPivotLookId);

-    SANDBOX_API AzFramework::InputChannelId CameraOrbitDollyChannelId();
-    SANDBOX_API void SetCameraOrbitDollyChannelId(AZStd::string_view cameraOrbitDollyId);
+    SANDBOX_API AzFramework::InputChannelId CameraPivotDollyChannelId();
+    SANDBOX_API void SetCameraPivotDollyChannelId(AZStd::string_view cameraPivotDollyId);

-    SANDBOX_API AzFramework::InputChannelId CameraOrbitPanChannelId();
-    SANDBOX_API void SetCameraOrbitPanChannelId(AZStd::string_view cameraOrbitPanId);
+    SANDBOX_API AzFramework::InputChannelId CameraPivotPanChannelId();
+    SANDBOX_API void SetCameraPivotPanChannelId(AZStd::string_view cameraPivotPanId);
 } // namespace SandboxEditor