Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

2021-09-07 09:35:04 -07:00
parent 4ed7feae5d e20c270580
commit 64ab627f03
1896 changed files with 9868 additions and 19584 deletions
@@ -421,9 +421,6 @@ void CConsoleSCB::RefreshStyle()
        m_colorTable[6] = QColor(0xff, 0xaa, 0x22);     // Warning (Yellow)
    }

-    m_colorTable[0] = textColor;
-    m_colorTable[1] = textColor;
-
    const bool uiAndDark = !GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark;

    QColor bgColor;
@@ -435,8 +432,13 @@ void CConsoleSCB::RefreshStyle()
    else
    {
        bgColor = Qt::white;
+        textColor = Qt::black;
        AzQtComponents::ScrollBar::applyDarkStyle(ui->textEdit);
    }
+
+    m_colorTable[0] = textColor;
+    m_colorTable[1] = textColor;
+
    ui->textEdit->setBackgroundVisible(!uiAndDark);
    ui->textEdit->setStyleSheet(uiAndDark ? QString() : QString("QPlainTextEdit{ background: %1 }").arg(bgColor.name(QColor::HexRgb)));

@@ -27,8 +27,8 @@
 #include "EditorPreferencesPageGeneral.h"
 #include "EditorPreferencesPageFiles.h"
 #include "EditorPreferencesPageViewportGeneral.h"
-#include "EditorPreferencesPageViewportGizmo.h"
-#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportManipulator.h"
+#include "EditorPreferencesPageViewportCamera.h"
 #include "EditorPreferencesPageViewportDebug.h"
 #include "EditorPreferencesPageExperimentalLighting.h"
 #include "EditorPreferencesPageAWS.h"
@@ -65,8 +65,8 @@ EditorPreferencesDialog::EditorPreferencesDialog(QWidget* pParent)
            CEditorPreferencesPage_General::Reflect(*serializeContext);
            CEditorPreferencesPage_Files::Reflect(*serializeContext);
            CEditorPreferencesPage_ViewportGeneral::Reflect(*serializeContext);
-            CEditorPreferencesPage_ViewportGizmo::Reflect(*serializeContext);
-            CEditorPreferencesPage_ViewportMovement::Reflect(*serializeContext);
+            CEditorPreferencesPage_ViewportManipulator::Reflect(*serializeContext);
+            CEditorPreferencesPage_ViewportCamera::Reflect(*serializeContext);
            CEditorPreferencesPage_ViewportDebug::Reflect(*serializeContext);
            CEditorPreferencesPage_ExperimentalLighting::Reflect(*serializeContext);
            CEditorPreferencesPage_AWS::Reflect(*serializeContext);
@@ -8,7 +8,7 @@

 #include "EditorDefs.h"

-#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportCamera.h"

 #include <AzCore/std/sort.h>
 #include <AzFramework/Input/Buses/Requests/InputDeviceRequestBus.h>
@@ -58,7 +58,7 @@ static AZStd::vector<AZStd::string> GetEditorInputNames()
    return inputNames;
 }

-void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& serialize)
+void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serialize)
 {
    serialize.Class<CameraMovementSettings>()
        ->Version(2)
@@ -93,36 +93,37 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri
        ->Field("OrbitDolly", &CameraInputSettings::m_orbitDollyChannelId)
        ->Field("OrbitPan", &CameraInputSettings::m_orbitPanChannelId);

-    serialize.Class<CEditorPreferencesPage_ViewportMovement>()
+    serialize.Class<CEditorPreferencesPage_ViewportCamera>()
        ->Version(1)
-        ->Field("CameraMovementSettings", &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings)
-        ->Field("CameraInputSettings", &CEditorPreferencesPage_ViewportMovement::m_cameraInputSettings);
+        ->Field("CameraMovementSettings", &CEditorPreferencesPage_ViewportCamera::m_cameraMovementSettings)
+        ->Field("CameraInputSettings", &CEditorPreferencesPage_ViewportCamera::m_cameraInputSettings);

    if (AZ::EditContext* editContext = serialize.GetEditContext())
    {
+        const float minValue = 0.0001f;
        editContext->Class<CameraMovementSettings>("Camera Movement Settings", "")
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_translateSpeed, "Camera Movement Speed", "Camera movement speed")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_rotateSpeed, "Camera Rotation Speed", "Camera rotation speed")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_boostMultiplier, "Camera Boost Multiplier",
                "Camera boost multiplier to apply to movement speed")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_scrollSpeed, "Camera Scroll Speed",
                "Camera movement speed while using scroll/wheel input")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_dollySpeed, "Camera Dolly Speed",
                "Camera movement speed while using mouse motion to move in and out")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_panSpeed, "Camera Pan Speed",
                "Camera movement speed while panning using the mouse")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->DataElement(
                AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_rotateSmoothing, "Camera Rotate Smoothing",
                "Is camera rotation smoothing enabled or disabled")
@@ -130,7 +131,7 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_rotateSmoothness, "Camera Rotate Smoothness",
                "Amount of camera smoothing to apply while rotating the camera")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->Attribute(AZ::Edit::Attributes::Min, minValue)
            ->Attribute(AZ::Edit::Attributes::Visibility, &CameraMovementSettings::RotateSmoothingVisibility)
            ->DataElement(
                AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_translateSmoothing, "Camera Translate Smoothing",
@@ -139,7 +140,7 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri
            ->DataElement(
                AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_translateSmoothness, "Camera Translate Smoothness",
                "Amount of camera smoothing to apply while translating the camera")
-            ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+            ->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",
@@ -207,35 +208,50 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri
                "Key/button to begin camera orbit pan")
            ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames);

-        editContext->Class<CEditorPreferencesPage_ViewportMovement>("Viewport Preferences", "Viewport Preferences")
+        editContext->Class<CEditorPreferencesPage_ViewportCamera>("Viewport Preferences", "Viewport Preferences")
            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
            ->DataElement(
-                AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings,
+                AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportCamera::m_cameraMovementSettings,
                "Camera Movement Settings", "Camera Movement Settings")
            ->DataElement(
-                AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportMovement::m_cameraInputSettings, "Camera Input Settings",
+                AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportCamera::m_cameraInputSettings, "Camera Input Settings",
                "Camera Input Settings");
    }
 }

-CEditorPreferencesPage_ViewportMovement::CEditorPreferencesPage_ViewportMovement()
+CEditorPreferencesPage_ViewportCamera::CEditorPreferencesPage_ViewportCamera()
 {
    InitializeSettings();
    m_icon = QIcon(":/res/Camera.svg");
 }

-const char* CEditorPreferencesPage_ViewportMovement::GetTitle()
+const char* CEditorPreferencesPage_ViewportCamera::GetCategory()
+{
+    return "Viewports";
+}
+
+const char* CEditorPreferencesPage_ViewportCamera::GetTitle()
 {
    return "Camera";
 }

-QIcon& CEditorPreferencesPage_ViewportMovement::GetIcon()
+QIcon& CEditorPreferencesPage_ViewportCamera::GetIcon()
 {
    return m_icon;
 }

-void CEditorPreferencesPage_ViewportMovement::OnApply()
+void CEditorPreferencesPage_ViewportCamera::OnCancel()
+{
+    // noop
+}
+
+bool CEditorPreferencesPage_ViewportCamera::OnQueryCancel()
+{
+    return true;
+}
+
+void CEditorPreferencesPage_ViewportCamera::OnApply()
 {
    SandboxEditor::SetCameraTranslateSpeed(m_cameraMovementSettings.m_translateSpeed);
    SandboxEditor::SetCameraRotateSpeed(m_cameraMovementSettings.m_rotateSpeed);
@@ -270,7 +286,7 @@ void CEditorPreferencesPage_ViewportMovement::OnApply()
        &SandboxEditor::EditorModularViewportCameraComposerNotificationBus::Events::OnEditorModularViewportCameraComposerSettingsChanged);
 }

-void CEditorPreferencesPage_ViewportMovement::InitializeSettings()
+void CEditorPreferencesPage_ViewportCamera::InitializeSettings()
 {
    m_cameraMovementSettings.m_translateSpeed = SandboxEditor::CameraTranslateSpeed();
    m_cameraMovementSettings.m_rotateSpeed = SandboxEditor::CameraRotateSpeed();
@@ -19,32 +19,22 @@ inline AZ::Crc32 EditorPropertyVisibility(const bool enabled)
    return enabled ? AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
 }

-class CEditorPreferencesPage_ViewportMovement : public IPreferencesPage
+class CEditorPreferencesPage_ViewportCamera : public IPreferencesPage
 {
 public:
-    AZ_RTTI(CEditorPreferencesPage_ViewportMovement, "{BC593332-7EAF-4171-8A35-1C5DE5B40909}", IPreferencesPage)
+    AZ_RTTI(CEditorPreferencesPage_ViewportCamera, "{BC593332-7EAF-4171-8A35-1C5DE5B40909}", IPreferencesPage)

    static void Reflect(AZ::SerializeContext& serialize);

-    CEditorPreferencesPage_ViewportMovement();
-    virtual ~CEditorPreferencesPage_ViewportMovement() = default;
+    CEditorPreferencesPage_ViewportCamera();
+    virtual ~CEditorPreferencesPage_ViewportCamera() = default;

-    virtual const char* GetCategory() override
-    {
-        return "Viewports";
-    }
-
-    virtual const char* GetTitle();
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override
-    {
-    }
-
-    virtual bool OnQueryCancel() override
-    {
-        return true;
-    }
+    const char* GetCategory() override;
+    const char* GetTitle() override;
+    QIcon& GetIcon() override;
+    void OnApply() override;
+    void OnCancel() override;
+    bool OnQueryCancel() override;

 private:
    void InitializeSettings();
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "EditorPreferencesPageViewportGizmo.h"
-
-// Editor
-#include "Settings.h"
-
-
-void CEditorPreferencesPage_ViewportGizmo::Reflect(AZ::SerializeContext& serialize)
-{
-    serialize.Class<AxisGizmo>()
-        ->Version(1)
-        ->Field("Size", &AxisGizmo::m_size)
-        ->Field("Text", &AxisGizmo::m_text)
-        ->Field("MaxCount", &AxisGizmo::m_maxCount);
-
-    serialize.Class<Helpers>()
-        ->Version(1)
-        ->Field("LabelsOn", &Helpers::m_helpersGlobalScale)
-        ->Field("LabelsOn", &Helpers::m_tagpointScaleMulti)
-        ->Field("LabelsOn", &Helpers::m_rulerSphereScale)
-        ->Field("LabelsDistance", &Helpers::m_rulerSphereTrans);
-
-    serialize.Class<CEditorPreferencesPage_ViewportGizmo>()
-        ->Version(1)
-        ->Field("Axis Gizmo", &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo)
-        ->Field("Helpers", &CEditorPreferencesPage_ViewportGizmo::m_helpers);
-
-    AZ::EditContext* editContext = serialize.GetEditContext();
-    if (editContext)
-    {
-        editContext->Class<AxisGizmo>("Axis Gizmo", "")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_size, "Size", "Axis Gizmo Size")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &AxisGizmo::m_text, "Text Labels", "Text Labels on Axis Gizmo")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_maxCount, "Max Count", "Max Count of Axis Gizmos");
-
-        editContext->Class<Helpers>("Helpers", "")
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_helpersGlobalScale, "Helpers Scale", "Helpers Scale")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_tagpointScaleMulti, "Tagpoint Scale Multiplier", "Tagpoint Scale Multiplier")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereScale, "Ruler Sphere Scale", "Ruler Sphere Scale")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.1f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f)
-                ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
-            ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereTrans, "Ruler Sphere Transparency", "Ruler Sphere Transparency")
-                ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
-                ->Attribute(AZ::Edit::Attributes::Max, 100.0f);
-
-        editContext->Class<CEditorPreferencesPage_ViewportGizmo>("Gizmo Viewport Preferences", "Gizmo Viewport Preferences")
-            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo, "Axis Gizmo", "Axis Gizmo")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_helpers, "Helpers", "Helpers");
-    }
-}
-
-CEditorPreferencesPage_ViewportGizmo::CEditorPreferencesPage_ViewportGizmo()
-{
-    InitializeSettings();
-    m_icon = QIcon(":/res/Gizmos.svg");
-}
-
-QIcon& CEditorPreferencesPage_ViewportGizmo::GetIcon()
-{
-    return m_icon;
-}
-
-void CEditorPreferencesPage_ViewportGizmo::OnApply()
-{
-    gSettings.gizmo.axisGizmoSize = m_axisGizmo.m_size;
-    gSettings.gizmo.axisGizmoText = m_axisGizmo.m_text;
-    gSettings.gizmo.axisGizmoMaxCount = m_axisGizmo.m_maxCount;
-
-    gSettings.gizmo.helpersScale = m_helpers.m_helpersGlobalScale;
-    gSettings.gizmo.tagpointScaleMulti = m_helpers.m_tagpointScaleMulti;
-    gSettings.gizmo.rulerSphereScale = m_helpers.m_rulerSphereScale;
-    gSettings.gizmo.rulerSphereTrans = m_helpers.m_rulerSphereTrans;
-}
-
-void CEditorPreferencesPage_ViewportGizmo::InitializeSettings()
-{
-    m_axisGizmo.m_size = gSettings.gizmo.axisGizmoSize;
-    m_axisGizmo.m_text = gSettings.gizmo.axisGizmoText;
-    m_axisGizmo.m_maxCount = gSettings.gizmo.axisGizmoMaxCount;
-
-    m_helpers.m_helpersGlobalScale = gSettings.gizmo.helpersScale;
-    m_helpers.m_tagpointScaleMulti = gSettings.gizmo.tagpointScaleMulti;
-    m_helpers.m_rulerSphereScale = gSettings.gizmo.rulerSphereScale;
-    m_helpers.m_rulerSphereTrans = gSettings.gizmo.rulerSphereTrans;
-}
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include "Include/IPreferencesPage.h"
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/RTTI/RTTI.h>
-#include <AzCore/Math/Vector3.h>
-#include <QIcon>
-
-
-class CEditorPreferencesPage_ViewportGizmo
-    : public IPreferencesPage
-{
-public:
-    AZ_RTTI(CEditorPreferencesPage_ViewportGizmo, "{14433511-8175-4348-954E-82D903475B06}", IPreferencesPage)
-
-    static void Reflect(AZ::SerializeContext& serialize);
-
-    CEditorPreferencesPage_ViewportGizmo();
-    virtual ~CEditorPreferencesPage_ViewportGizmo() = default;
-
-    virtual const char* GetCategory() override { return "Viewports"; }
-    virtual const char* GetTitle() override { return "Gizmos"; }
-    virtual QIcon& GetIcon() override;
-    virtual void OnApply() override;
-    virtual void OnCancel() override {}
-    virtual bool OnQueryCancel() override { return true; }
-
-private:
-    void InitializeSettings();
-
-    struct AxisGizmo
-    {
-        AZ_TYPE_INFO(AxisGizmo, "{7D90D60E-996B-4F54-8748-B26EFA781EE2}")
-
-        float m_size;
-        bool m_text;
-        int m_maxCount;
-    };
-
-    struct Helpers
-    {
-        AZ_TYPE_INFO(Helpers, "{EC99922E-F61C-4AA0-9A51-630E09AB55AA}")
-
-        float m_helpersGlobalScale;
-        float m_tagpointScaleMulti;
-        float m_rulerSphereScale;
-        float m_rulerSphereTrans;
-    };
-
-    AxisGizmo m_axisGizmo;
-    Helpers m_helpers;
-    QIcon m_icon;
-};
-
-
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include "EditorDefs.h"
+
+#include "EditorPreferencesPageViewportManipulator.h"
+
+// Editor
+#include "EditorViewportSettings.h"
+#include "Settings.h"
+
+void CEditorPreferencesPage_ViewportManipulator::Reflect(AZ::SerializeContext& serialize)
+{
+    serialize.Class<Manipulators>()
+        ->Version(1)
+        ->Field("LineBoundWidth", &Manipulators::m_manipulatorLineBoundWidth)
+        ->Field("CircleBoundWidth", &Manipulators::m_manipulatorCircleBoundWidth);
+
+    serialize.Class<CEditorPreferencesPage_ViewportManipulator>()->Version(2)->Field(
+        "Manipulators", &CEditorPreferencesPage_ViewportManipulator::m_manipulators);
+
+    if (AZ::EditContext* editContext = serialize.GetEditContext())
+    {
+        editContext->Class<Manipulators>("Manipulators", "")
+            ->DataElement(
+                AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_manipulatorLineBoundWidth, "Line Bound Width",
+                "Manipulator Line Bound Width")
+            ->Attribute(AZ::Edit::Attributes::Min, 0.001f)
+            ->Attribute(AZ::Edit::Attributes::Max, 2.0f)
+            ->DataElement(
+                AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_manipulatorCircleBoundWidth, "Circle Bound Width",
+                "Manipulator Circle Bound Width")
+            ->Attribute(AZ::Edit::Attributes::Min, 0.001f)
+            ->Attribute(AZ::Edit::Attributes::Max, 2.0f);
+
+        editContext
+            ->Class<CEditorPreferencesPage_ViewportManipulator>("Manipulator Viewport Preferences", "Manipulator Viewport Preferences")
+            ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->DataElement(
+                AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportManipulator::m_manipulators, "Manipulators", "Manipulators");
+    }
+}
+
+CEditorPreferencesPage_ViewportManipulator::CEditorPreferencesPage_ViewportManipulator()
+{
+    InitializeSettings();
+    m_icon = QIcon(":/res/Gizmos.svg");
+}
+
+const char* CEditorPreferencesPage_ViewportManipulator::GetCategory()
+{
+    return "Viewports";
+}
+
+const char* CEditorPreferencesPage_ViewportManipulator::GetTitle()
+{
+    return "Manipulators";
+}
+
+QIcon& CEditorPreferencesPage_ViewportManipulator::GetIcon()
+{
+    return m_icon;
+}
+
+void CEditorPreferencesPage_ViewportManipulator::OnCancel()
+{
+    // noop
+}
+
+bool CEditorPreferencesPage_ViewportManipulator::OnQueryCancel()
+{
+    return true;
+}
+
+void CEditorPreferencesPage_ViewportManipulator::OnApply()
+{
+    SandboxEditor::SetManipulatorLineBoundWidth(m_manipulators.m_manipulatorLineBoundWidth);
+    SandboxEditor::SetManipulatorCircleBoundWidth(m_manipulators.m_manipulatorCircleBoundWidth);
+}
+
+void CEditorPreferencesPage_ViewportManipulator::InitializeSettings()
+{
+    m_manipulators.m_manipulatorLineBoundWidth = SandboxEditor::ManipulatorLineBoundWidth();
+    m_manipulators.m_manipulatorCircleBoundWidth = SandboxEditor::ManipulatorCircleBoundWidth();
+}
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include "Include/IPreferencesPage.h"
+#include <AzCore/Math/Vector3.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <QIcon>
+
+class CEditorPreferencesPage_ViewportManipulator : public IPreferencesPage
+{
+public:
+    AZ_RTTI(CEditorPreferencesPage_ViewportManipulator, "{14433511-8175-4348-954E-82D903475B06}", IPreferencesPage)
+
+    static void Reflect(AZ::SerializeContext& serialize);
+
+    CEditorPreferencesPage_ViewportManipulator();
+    virtual ~CEditorPreferencesPage_ViewportManipulator() = default;
+
+    const char* GetCategory() override;
+    const char* GetTitle() override;
+    QIcon& GetIcon() override;
+    void OnApply() override;
+    void OnCancel() override;
+    bool OnQueryCancel() override;
+
+private:
+    void InitializeSettings();
+
+    struct Manipulators
+    {
+        AZ_TYPE_INFO(Manipulators, "{2974439C-4839-41F6-B526-F317999B9DB9}")
+
+        float m_manipulatorLineBoundWidth = 0.0f;
+        float m_manipulatorCircleBoundWidth = 0.0f;
+    };
+
+    Manipulators m_manipulators;
+    QIcon m_icon;
+};
@@ -20,6 +20,8 @@ namespace SandboxEditor
    constexpr AZStd::string_view AngleSnappingSetting = "/Amazon/Preferences/Editor/AngleSnapping";
    constexpr AZStd::string_view AngleSizeSetting = "/Amazon/Preferences/Editor/AngleSize";
    constexpr AZStd::string_view ShowGridSetting = "/Amazon/Preferences/Editor/ShowGrid";
+    constexpr AZStd::string_view ManipulatorLineBoundWidthSetting = "/Amazon/Preferences/Editor/Manipulator/LineBoundWidth";
+    constexpr AZStd::string_view ManipulatorCircleBoundWidthSetting = "/Amazon/Preferences/Editor/Manipulator/CircleBoundWidth";
    constexpr AZStd::string_view CameraTranslateSpeedSetting = "/Amazon/Preferences/Editor/Camera/TranslateSpeed";
    constexpr AZStd::string_view CameraBoostMultiplierSetting = "/Amazon/Preferences/Editor/Camera/BoostMultiplier";
    constexpr AZStd::string_view CameraRotateSpeedSetting = "/Amazon/Preferences/Editor/Camera/RotateSpeed";
@@ -156,6 +158,26 @@ namespace SandboxEditor
        SetRegistry(ShowGridSetting, showing);
    }

+    float ManipulatorLineBoundWidth()
+    {
+        return aznumeric_cast<float>(GetRegistry(ManipulatorLineBoundWidthSetting, 0.1));
+    }
+
+    void SetManipulatorLineBoundWidth(const float lineBoundWidth)
+    {
+        SetRegistry(ManipulatorLineBoundWidthSetting, lineBoundWidth);
+    }
+
+    float ManipulatorCircleBoundWidth()
+    {
+        return aznumeric_cast<float>(GetRegistry(ManipulatorCircleBoundWidthSetting, 0.1));
+    }
+
+    void SetManipulatorCircleBoundWidth(const float circleBoundWidth)
+    {
+        SetRegistry(ManipulatorCircleBoundWidthSetting, circleBoundWidth);
+    }
+
    float CameraTranslateSpeed()
    {
        return aznumeric_cast<float>(GetRegistry(CameraTranslateSpeedSetting, 10.0));
@@ -47,6 +47,12 @@ namespace SandboxEditor
    SANDBOX_API bool ShowingGrid();
    SANDBOX_API void SetShowingGrid(bool showing);

+    SANDBOX_API float ManipulatorLineBoundWidth();
+    SANDBOX_API void SetManipulatorLineBoundWidth(float lineBoundWidth);
+
+    SANDBOX_API float ManipulatorCircleBoundWidth();
+    SANDBOX_API void SetManipulatorCircleBoundWidth(float circleBoundWidth);
+
    SANDBOX_API float CameraTranslateSpeed();
    SANDBOX_API void SetCameraTranslateSpeed(float speed);

@@ -113,18 +113,6 @@ void StartFixedCursorMode(QObject *viewport);
 #define RENDER_MESH_TEST_DISTANCE (0.2f)
 #define CURSOR_FONT_HEIGHT  8.0f

-//! Viewport settings for the EditorViewportWidget
-struct EditorViewportSettings : public AzToolsFramework::ViewportInteraction::ViewportSettings
-{
-    bool GridSnappingEnabled() const override;
-    float GridSize() const override;
-    bool ShowGrid() const override;
-    bool AngleSnappingEnabled() const override;
-    float AngleStep() const override;
-};
-
-static const EditorViewportSettings g_EditorViewportSettings;
-
 namespace AZ::ViewportHelpers
 {
    static const char TextCantCreateCameraNoLevel[] = "Cannot create camera when no level is loaded.";
@@ -218,6 +206,7 @@ EditorViewportWidget::~EditorViewportWidget()
        m_pPrimaryViewport = nullptr;
    }

+    m_editorViewportSettings.Disconnect();
    DisconnectViewportInteractionRequestBus();
    m_editorEntityNotifications.reset();
    Camera::EditorCameraRequestBus::Handler::BusDisconnect();
@@ -1073,7 +1062,7 @@ void EditorViewportWidget::SetViewportId(int id)
    m_editorModularViewportCameraComposer = AZStd::make_unique<SandboxEditor::EditorModularViewportCameraComposer>(AzFramework::ViewportId(id));
    m_renderViewport->GetControllerList()->Add(m_editorModularViewportCameraComposer->CreateModularViewportCameraController());

-    m_renderViewport->SetViewportSettings(&g_EditorViewportSettings);
+    m_editorViewportSettings.Connect(AzFramework::ViewportId(id));

    UpdateScene();

@@ -2534,6 +2523,16 @@ void EditorViewportWidget::SetAsActiveViewport()
    }
 }

+void EditorViewportSettings::Connect(const AzFramework::ViewportId viewportId)
+{
+    AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusConnect(viewportId);
+}
+
+void EditorViewportSettings::Disconnect()
+{
+    AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusDisconnect();
+}
+
 bool EditorViewportSettings::GridSnappingEnabled() const
 {
    return SandboxEditor::GridSnappingEnabled();
@@ -2559,6 +2558,16 @@ float EditorViewportSettings::AngleStep() const
    return SandboxEditor::AngleSnappingSize();
 }

+float EditorViewportSettings::ManipulatorLineBoundWidth() const
+{
+    return SandboxEditor::ManipulatorLineBoundWidth();
+}
+
+float EditorViewportSettings::ManipulatorCircleBoundWidth() const
+{
+    return SandboxEditor::ManipulatorCircleBoundWidth();
+}
+
 AZ_CVAR_EXTERNED(bool, ed_previewGameInFullscreen_once);

 bool EditorViewportWidget::ShouldPreviewFullscreen() const
@@ -63,6 +63,22 @@ namespace AzToolsFramework
    class ManipulatorManager;
 }

+//! Viewport settings for the EditorViewportWidget
+struct EditorViewportSettings : public AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler
+{
+    void Connect(AzFramework::ViewportId viewportId);
+    void Disconnect();
+
+    // ViewportSettingsRequestBus overrides ...
+    bool GridSnappingEnabled() const override;
+    float GridSize() const override;
+    bool ShowGrid() const override;
+    bool AngleSnappingEnabled() const override;
+    float AngleStep() const override;
+    float ManipulatorLineBoundWidth() const override;
+    float ManipulatorCircleBoundWidth() const override;
+};
+
 // EditorViewportWidget window
 AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
 AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
@@ -338,7 +354,7 @@ private:
    // Note that any attempts to draw anything with this object will crash. Exists here for legacy "reasons"
    DisplayContext m_displayContext;

-    // Re-entrency guard for on paint events
+    // Reentrancy guard for on paint events
    bool m_isOnPaint = false;

    // Shapes of various safe frame helpers which can be displayed in the editor
@@ -381,6 +397,9 @@ private:
    // Atom debug display
    AzFramework::DebugDisplayRequests* m_debugDisplay = nullptr;

+    // Type to return current state of editor viewport settings
+    EditorViewportSettings m_editorViewportSettings;
+
    // The default view created for the viewport context, which is used as the "Editor Camera"
    AZ::RPI::ViewPtr m_defaultView;

@@ -680,8 +680,8 @@ const SGizmoParameters& CEditorImpl::GetGlobalGizmoParameters()

    m_pGizmoParameters->axisConstraint = m_selectedAxis;
    m_pGizmoParameters->referenceCoordSys = m_refCoordsSys;
-    m_pGizmoParameters->axisGizmoScale = gSettings.gizmo.axisGizmoSize;
-    m_pGizmoParameters->axisGizmoText = gSettings.gizmo.axisGizmoText;
+    m_pGizmoParameters->axisGizmoScale = 1.0f;
+    m_pGizmoParameters->axisGizmoText = false;

    return *m_pGizmoParameters;
 }
@@ -2378,7 +2378,7 @@ void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect)

    if (bSelect && !GetIEditor()->GetTransformManipulator())
    {
-        if (CAxisGizmo::GetGlobalAxisGizmoCount() < gSettings.gizmo.axisGizmoMaxCount)
+        if (CAxisGizmo::GetGlobalAxisGizmoCount() < 1 /*legacy axisGizmoMaxCount*/)
        {
            // Create axis gizmo for this object.
            m_gizmoManager->AddGizmo(new CAxisGizmo(pObject));
@@ -17,8 +17,8 @@
 #include "EditorPreferencesPageGeneral.h"
 #include "EditorPreferencesPageFiles.h"
 #include "EditorPreferencesPageViewportGeneral.h"
-#include "EditorPreferencesPageViewportGizmo.h"
-#include "EditorPreferencesPageViewportMovement.h"
+#include "EditorPreferencesPageViewportManipulator.h"
+#include "EditorPreferencesPageViewportCamera.h"
 #include "EditorPreferencesPageViewportDebug.h"
 #include "EditorPreferencesPageExperimentalLighting.h"
 #include "EditorPreferencesPageAWS.h"
@@ -35,8 +35,8 @@ CStdPreferencesClassDesc::CStdPreferencesClassDesc()
        [](){ return new CEditorPreferencesPage_General(); },
        [](){ return new CEditorPreferencesPage_Files(); },
        [](){ return new CEditorPreferencesPage_ViewportGeneral(); },
-        [](){ return new CEditorPreferencesPage_ViewportMovement(); },
-        [](){ return new CEditorPreferencesPage_ViewportGizmo(); },
+        [](){ return new CEditorPreferencesPage_ViewportCamera(); },
+        [](){ return new CEditorPreferencesPage_ViewportManipulator(); },
        [](){ return new CEditorPreferencesPage_ViewportDebug(); }
    };

@@ -82,7 +82,6 @@ private:

 namespace
 {
-
    class QtApplicationListener
        : public AzToolsFramework::EditorEvents::Bus::Handler
    {
@@ -99,20 +98,8 @@ namespace
            delete this;
        }
    };
-
 }

-//////////////////////////////////////////////////////////////////////////
-SGizmoSettings::SGizmoSettings()
-{
-    axisGizmoSize = 0.2f;
-    axisGizmoText = true;
-    axisGizmoMaxCount = 50;
-    helpersScale = 1.f;
-    tagpointScaleMulti = 0.5f;
-    rulerSphereScale = 0.5f;
-    rulerSphereTrans = 0.5f;
-}
 //////////////////////////////////////////////////////////////////////////
 SEditorSettings::SEditorSettings()
 {
@@ -564,18 +551,6 @@ void SEditorSettings::Save()
    SaveValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings);
    SaveValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings);

-    //////////////////////////////////////////////////////////////////////////
-    // Gizmos.
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize);
-    SaveValue("Settings", "AxisGizmoText", gizmo.axisGizmoText);
-    SaveValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount);
-    SaveValue("Settings", "HelpersScale", gizmo.helpersScale);
-    SaveValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti);
-    SaveValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale);
-    SaveValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans);
-    //////////////////////////////////////////////////////////////////////////
-
    SaveValue("Settings", "TextEditorScript", textEditorForScript);
    SaveValue("Settings", "TextEditorShaders", textEditorForShaders);
    SaveValue("Settings", "TextEditorBSpaces", textEditorForBspaces);
@@ -769,18 +744,6 @@ void SEditorSettings::Load()
    LoadValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings);
    LoadValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings);

-    //////////////////////////////////////////////////////////////////////////
-    // Gizmos.
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize);
-    LoadValue("Settings", "AxisGizmoText", gizmo.axisGizmoText);
-    LoadValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount);
-    LoadValue("Settings", "HelpersScale", gizmo.helpersScale);
-    LoadValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti);
-    LoadValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale);
-    LoadValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans);
-    //////////////////////////////////////////////////////////////////////////
-
    LoadValue("Settings", "TextEditorScript", textEditorForScript);
    LoadValue("Settings", "TextEditorShaders", textEditorForShaders);
    LoadValue("Settings", "TextEditorBSpaces", textEditorForBspaces);
@@ -22,22 +22,6 @@

 #include <AzQtComponents/Components/Widgets/ToolBar.h>

-struct SGizmoSettings
-{
-    float axisGizmoSize;
-    bool axisGizmoText;
-    int axisGizmoMaxCount;
-
-    float helpersScale;
-    float tagpointScaleMulti;
-
-    // Scale size and transparency for debug spheres when using Ruler tool
-    float rulerSphereScale;
-    float rulerSphereTrans;
-
-    SGizmoSettings();
-};
-
 //////////////////////////////////////////////////////////////////////////
 // Settings for snapping in the viewports.
 //////////////////////////////////////////////////////////////////////////
@@ -381,8 +365,6 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
    //! Keeps the editor active even if no focus is set
    int keepEditorActive;

-    SGizmoSettings gizmo;
-
    // Settings of the snapping.
    SSnapSettings snap;

@@ -554,10 +554,10 @@ set(FILES
    EditorPreferencesPageFiles.cpp
    EditorPreferencesPageViewportGeneral.h
    EditorPreferencesPageViewportGeneral.cpp
-    EditorPreferencesPageViewportGizmo.h
-    EditorPreferencesPageViewportGizmo.cpp
-    EditorPreferencesPageViewportMovement.h
-    EditorPreferencesPageViewportMovement.cpp
+    EditorPreferencesPageViewportManipulator.h
+    EditorPreferencesPageViewportManipulator.cpp
+    EditorPreferencesPageViewportCamera.h
+    EditorPreferencesPageViewportCamera.cpp
    EditorPreferencesPageViewportDebug.h
    EditorPreferencesPageViewportDebug.cpp
    EditorPreferencesPageExperimentalLighting.h
@@ -278,7 +278,7 @@ namespace AZ

 #define AZ_Printf(window, ...)       AZ::Debug::Trace::Instance().Printf(window, __VA_ARGS__);

-#if !defined(RELEASE) || defined(PERFORMANCE_BUILD)
+#if !defined(RELEASE)
 // Unconditional critical error log, enabled up to Performance config
 #define AZ_Fatal(window, format, ...)       AZ::Debug::Trace::Instance().Printf(window, "[FATAL] " format "\n", ##__VA_ARGS__);
 #define AZ_Crash()                          AZ::Debug::Trace::Instance().Crash();
@@ -628,7 +628,7 @@ int AZ::Intersect::IntersectRayCappedCylinder(
 int AZ::Intersect::IntersectRayCone(
    const Vector3& rayOrigin, const Vector3& rayDir,
    const Vector3& coneApex, const Vector3& coneDir, float coneHeight,
-    float coneBaseRaidus, float& t1, float& t2)
+    float coneBaseRadius, float& t1, float& t2)
 {
    // Q = rayOrgin, A = coneApex
    Vector3 AQ = rayOrigin - coneApex;
@@ -646,7 +646,7 @@ int AZ::Intersect::IntersectRayCone(
        return 0;
    }

-    float r2 = coneBaseRaidus * coneBaseRaidus;
+    float r2 = coneBaseRadius * coneBaseRadius;
    float h2 = coneHeight * coneHeight;

    float m2 = m * m;
@@ -240,7 +240,7 @@ namespace AZ
        //! @return                    The number of intersecting points.
        int IntersectRayCone(
            const Vector3& rayOrigin, const Vector3& rayDir,
-            const Vector3& coneApex, const Vector3& coneDir, float coneHeight, float coneBaseRaidus,
+            const Vector3& coneApex, const Vector3& coneDir, float coneHeight, float coneBaseRadius,
            float& t1, float& t2);

        //! Test intersection between a ray and a plane in 3D.
@@ -1290,13 +1290,13 @@ namespace AZ

        const EventArray& GetEvents() const;

-#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode
+#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode
        AZStd::string m_scriptPath;
 #endif

        AZStd::string GetScriptPath() const
        {
-#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode
+#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode
            return m_scriptPath;
 #else
            return{};
@@ -1305,7 +1305,7 @@ namespace AZ

        void SetScriptPath(const char* scriptPath)
        {
-#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode
+#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode
            m_scriptPath = scriptPath;
 #else
            AZ_UNUSED(scriptPath);
@@ -3727,7 +3727,7 @@ LUA_API const Node* lua_getDummyNode()

                if (m_handler)
                {
-#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE)
+#if !defined(_RELEASE)
                    const AZStd::string_view luaString("Lua");
                    lua_Debug info;
                    for (int level = 0; lua_getstack(m_lua, level, &info); ++level)
@@ -3739,7 +3739,7 @@ LUA_API const Node* lua_getDummyNode()
                            break;
                        }
                    }
-#endif//defined(PERFORMANCE_BUILD) || !defined(_RELEASE)
+#endif

                    BindEvents(scriptTable);

@@ -12,10 +12,12 @@
 ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
 ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common)

-if(PAL_TRAIT_PROF_PIX_SUPPORTED AND LY_PIX_ENABLED)
-    set(LY_PIX_PATH "${LY_3RDPARTY_PATH}/winpixeventruntime" CACHE PATH "Path to the Windows Pix Event Runtime.")
-    set(AZ_CORE_PIX_BUILD_DEPENDENCIES 3rdParty::pix)
-    set(AZ_CORE_PIX_BUILD_DEFINES "USE_PIX")
+if(PAL_TRAIT_PROF_PIX_SUPPORTED)
+    set(LY_PIX_ENABLED OFF CACHE BOOL "Enables PIX profiler integration.")
+    if(LY_PIX_ENABLED)
+        message(STATUS "PIX found, enabling as profiler")
+        set(AZ_CORE_PIX_BUILD_DEPENDENCIES 3rdParty::pix)
+    endif()
 endif()

 ly_add_target(
@@ -41,9 +43,6 @@ ly_add_target(
            3rdParty::zstd
            3rdParty::cityhash
            ${AZ_CORE_PIX_BUILD_DEPENDENCIES}
-    COMPILE_DEFINITIONS
-        PUBLIC
-            ${AZ_CORE_PIX_BUILD_DEFINES}
 )
 ly_add_source_properties(
    SOURCES
@@ -609,6 +609,21 @@ namespace UnitTest
        EXPECT_EQ(hits, 0);
    }

+    // replicates a scenario in the Editor using a cone and a pick ray which should have failed but passed
+    // note: To replicate this, select an entity so the default translation manipulator appears, move very close to the
+    // entity, hover the mouse over one of the manipulator linear manipulator arrows (cone part) and move the mouse away
+    // notice the manipulator will remain highlighted as a successful intersection is still reported
+    TEST(MATH_IntersectRayConeTestEditor, DISABLED_RayConeEditorScenarioTest)
+    {
+        auto rayOrigin = Vector3(0.0f, -0.808944702f, 0.0f);
+        auto rayDir = Vector3(0.301363617f, 0.939044654f, 0.165454566f);
+        float t1 = 0.0f;
+        float t2 = 0.0f;
+        int hits = Intersect::IntersectRayCone(
+            rayOrigin, rayDir, AZ::Vector3(0.0f, 0.0f, 0.161788940f), AZ::Vector3(0.0f, 0.0f, -1.0f), 0.0453009047, 0.0113252262, t1, t2);
+        EXPECT_EQ(hits, 0);
+    }
+
    class MATH_IntersectRayQuadTest
        : public AllocatorsFixture
    {
@@ -987,7 +987,7 @@ namespace AzFramework
    void AssetCatalog::AddCatalogEntry(AZStd::shared_ptr<AzFramework::AssetRegistry> deltaCatalog)
    {
        AZStd::lock_guard<AZStd::recursive_mutex> lock(m_deltaCatalogMutex);
-#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE)
+#if !defined(_RELEASE)
        for (const auto& thisElement : m_deltaCatalogList)
        {
            if (thisElement == deltaCatalog)
@@ -1010,7 +1010,7 @@ namespace AzFramework
            AZ_Warning("AssetCatalog", false, "Catalog name %p can't be inserted at slot %u", deltaCatalog.get(), catalogIndex);
            return;
        }
-#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE)
+#if !defined(_RELEASE)
        for (const auto& thisElement : m_deltaCatalogList)
        {
            if (thisElement == deltaCatalog)
@@ -17,14 +17,14 @@ namespace AzManipulatorTestFramework
    //! Implementation of the viewport interaction model to handle viewport interaction requests.
    class ViewportInteraction
        : public ViewportInteractionInterface
-        , private AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler
+        , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler
+        , public AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler
    {
    public:
        ViewportInteraction();
        ~ViewportInteraction();

-        // ViewportInteractionInterface ...
-        AzFramework::CameraState GetCameraState() override;
+        // ViewportInteractionInterface overrides ...
        void SetCameraState(const AzFramework::CameraState& cameraState) override;
        AzFramework::DebugDisplayRequests& GetDebugDisplay() override;
        void EnableGridSnaping() override;
@@ -34,18 +34,24 @@ namespace AzManipulatorTestFramework
        void SetGridSize(float size) override;
        void SetAngularStep(float step) override;
        int GetViewportId() const override;
+
+        // ViewportInteractionRequestBus overrides ...
+        AzFramework::CameraState GetCameraState() override;
+        AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
        AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override;
        AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(
            const AzFramework::ScreenPoint& screenPosition) override;
        float DeviceScalingFactor() override;
-    private:
-        // ViewportInteractionRequestBus ...
-        bool GridSnappingEnabled();
-        float GridSize();
-        bool ShowGrid();
-        bool AngleSnappingEnabled();
-        float AngleStep();
-        AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
+
+        // ViewportSettingsRequestBus overrides ...
+        bool GridSnappingEnabled() const override;
+        float GridSize() const override;
+        bool ShowGrid() const override;
+        bool AngleSnappingEnabled() const override;
+        float AngleStep() const override;
+        float ManipulatorLineBoundWidth() const override;
+        float ManipulatorCircleBoundWidth() const override;
+
    private:
        AZStd::unique_ptr<NullDebugDisplayRequests> m_nullDebugDisplayRequests;
        const int m_viewportId = 1234; // Arbitrary viewport id for manipulator tests
@@ -25,10 +25,12 @@ namespace AzManipulatorTestFramework
        : m_nullDebugDisplayRequests(AZStd::make_unique<NullDebugDisplayRequests>())
    {
        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(m_viewportId);
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusConnect(m_viewportId);
    }

    ViewportInteraction::~ViewportInteraction()
    {
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusDisconnect();
        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect();
    }

@@ -37,31 +39,41 @@ namespace AzManipulatorTestFramework
        return m_cameraState;
    }

-    bool ViewportInteraction::GridSnappingEnabled()
+    bool ViewportInteraction::GridSnappingEnabled() const
    {
        return m_gridSnapping;
    }

-    float ViewportInteraction::GridSize()
+    float ViewportInteraction::GridSize() const
    {
        return m_gridSize;
    }

-    bool ViewportInteraction::ShowGrid()
+    bool ViewportInteraction::ShowGrid() const
    {
        return false;
    }

-    bool ViewportInteraction::AngleSnappingEnabled()
+    bool ViewportInteraction::AngleSnappingEnabled() const
    {
        return m_angularSnapping;
    }

-    float ViewportInteraction::AngleStep()
+    float ViewportInteraction::AngleStep() const
    {
        return m_angularStep;
    }

+    float ViewportInteraction::ManipulatorLineBoundWidth() const
+    {
+        return 0.1f;
+    }
+
+    float ViewportInteraction::ManipulatorCircleBoundWidth() const
+    {
+        return 0.1f;
+    }
+
    AzFramework::ScreenPoint ViewportInteraction::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
    {
        return AzFramework::WorldToScreen(worldPosition, m_cameraState);
@@ -49,9 +49,9 @@ namespace UnitTest
        bool snapping = false;

        m_viewportInteraction->EnableGridSnaping();
-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult(
            snapping, m_viewportInteraction->GetViewportId(),
-            &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled);
+            &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled);

        EXPECT_TRUE(snapping);
    }
@@ -61,9 +61,9 @@ namespace UnitTest
        bool snapping = true;

        m_viewportInteraction->DisableGridSnaping();
-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult(
            snapping, m_viewportInteraction->GetViewportId(),
-            &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled);
+            &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled);

        EXPECT_FALSE(snapping);
    }
@@ -76,9 +76,9 @@ namespace UnitTest
        m_viewportInteraction->SetGridSize(expectedGridSize);

        m_viewportInteraction->DisableGridSnaping();
-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult(
            gridSize, m_viewportInteraction->GetViewportId(),
-            &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize);
+            &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::GridSize);

        EXPECT_EQ(gridSize, expectedGridSize);
    }
@@ -88,9 +88,9 @@ namespace UnitTest
        bool snapping = false;

        m_viewportInteraction->EnableAngularSnaping();
-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult(
            snapping, m_viewportInteraction->GetViewportId(),
-            &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled);
+            &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::AngleSnappingEnabled);

        EXPECT_TRUE(snapping);
    }
@@ -100,9 +100,9 @@ namespace UnitTest
        bool snapping = true;

        m_viewportInteraction->DisableAngularSnaping();
-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult(
            snapping, m_viewportInteraction->GetViewportId(),
-            &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled);
+            &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::AngleSnappingEnabled);

        EXPECT_FALSE(snapping);
    }
@@ -114,9 +114,9 @@ namespace UnitTest

        m_viewportInteraction->SetAngularStep(expectedAngularStep);

-        AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
+        AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult(
            angularStep, m_viewportInteraction->GetViewportId(),
-            &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::AngleStep);
+            &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::AngleStep);

        EXPECT_EQ(angularStep, expectedAngularStep);
    }
@@ -70,8 +70,12 @@ namespace AzToolsFramework
        //! Determines if the caller needs to wait for the Python VM to initialize (non-main thread only)
        virtual void WaitForInitialization() {}

-        //! Acquires the Python global interpreter lock (GIL) and executed the callback
+        //! Acquires the Python global interpreter lock (GIL) and execute the callback
        virtual void ExecuteWithLock(AZStd::function<void()> executionCallback) = 0;
+
+        //! Tries to acquire the Python global interpreter lock (GIL) and execute the callback.
+        //! @return Whether it was able to lock the mutex or not.
+        virtual bool TryExecuteWithLock(AZStd::function<void()> executionCallback) = 0;
    };

    //! A bus to handle post notifications to the console views of Python output
@@ -226,6 +226,7 @@ namespace AzToolsFramework
        m_translationManipulator = AZStd::make_shared<IndexedTranslationManipulator<Vertex>>(
            Dimensions(), vertexIndex, vertex, WorldFromLocalWithUniformScale(entityComponentIdPair.GetEntityId()),
            GetNonUniformScale(entityComponentIdPair.GetEntityId()));
+        m_translationManipulator->m_manipulator.SetLineBoundWidth(AzToolsFramework::ManipulatorLineBoundWidth());

        // setup how the manipulator should look
        m_manipulatorConfiguratorFn(&m_translationManipulator->m_manipulator);
@@ -137,8 +137,8 @@ namespace AzToolsFramework
    bool GridSnapping(const int viewportId)
    {
        bool snapping = false;
-        ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            snapping, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled);
+        ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+            snapping, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled);

        return snapping;
    }
@@ -146,8 +146,8 @@ namespace AzToolsFramework
    float GridSize(const int viewportId)
    {
        float gridSize = 0.0f;
-        ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            gridSize, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize);
+        ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+            gridSize, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSize);

        return gridSize;
    }
@@ -168,8 +168,8 @@ namespace AzToolsFramework
    bool AngleSnapping(const int viewportId)
    {
        bool snapping = false;
-        ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            snapping, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled);
+        ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+            snapping, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::AngleSnappingEnabled);

        return snapping;
    }
@@ -177,8 +177,8 @@ namespace AzToolsFramework
    float AngleStep(const int viewportId)
    {
        float angle = 0.0f;
-        ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            angle, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleStep);
+        ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+            angle, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::AngleStep);

        return angle;
    }
@@ -186,8 +186,8 @@ namespace AzToolsFramework
    bool ShowingGrid(const int viewportId)
    {
        bool show = false;
-        ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            show, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::ShowGrid);
+        ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+            show, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::ShowGrid);

        return show;
    }
@@ -10,6 +10,7 @@

 #include <AzCore/Component/NonUniformScaleBus.h>
 #include <AzCore/Component/TransformBus.h>
+#include <AzCore/Console/IConsole.h>
 #include <AzCore/Math/VectorConversions.h>
 #include <AzCore/std/containers/array.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
@@ -22,6 +23,14 @@
 #include <AzToolsFramework/Maths/TransformUtils.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>

+AZ_CVAR(
+    bool,
+    ed_manipulatorDisplayBoundDebug,
+    false,
+    nullptr,
+    AZ::ConsoleFunctorFlags::Null,
+    "Display additional debug drawing for manipulator bounds");
+
 namespace AzToolsFramework
 {
    const float g_defaultManipulatorSphereRadius = 0.1f;
@@ -118,6 +127,14 @@ namespace AzToolsFramework
        return quadBound;
    }

+    // calculate line in world space (axis and length).
+    static AZStd::pair<AZ::Vector3, AZ::Vector3> CalculateLine(
+        const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal, const AZ::Vector3& axis, const float length)
+    {
+        return { worldFromLocal.TransformPoint(localPosition),
+                 TransformPositionNoScaling(worldFromLocal, localPosition + (axis * length)) };
+    }
+
    // calculate line bound in world space (axis and length).
    static Picking::BoundShapeLineSegment CalculateLineBound(
        const AZ::Vector3& localPosition,
@@ -127,8 +144,9 @@ namespace AzToolsFramework
        const float width)
    {
        Picking::BoundShapeLineSegment lineBound;
-        lineBound.m_start = worldFromLocal.TransformPoint(localPosition);
-        lineBound.m_end = TransformPositionNoScaling(worldFromLocal, localPosition + (axis * length));
+        const auto line = CalculateLine(localPosition, worldFromLocal, axis, length);
+        lineBound.m_start = line.first;
+        lineBound.m_end = line.second;
        lineBound.m_width = width;
        return lineBound;
    }
@@ -395,13 +413,29 @@ namespace AzToolsFramework
            m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction, manipulatorState.m_worldFromLocal,
            manipulatorState.m_localPosition, cameraState);

-        const Picking::BoundShapeLineSegment lineBound = CalculateLineBound(
-            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, m_length * viewScale,
-            m_width * viewScale);
+        const auto worldLine =
+            CalculateLine(manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, m_length * viewScale);

        debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
        debugDisplay.SetLineWidth(defaultLineWidth(manipulatorState.m_mouseOver));
-        debugDisplay.DrawLine(lineBound.m_start, lineBound.m_end);
+        debugDisplay.DrawLine(worldLine.first, worldLine.second);
+
+        // ensure length of bound takes into account logical width of line (m_length - m_width)
+        const Picking::BoundShapeLineSegment lineBound = CalculateLineBound(
+            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, (m_length - m_width) * viewScale,
+            m_width * viewScale);
+
+        if (ed_manipulatorDisplayBoundDebug)
+        {
+            debugDisplay.DrawBall(lineBound.m_start, lineBound.m_width, false);
+            debugDisplay.DrawBall(lineBound.m_end, lineBound.m_width, false);
+
+            const auto line = lineBound.m_end - lineBound.m_start;
+            const auto height = line.GetLength();
+            const auto axis = line / height;
+            const auto center = lineBound.m_start + axis * height * 0.5f;
+            debugDisplay.DrawSolidCylinder(center, axis, lineBound.m_width, height, false);
+        }

        RefreshBoundInternal(managerId, manipulatorId, lineBound);
    }
@@ -578,13 +612,30 @@ namespace AzToolsFramework
        const Picking::BoundShapeTorus torusBound = CalculateTorusBound(
            manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_axis, m_radius * viewScale, m_width * viewScale);

-        // transform circle based on delta between default z up axis and other axes
-        const AZ::Transform worldFromLocalWithOrientation =
-            AZ::Transform::CreateTranslation(manipulatorState.m_worldFromLocal.GetTranslation()) *
+        const AZ::Transform orientation =
            AZ::Transform::CreateFromQuaternion((QuaternionFromTransformNoScaling(manipulatorState.m_worldFromLocal) *
                                                 AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), m_axis))
                                                    .GetNormalized());

+        // transform circle based on delta between default z up axis and other axes
+        const AZ::Transform worldFromLocalWithOrientation =
+            AZ::Transform::CreateTranslation(manipulatorState.m_worldFromLocal.GetTranslation()) * orientation;
+
+        if (ed_manipulatorDisplayBoundDebug)
+        {
+            debugDisplay.SetColor(AZ::Colors::BlanchedAlmond);
+            debugDisplay.PushMatrix(orientation);
+            debugDisplay.DrawCircle(torusBound.m_center + AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius, torusBound.m_majorRadius);
+            debugDisplay.DrawCircle(
+                torusBound.m_center + AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius,
+                torusBound.m_majorRadius + torusBound.m_minorRadius);
+            debugDisplay.DrawCircle(torusBound.m_center - AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius, torusBound.m_majorRadius);
+            debugDisplay.DrawCircle(
+                torusBound.m_center - AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius,
+                torusBound.m_majorRadius + torusBound.m_minorRadius);
+            debugDisplay.PopMatrix();
+        }
+
        debugDisplay.CullOn();
        debugDisplay.PushMatrix(worldFromLocalWithOrientation);
        debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4());
@@ -604,7 +655,10 @@ namespace AzToolsFramework
    }

    void DrawFullCircle(
-        AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position, const float radius, const AZ::Vector3& /*viewPos*/)
+        AzFramework::DebugDisplayRequests& debugDisplay,
+        const AZ::Vector3& position,
+        const float radius,
+        [[maybe_unused]] const AZ::Vector3& viewPos)
    {
        debugDisplay.DrawCircle(position, radius);
    }
@@ -130,11 +130,13 @@ namespace AzToolsFramework
        for (size_t manipulatorIndex = 0; manipulatorIndex < m_localAngularManipulators.size(); ++manipulatorIndex)
        {
            m_localAngularManipulators[manipulatorIndex]->SetView(CreateManipulatorViewCircle(
-                *m_localAngularManipulators[manipulatorIndex], colors[manipulatorIndex], radius, 0.05f, DrawHalfDottedCircle));
+                *m_localAngularManipulators[manipulatorIndex], colors[manipulatorIndex], radius, m_circleBoundWidth, DrawHalfDottedCircle));
        }

+        const float viewAlignedScale = 1.12f;
        m_viewAngularManipulator->SetView(CreateManipulatorViewCircle(
-            *m_viewAngularManipulator, AZ::Color(1.0f, 1.0f, 1.0f, 1.0f), radius + (radius * 0.12f), 0.05f, DrawFullCircle));
+            *m_viewAngularManipulator, AZ::Color(1.0f, 1.0f, 1.0f, 1.0f), radius * viewAlignedScale, m_circleBoundWidth,
+            DrawFullCircle));
    }

    bool RotationManipulators::PerformingActionViewAxis() const
@@ -151,4 +153,9 @@ namespace AzToolsFramework

        manipulatorFn(m_viewAngularManipulator.get());
    }
+
+    void RotationManipulators::SetCircleBoundWidth(const float circleBoundWidth)
+    {
+        m_circleBoundWidth = circleBoundWidth;
+    }
 } // namespace AzToolsFramework
@@ -42,6 +42,9 @@ namespace AzToolsFramework

        bool PerformingActionViewAxis() const;

+        //! Sets the bound width to use for the circle (torus) of an angular manipulator.
+        void SetCircleBoundWidth(float circleBoundWidth);
+
    private:
        AZ_DISABLE_COPY_MOVE(RotationManipulators)

@@ -49,5 +52,6 @@ namespace AzToolsFramework

        AZStd::array<AZStd::shared_ptr<AngularManipulator>, 3> m_localAngularManipulators;
        AZStd::shared_ptr<AngularManipulator> m_viewAngularManipulator;
+        float m_circleBoundWidth = 0.1f;  //!< The default circle bound width for the angular manipulator torus.
    };
 } // namespace AzToolsFramework
@@ -120,18 +120,18 @@ namespace AzToolsFramework
        const float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color)
    {
        const float boxSize = 0.1f;
-        const float lineWidth = 0.05f;
-
        const AZ::Color colors[] = { axis1Color, axis2Color, axis3Color };

        for (size_t manipulatorIndex = 0; manipulatorIndex < m_axisScaleManipulators.size(); ++manipulatorIndex)
        {
+            const auto lineLength = axisLength - boxSize;
+
            ManipulatorViews views;
            views.emplace_back(
-                CreateManipulatorViewLine(*m_axisScaleManipulators[manipulatorIndex], colors[manipulatorIndex], axisLength, lineWidth));
+                CreateManipulatorViewLine(*m_axisScaleManipulators[manipulatorIndex], colors[manipulatorIndex], axisLength, m_lineBoundWidth));
            views.emplace_back(CreateManipulatorViewBox(
                AZ::Transform::CreateIdentity(), colors[manipulatorIndex],
-                m_axisScaleManipulators[manipulatorIndex]->GetAxis() * (axisLength - boxSize), AZ::Vector3(boxSize)));
+                m_axisScaleManipulators[manipulatorIndex]->GetAxis() * lineLength, AZ::Vector3(boxSize)));
            m_axisScaleManipulators[manipulatorIndex]->SetViews(AZStd::move(views));
        }

@@ -150,4 +150,9 @@ namespace AzToolsFramework

        manipulatorFn(m_uniformScaleManipulator.get());
    }
+
+    void ScaleManipulators::SetLineBoundWidth(const float lineBoundWidth)
+    {
+        m_lineBoundWidth = lineBoundWidth;
+    }
 } // namespace AzToolsFramework
@@ -41,6 +41,9 @@ namespace AzToolsFramework

        void ConfigureView(float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color);

+        //! Sets the bound width to use for the line/axis of a linear manipulator.
+        void SetLineBoundWidth(float lineBoundWidth);
+
    private:
        AZ_DISABLE_COPY_MOVE(ScaleManipulators)

@@ -49,5 +52,6 @@ namespace AzToolsFramework

        AZStd::array<AZStd::shared_ptr<LinearManipulator>, 3> m_axisScaleManipulators;
        AZStd::shared_ptr<LinearManipulator> m_uniformScaleManipulator;
+        float m_lineBoundWidth = 0.01f; //!< The default line bound width for the linear manipulator axis.
    };
 } // namespace AzToolsFramework
@@ -235,24 +235,25 @@ namespace AzToolsFramework
    }

    void TranslationManipulators::ConfigureLinearView(
-        float axisLength,
+        const float axisLength,
        const AZ::Color& axis1Color,
        const AZ::Color& axis2Color,
        const AZ::Color& axis3Color /*= AZ::Color(0.0f, 0.0f, 1.0f, 0.5f)*/)
    {
        const float coneLength = 0.28f;
        const float coneRadius = 0.07f;
-        const float lineWidth = 0.05f;

        const AZ::Color axesColor[] = { axis1Color, axis2Color, axis3Color };

-        const auto configureLinearView =
-            [lineWidth, coneLength, axisLength, coneRadius](LinearManipulator* linearManipulator, const AZ::Color& color)
+        const auto configureLinearView = [lineBoundWidth = m_lineBoundWidth, coneLength, axisLength,
+                                          coneRadius](LinearManipulator* linearManipulator, const AZ::Color& color)
        {
+            const auto lineLength = axisLength - coneLength;
+
            ManipulatorViews views;
-            views.emplace_back(CreateManipulatorViewLine(*linearManipulator, color, axisLength, lineWidth));
-            views.emplace_back(CreateManipulatorViewCone(
-                *linearManipulator, color, linearManipulator->GetAxis() * (axisLength - coneLength), coneLength, coneRadius));
+            views.emplace_back(CreateManipulatorViewLine(*linearManipulator, color, lineLength, lineBoundWidth));
+            views.emplace_back(
+                CreateManipulatorViewCone(*linearManipulator, color, linearManipulator->GetAxis() * lineLength, coneLength, coneRadius));
            linearManipulator->SetViews(AZStd::move(views));
        };

@@ -316,6 +317,11 @@ namespace AzToolsFramework
        }
    }

+    void TranslationManipulators::SetLineBoundWidth(const float lineBoundWidth)
+    {
+        m_lineBoundWidth = lineBoundWidth;
+    }
+
    void ConfigureTranslationManipulatorAppearance3d(TranslationManipulators* translationManipulators)
    {
        translationManipulators->SetAxes(AZ::Vector3::CreateAxisX(), AZ::Vector3::CreateAxisY(), AZ::Vector3::CreateAxisZ());
@@ -65,6 +65,9 @@ namespace AzToolsFramework

        void ConfigureSurfaceView(float radius, const AZ::Color& color);

+        //! Sets the bound width to use for the line/axis of a linear manipulator.
+        void SetLineBoundWidth(float lineBoundWidth);
+
    private:
        AZ_DISABLE_COPY_MOVE(TranslationManipulators)

@@ -76,6 +79,7 @@ namespace AzToolsFramework
        AZStd::vector<AZStd::shared_ptr<LinearManipulator>> m_linearManipulators;
        AZStd::vector<AZStd::shared_ptr<PlanarManipulator>> m_planarManipulators;
        AZStd::shared_ptr<SurfaceManipulator> m_surfaceManipulator = nullptr;
+        float m_lineBoundWidth = 0.01f; //!< The default line bound width for the linear manipulator axis.
    };

    //! IndexedTranslationManipulator wraps a standard TranslationManipulators and allows it to be linked
@@ -16,6 +16,79 @@ namespace AzToolsFramework
 {
    namespace Picking
    {
+        // this intersection algorithm is adapted from 'Capped Cone' by Inigo Quilez
+        // ref: https://www.iquilezles.org/www/articles/intersectors/intersectors.htm and https://www.shadertoy.com/view/llcfRf
+        // all algorithms/code snippets are kindly made available under the MIT License - https://www.iquilezles.org/www/index.htm
+        bool IntersectRayCone(
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
+            const AZ::Vector3& coneApex,
+            const AZ::Vector3& coneAxis,
+            float coneHeight,
+            float coneBaseRadius,
+            float& t)
+        {
+            const AZ::Vector3& pa = coneApex;
+            const AZ::Vector3& pb = coneApex + coneHeight * coneAxis;
+            const AZ::Vector3& ro = rayOrigin;
+            const AZ::Vector3& rd = rayDirection;
+            float rb = coneBaseRadius;
+
+            AZ::Vector3 ba = pb - pa;
+            AZ::Vector3 oa = ro - pa;
+            AZ::Vector3 ob = ro - pb;
+
+            float m0 = ba.Dot(ba);
+            float m1 = oa.Dot(ba);
+            float m2 = ob.Dot(ba);
+            float m3 = rd.Dot(ba);
+
+            auto dot2 = [](const AZ::Vector3& v)
+            {
+                return v.Dot(v);
+            };
+
+            // cap
+            if (m2 > 0.0f)
+            {
+                if (dot2(ob * m3 - rd * m2) < (rb * rb * m3 * m3))
+                {
+                    t = -m2 / m3;
+                    return true;
+                }
+            }
+
+            // body
+            float m4 = rd.Dot(oa);
+            float m5 = oa.Dot(oa);
+            float hy = m0 + rb * rb;
+
+            float k2 = m0 * m0 - m3 * m3 * hy;
+            float k1 = m0 * m0 * m4 - m1 * m3 * hy;
+            float k0 = m0 * m0 * m5 - m1 * m1 * hy;
+
+            // note: solving for simultaneously being on the sloping surface of the cone and being on the ray boils down
+            // to a quadratic equation - the discriminant of the quadratic determines if there are 1, 2 or no solutions
+            //
+            // if the discriminant is less than 0 the ray is not intersecting the cone, if it is equal to 0 then the ray
+            // is intersecting the cone once and if it is greater than 0 the ray is intersecting the cone twice
+            float discriminant = k1 * k1 - k2 * k0;
+            if (discriminant < 0.0f)
+            {
+                return false;
+            }
+
+            float tt = (-k1 - AZ::Sqrt(discriminant)) / k2;
+            float y = m1 + tt * m3;
+            if (y >= 0.0f && y < m0)
+            {
+                t = tt;
+                return true;
+            }
+
+            return false;
+        }
+
        bool ManipulatorBoundSphere::IntersectRay(
            const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance)
        {
@@ -86,11 +159,10 @@ namespace AzToolsFramework
        bool ManipulatorBoundCone::IntersectRay(
            const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance)
        {
-            float t1 = std::numeric_limits<float>::max();
-            float t2 = std::numeric_limits<float>::max();
-            if (AZ::Intersect::IntersectRayCone(rayOrigin, rayDirection, m_apexPosition, m_dir, m_height, m_radius, t1, t2) > 0)
+            float t = std::numeric_limits<float>::max();
+            if (IntersectRayCone(rayOrigin, rayDirection, m_apexPosition, m_dir, m_height, m_radius, t))
            {
-                rayIntersectionDistance = AZStd::GetMin(t1, t2);
+                rayIntersectionDistance = t;
                return true;
            }

@@ -23,6 +23,26 @@ namespace AzToolsFramework
 {
    namespace Picking
    {
+        //! Custom ray/cone intersect function for manipulator bounds to workaround a bug in the current AZ::Intersect implementation.
+        //! @note Does not give reliable results if the ray origin is inside the cone.
+        //! @param      rayOrigin      The origin of the ray to test.
+        //! @param      rayDirection   The direction of the ray to test, it must be unit length.
+        //! @param      coneApex       The apex of the cone.
+        //! @param      coneAxis       The unit-length axis (direction) from the apex to the base.
+        //! @param      coneHeight     The height of the cone, from the apex to the base.
+        //! @param      coneBaseRadius The radius of the cone base.
+        //! @param[out] t              A possible coefficient in the ray's explicit equation from which an intersecting point is calculated
+        //!                            as "rayOrigin + t * rayDirection". 't' is the closest intersecting point to the ray origin.
+        //! @return                    true for intersecting, false for not intersecting.
+        bool IntersectRayCone(
+            const AZ::Vector3& rayOrigin,
+            const AZ::Vector3& rayDirection,
+            const AZ::Vector3& coneApex,
+            const AZ::Vector3& coneAxis,
+            float coneHeight,
+            float coneBaseRadius,
+            float& t);
+
        class ManipulatorBoundSphere : public BoundShapeInterface
        {
        public:
@@ -61,7 +61,7 @@ namespace AzToolsFramework
            m_prefabUndoCache.Destroy();
        }

-        PrefabOperationResult PrefabPublicHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZ::IO::PathView filePath)
+        CreatePrefabResult PrefabPublicHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZ::IO::PathView filePath)
        {
            EntityList inputEntityList, topLevelEntities;
            AZ::EntityId commonRootEntityId;
@@ -70,9 +70,11 @@ namespace AzToolsFramework
                entityIds, inputEntityList, topLevelEntities, commonRootEntityId, commonRootEntityOwningInstance);
            if (!findCommonRootOutcome.IsSuccess())
            {
-                return findCommonRootOutcome;
+                return AZ::Failure(findCommonRootOutcome.TakeError());
            }

+            AZ::EntityId containerEntityId;
+
            InstanceOptionalReference instanceToCreate;
            {
                // Initialize Undo Batch object
@@ -92,7 +94,7 @@ namespace AzToolsFramework
                    inputEntityList, commonRootEntityOwningInstance->get(), entities, instances);
                if (!retrieveEntitiesAndInstancesOutcome.IsSuccess())
                {
-                    return retrieveEntitiesAndInstancesOutcome;
+                    return AZ::Failure(retrieveEntitiesAndInstancesOutcome.TakeError());
                }

                AZStd::unordered_map<AZ::EntityId, AZStd::string> oldEntityAliases;
@@ -153,7 +155,7 @@ namespace AzToolsFramework
                        "(A null instance is returned)."));
                }

-                AZ::EntityId containerEntityId = instanceToCreate->get().GetContainerEntityId();
+                containerEntityId = instanceToCreate->get().GetContainerEntityId();

                // Apply the correct transform to the container for the new instance, and store the patch for use when creating the link.
                PrefabDom patch = ApplyContainerTransformAndGeneratePatch(containerEntityId, commonRootEntityId, topLevelEntities);
@@ -261,10 +263,10 @@ namespace AzToolsFramework
                }
            }

-            return AZ::Success();
+            return AZ::Success(containerEntityId);
        }

-        PrefabOperationResult PrefabPublicHandler::CreatePrefabInDisk(const EntityIdList& entityIds, AZ::IO::PathView filePath)
+        CreatePrefabResult PrefabPublicHandler::CreatePrefabInDisk(const EntityIdList& entityIds, AZ::IO::PathView filePath)
        {
            auto result = CreatePrefabInMemory(entityIds, filePath);
            if (result.IsSuccess())
@@ -42,11 +42,12 @@ namespace AzToolsFramework
            void UnregisterPrefabPublicHandlerInterface();

            // PrefabPublicInterface...
-            PrefabOperationResult CreatePrefabInDisk(
+            CreatePrefabResult CreatePrefabInDisk(
                const EntityIdList& entityIds, AZ::IO::PathView filePath) override;
-            PrefabOperationResult CreatePrefabInMemory(
+            CreatePrefabResult CreatePrefabInMemory(
                const EntityIdList& entityIds, AZ::IO::PathView filePath) override;
-            InstantiatePrefabResult InstantiatePrefab(AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) override;
+            InstantiatePrefabResult InstantiatePrefab(
+                AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) override;
            PrefabOperationResult SavePrefab(AZ::IO::Path filePath) override;
            PrefabEntityResult CreateEntity(AZ::EntityId parentId, const AZ::Vector3& position) override;
            
@@ -24,8 +24,9 @@ namespace AzToolsFramework

    namespace Prefab
    {
-        typedef AZ::Outcome<void, AZStd::string> PrefabOperationResult;
+        typedef AZ::Outcome<AZ::EntityId, AZStd::string> CreatePrefabResult;
        typedef AZ::Outcome<AZ::EntityId, AZStd::string> InstantiatePrefabResult;
+        typedef AZ::Outcome<void, AZStd::string> PrefabOperationResult;
        typedef AZ::Outcome<bool, AZStd::string> PrefabRequestResult;
        typedef AZ::Outcome<AZ::EntityId, AZStd::string> PrefabEntityResult;

@@ -44,9 +45,10 @@ namespace AzToolsFramework
             * Automatically detects descendants of entities, and discerns between entities and child instances.
             * @param entityIds The entities that should form the new prefab (along with their descendants).
             * @param filePath The absolute path for the new prefab file.
-             * @return An outcome object; on failure, it comes with an error message detailing the cause of the error.
+             * @return An outcome object with an entityId of the new prefab's container entity;
+             *  on failure, it comes with an error message detailing the cause of the error.
             */
-            virtual PrefabOperationResult CreatePrefabInDisk(
+            virtual CreatePrefabResult CreatePrefabInDisk(
                const EntityIdList& entityIds, AZ::IO::PathView filePath) = 0;

            /**
@@ -54,9 +56,10 @@ namespace AzToolsFramework
             * Automatically detects descendants of entities, and discerns between entities and child instances.
             * @param entityIds The entities that should form the new prefab (along with their descendants).
             * @param filePath The absolute path for the new prefab file.
-             * @return An outcome object; on failure, it comes with an error message detailing the cause of the error.
+             * @return An outcome object with an entityId of the new prefab's container entity;
+             *  on failure, it comes with an error message detailing the cause of the error.
             */
-            virtual PrefabOperationResult CreatePrefabInMemory(
+            virtual CreatePrefabResult CreatePrefabInMemory(
                const EntityIdList& entityIds, AZ::IO::PathView filePath) = 0;

            /**
@@ -10,6 +10,7 @@

 #include <AzCore/Component/EntityId.h>
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Outcome/Outcome.h>
 #include <AzCore/std/containers/vector.h>
@@ -22,8 +23,9 @@ namespace AzToolsFramework

    namespace Prefab
    {
-        using PrefabOperationResult = AZ::Outcome<void, AZStd::string>;
+        using CreatePrefabResult = AZ::Outcome<AZ::EntityId, AZStd::string>;
        using InstantiatePrefabResult = AZ::Outcome<AZ::EntityId, AZStd::string>;
+        using PrefabOperationResult = AZ::Outcome<void, AZStd::string>;

        /**
        * The primary purpose of this bus is to facilitate writing automated tests for prefabs.
@@ -47,14 +49,16 @@ namespace AzToolsFramework
            /**
             * Create a prefab out of the entities provided, at the path provided, and keep it in memory.
             * Automatically detects descendants of entities, and discerns between entities and child instances.
-             * Return whether the creation succeeded or not.
+             * Return an outcome object with an container entity id of the prefab created if creation succeeded;
+             * on failure, it comes with an error message detailing the cause of the error.
             */
-            virtual PrefabOperationResult CreatePrefabInMemory(
+            virtual CreatePrefabResult CreatePrefabInMemory(
                const EntityIdList& entityIds, AZStd::string_view filePath) = 0;

            /**
             * Instantiate a prefab from a prefab file.
-             * Return the container entity id of the prefab instantiated if instantiation succeeded.
+             * Return an outcome object with an container entity id of the prefab instantiated if instantiation succeeded; 
+             * on failure, it comes with an error message detailing the cause of the error.
             */
            virtual InstantiatePrefabResult InstantiatePrefab(
                AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) = 0;
@@ -62,10 +66,9 @@ namespace AzToolsFramework
            /**
             * Deletes all entities and their descendants from the owning instance. Bails if the entities don't
             * all belong to the same instance.
-             * Return whether the deletion succeeded or not.
+             * Return an outcome object; on failure, it comes with an error message detailing the cause of the error.
             */
            virtual PrefabOperationResult DeleteEntitiesAndAllDescendantsInInstance(const EntityIdList& entityIds) = 0;
-
        };

        using PrefabPublicRequestBus = AZ::EBus<PrefabPublicRequests>;
@@ -45,7 +45,7 @@ namespace AzToolsFramework
            m_prefabPublicInterface = nullptr;
        }

-        PrefabOperationResult PrefabPublicRequestHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath)
+        CreatePrefabResult PrefabPublicRequestHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath)
        {
            return m_prefabPublicInterface->CreatePrefabInMemory(entityIds, filePath);
        }
@@ -31,7 +31,7 @@ namespace AzToolsFramework
            void Connect();
            void Disconnect();

-            PrefabOperationResult CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath) override;
+            CreatePrefabResult CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath) override;
            InstantiatePrefabResult InstantiatePrefab(AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) override;
            PrefabOperationResult DeleteEntitiesAndAllDescendantsInInstance(const EntityIdList& entityIds) override;

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+
+namespace AzToolsFramework
+{
+    float ManipulatorLineBoundWidth(const AzFramework::ViewportId viewportId /*= AzFramework::InvalidViewportId*/)
+    {
+        float lineBoundWidth = 0.0f;
+        if (viewportId != AzFramework::InvalidViewportId)
+        {
+            ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+                lineBoundWidth, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorLineBoundWidth);
+        }
+        else
+        {
+            ViewportInteraction::ViewportSettingsRequestBus::BroadcastResult(
+                lineBoundWidth, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorLineBoundWidth);
+        }
+
+        return lineBoundWidth;
+    }
+
+    float ManipulatorCicleBoundWidth(const AzFramework::ViewportId viewportId /*= AzFramework::InvalidViewportId*/)
+    {
+        float circleBoundWidth = 0.0f;
+        if (viewportId != AzFramework::InvalidViewportId)
+        {
+            ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+                circleBoundWidth, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorCircleBoundWidth);
+        }
+        else
+        {
+            ViewportInteraction::ViewportSettingsRequestBus::BroadcastResult(
+                circleBoundWidth, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorCircleBoundWidth);
+        }
+
+        return circleBoundWidth;
+    }
+} // namespace AzToolsFramework
@@ -156,22 +156,12 @@ namespace AzToolsFramework
        class ViewportInteractionRequests
        {
        public:
-            //! Return the current camera state for this viewport.
+            //! Returns the current camera state for this viewport.
            virtual AzFramework::CameraState GetCameraState() = 0;
-            //! Return if grid snapping is enabled.
-            virtual bool GridSnappingEnabled() = 0;
-            //! Return the grid snapping size.
-            virtual float GridSize() = 0;
-            //! Does the grid currently want to be displayed.
-            virtual bool ShowGrid() = 0;
-            //! Return if angle snapping is enabled.
-            virtual bool AngleSnappingEnabled() = 0;
-            //! Return the angle snapping/step size.
-            virtual float AngleStep() = 0;
-            //! Transform a point in world space to screen space coordinates in Qt Widget space.
+            //! Transforms a point in world space to screen space coordinates in Qt Widget space.
            //! Multiply by DeviceScalingFactor to get the position in viewport pixel space.
            virtual AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) = 0;
-            //! Transform a point from Qt widget screen space to world space based on the given clip space depth.
+            //! Transforms a point from Qt widget screen space to world space based on the given clip space depth.
            //! Depth specifies a relative camera depth to project in the range of [0.f, 1.f].
            //! Returns the world space position if successful.
            virtual AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) = 0;
@@ -185,12 +175,13 @@ namespace AzToolsFramework
            ~ViewportInteractionRequests() = default;
        };

+        //! Type to inherit to implement ViewportInteractionRequests.
+        using ViewportInteractionRequestBus = AZ::EBus<ViewportInteractionRequests, ViewportEBusTraits>;
+
        //! Interface to return only viewport specific settings (e.g. snapping).
-        class ViewportSettings
+        class ViewportSettingsRequests
        {
        public:
-            virtual ~ViewportSettings() = default;
-
            //! Return if grid snapping is enabled.
            virtual bool GridSnappingEnabled() const = 0;
            //! Return the grid snapping size.
@@ -201,20 +192,31 @@ namespace AzToolsFramework
            virtual bool AngleSnappingEnabled() const = 0;
            //! Return the angle snapping/step size.
            virtual float AngleStep() const = 0;
+            //! Returns the current line bound width for manipulators.
+            virtual float ManipulatorLineBoundWidth() const = 0;
+            //! Returns the current circle (torus) bound width for manipulators.
+            virtual float ManipulatorCircleBoundWidth() const = 0;
+
+        protected:
+            ~ViewportSettingsRequests() = default;
        };

-        //! Type to inherit to implement ViewportInteractionRequests.
-        using ViewportInteractionRequestBus = AZ::EBus<ViewportInteractionRequests, ViewportEBusTraits>;
+        //! Type to inherit to implement ViewportSettingsRequests.
+        using ViewportSettingsRequestBus = AZ::EBus<ViewportSettingsRequests, ViewportEBusTraits>;

        //! An interface to notify when changes to viewport settings have happened.
        class ViewportSettingNotifications
        {
        public:
-            virtual void OnGridSnappingChanged([[maybe_unused]] bool enabled) {}
-            virtual void OnDrawHelpersChanged([[maybe_unused]] bool enabled) {}
+            virtual void OnGridSnappingChanged([[maybe_unused]] bool enabled)
+            {
+            }
+            virtual void OnDrawHelpersChanged([[maybe_unused]] bool enabled)
+            {
+            }

        protected:
-            ViewportSettingNotifications() = default;
+            ~ViewportSettingNotifications() = default;
        };

        using ViewportSettingsNotificationBus = AZ::EBus<ViewportSettingNotifications, ViewportEBusTraits>;
@@ -336,4 +338,12 @@ namespace AzToolsFramework
        }
        return AzFramework::ClickDetector::ClickEvent::Nil;
    }
+
+    //! Wrap EBus call to retrieve manipulator line bound width.
+    //! @note It is possible to pass AzFramework::InvalidViewportId (the default) to perform a Broadcast as opposed to a targeted Event.
+    float ManipulatorLineBoundWidth(AzFramework::ViewportId viewportId = AzFramework::InvalidViewportId);
+
+    //! Wrap EBus call to retrieve manipulator circle bound width.
+    //! @note It is possible to pass AzFramework::InvalidViewportId (the default) to perform a Broadcast as opposed to a targeted Event.
+    float ManipulatorCicleBoundWidth(AzFramework::ViewportId viewportId = AzFramework::InvalidViewportId);
 } // namespace AzToolsFramework
@@ -488,8 +488,8 @@ namespace AzToolsFramework
    void SnappingCluster::TrySetVisible(const bool visible)
    {
        bool snapping = false;
-        ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-            snapping, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled);
+        ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+            snapping, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled);

        // show snapping viewport ui only if there are entities selected and snapping is enabled
        SetViewportUiClusterVisible(m_clusterId, visible && snapping);
@@ -1249,6 +1249,7 @@ namespace AzToolsFramework

        AZStd::unique_ptr<TranslationManipulators> translationManipulators = AZStd::make_unique<TranslationManipulators>(
            TranslationManipulators::Dimensions::Three, AZ::Transform::CreateIdentity(), AZ::Vector3::CreateOne());
+        translationManipulators->SetLineBoundWidth(ManipulatorLineBoundWidth(ViewportUi::DefaultViewportId));

        InitializeManipulators(*translationManipulators);

@@ -1376,6 +1377,7 @@ namespace AzToolsFramework

        AZStd::unique_ptr<RotationManipulators> rotationManipulators =
            AZStd::make_unique<RotationManipulators>(AZ::Transform::CreateIdentity());
+        rotationManipulators->SetCircleBoundWidth(ManipulatorCicleBoundWidth(ViewportUi::DefaultViewportId));

        InitializeManipulators(*rotationManipulators);

@@ -1545,6 +1547,7 @@ namespace AzToolsFramework
        AZ_PROFILE_FUNCTION(AzToolsFramework);

        AZStd::unique_ptr<ScaleManipulators> scaleManipulators = AZStd::make_unique<ScaleManipulators>(AZ::Transform::CreateIdentity());
+        scaleManipulators->SetLineBoundWidth(ManipulatorLineBoundWidth(ViewportUi::DefaultViewportId));

        InitializeManipulators(*scaleManipulators);

@@ -2544,8 +2547,8 @@ namespace AzToolsFramework
            if (buttonId == m_snappingCluster.m_snapToWorldButtonId)
            {
                float gridSize = 1.0f;
-                ViewportInteraction::ViewportInteractionRequestBus::EventResult(
-                    gridSize, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize);
+                ViewportInteraction::ViewportSettingsRequestBus::EventResult(
+                    gridSize, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSize);

                SnapSelectedEntitiesToWorldGrid(gridSize);
            }
@@ -481,6 +481,7 @@ set(FILES
    Viewport/VertexContainerDisplay.h
    Viewport/VertexContainerDisplay.cpp
    Viewport/ViewportMessages.h
+    Viewport/ViewportMessages.cpp
    Viewport/ViewportTypes.h
    Viewport/ViewportTypes.cpp
    ViewportUi/Button.h
@@ -187,4 +187,51 @@ namespace UnitTest
        EXPECT_NEAR(intersectionDistance, 10.0f, g_epsilon);
        EXPECT_TRUE(intersection);
    }
+
+    // replicates a scenario in the Editor using a cone and a pick ray which should have failed but passed with Intersect::IntersectRayCone
+    TEST(ManipulatorIntersectRayConeTest, RayConeEditorScenarioTest)
+    {
+        auto rayOrigin = AZ::Vector3(0.0f, -0.808944702f, 0.0f);
+        auto rayDir = AZ::Vector3(0.301363617f, 0.939044654f, 0.165454566f);
+        float t = 0.0f;
+        bool hit = AzToolsFramework::Picking::IntersectRayCone(
+            rayOrigin, rayDir, AZ::Vector3(0.0f, 0.0f, 0.161788940f), AZ::Vector3(0.0f, 0.0f, -1.0f), 0.0453009047, 0.0113252262, t);
+        EXPECT_FALSE(hit);
+    }
+
+    // cone lying flat, ray going towards base of cone
+    TEST(ManipulatorIntersectRayConeTest, RayIntersectsConeBase)
+    {
+        auto rayOrigin = AZ::Vector3::CreateZero();
+        auto rayDir = AZ::Vector3::CreateAxisY();
+        float t = 0.0f;
+        bool hit = AzToolsFramework::Picking::IntersectRayCone(
+            rayOrigin, rayDir, AZ::Vector3::CreateAxisY(10.0f), AZ::Vector3::CreateAxisY(-1.0f), 5.0f, 1.0f, t);
+        EXPECT_TRUE(hit);
+        EXPECT_THAT(t, ::testing::FloatNear(5.0f, 0.0001f));
+    }
+
+    // cone standing up, ray going towards mid side of cone
+    TEST(ManipulatorIntersectRayConeTest, RayIntersectsConeSide)
+    {
+        auto rayOrigin = AZ::Vector3::CreateZero();
+        auto rayDir = AZ::Vector3::CreateAxisY();
+        float t = 0.0f;
+        bool hit = AzToolsFramework::Picking::IntersectRayCone(
+            rayOrigin, rayDir, AZ::Vector3(0.0f, 10.0f, 5.0f), AZ::Vector3::CreateAxisZ(-1.0f), 10.0f, 5.0f, t);
+        EXPECT_TRUE(hit);
+        EXPECT_THAT(t, ::testing::FloatNear(7.5f, 0.0001f));
+    }
+
+    // cone standing up, ray going towards mid side of cone
+    TEST(ManipulatorIntersectRayConeTest, RayIntersectsConeApex)
+    {
+        auto rayOrigin = AZ::Vector3::CreateZero();
+        auto rayDir = AZ::Vector3::CreateAxisY();
+        float t = 0.0f;
+        bool hit = AzToolsFramework::Picking::IntersectRayCone(
+            rayOrigin, rayDir, AZ::Vector3::CreateAxisY(2.5f), AZ::Vector3::CreateAxisY(1.0f), 5.0f, 1.0f, t);
+        EXPECT_TRUE(hit);
+        EXPECT_THAT(t, ::testing::FloatNear(2.5f, 0.0001f));
+    }
 } // namespace UnitTest
@@ -111,6 +111,7 @@ ly_install_directory(
        Platform/${PAL_PLATFORM_NAME}
        Platform/Common
    DESTINATION LauncherGenerator/Platform
+    VERBATIM
 )
 ly_install_files(
    FILES FindLauncherGenerator.cmake
@@ -27,7 +27,7 @@
    #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_STATS_AGENT
    #include AZ_RESTRICTED_FILE(ProjectDefines_h)
 #elif defined(WIN32) || defined(WIN64)
-    #if !defined(_RELEASE) || defined(PERFORMANCE_BUILD)
+    #if !defined(_RELEASE)
        #define ENABLE_STATS_AGENT
    #endif
 #endif
@@ -71,7 +71,7 @@
    #define REMOTE_ASSET_PROCESSOR
 #endif

-#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD))
+#if !defined(_RELEASE)
    #define USE_HTTP_WEBSOCKETS 0
 #endif

@@ -97,7 +97,7 @@
    #endif
 #endif

-#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD))
+#if !defined(_RELEASE)
    #ifndef ENABLE_PROFILING_CODE
        #define ENABLE_PROFILING_CODE
    #endif
@@ -1433,10 +1433,6 @@ AZ_POP_DISABLE_WARNING
 #endif
        }

-#if defined(PERFORMANCE_BUILD)
-        LoadConfiguration("performance.cfg");
-#endif
-
        //////////////////////////////////////////////////////////////////////////
        if (g_cvars.sys_asserts == 0)
        {
@@ -297,7 +297,7 @@ void CXConsole::Init(ISystem* pSystem)
    AzFramework::InputChannelEventListener::Connect();
    AzFramework::InputTextEventListener::Connect();

-#if defined(_RELEASE) && !defined(PERFORMANCE_BUILD)
+#if defined(_RELEASE)
    static const int kDeactivateConsoleDefault = 1;
 #else
    static const int kDeactivateConsoleDefault = 0;
@@ -6,6 +6,10 @@
 #
 #

+if(LY_MONOLITHIC_GAME)
+    return()
+endif()
+
 ly_add_target(
    NAME TestImpact.Frontend.Console.Static STATIC
    NAMESPACE AZ