Integrating latest 47acbe8

Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h

@@ -40,7 +40,6 @@ namespace AzManipulatorTestFramework
         int GetViewportId() const override;
         AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const QPoint& screenPosition, float depth) override;
         AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(const QPoint& screenPosition) override;
-        QPoint ViewportCursorScreenPosition() override;
     private:
         // ViewportInteractionRequestBus ...
         bool GridSnappingEnabled();

Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp

@@ -126,9 +126,4 @@ namespace AzManipulatorTestFramework
     {
         return {};
     }
-
-    QPoint ViewportInteraction::ViewportCursorScreenPosition()
-    {
-        return QPoint();
-    }
 } // namespace AzManipulatorTestFramework

Code/Framework/AzManipulatorTestFramework/Tests/BusCallTest.cpp

@@ -107,7 +107,7 @@ namespace UnitTest
         AZ::Vector3 movementAlongAxis = AZ::Vector3::CreateZero();
         const AZ::Vector3 expectedMovementAlongAxis = AZ::Vector3(-5.0f, 0.0f, 0.0f);
 
-        const AZ::Vector3 initialManipulatorPosition = m_linearManipulator->GetPosition();
+        const AZ::Vector3 initialManipulatorPosition = m_linearManipulator->GetLocalPosition();
         m_linearManipulator->InstallMouseMoveCallback(
             [&movementAlongAxis, this](const AzToolsFramework::LinearManipulator::Action& action)
         {
@@ -141,6 +141,6 @@ namespace UnitTest
 
         // expect the manipulator movement along the axis to match the mouse movement along the axis
         EXPECT_EQ(movementAlongAxis, expectedMovementAlongAxis);
-        EXPECT_EQ(m_linearManipulator->GetPosition(), initialManipulatorPosition + expectedMovementAlongAxis);
+        EXPECT_EQ(m_linearManipulator->GetLocalPosition(), initialManipulatorPosition + expectedMovementAlongAxis);
     }
 } // namespace UnitTest

Code/Framework/AzManipulatorTestFramework/Tests/GridSnappingTest.cpp

@@ -55,7 +55,7 @@ namespace UnitTest
     TEST_F(GridSnappingFixture, MouseDownWithSnappingEnabledSnapsToClosestGridSize)
     {
         // the initial starting position of the manipulator (in front of the camera)
-        const auto initialPositionWorld = m_linearManipulator->GetPosition();
+        const auto initialPositionWorld = m_linearManipulator->GetLocalPosition();
         // where the manipulator should end up (in front and to the left of the camera)
         const auto finalPositionWorld = AZ::Vector3(-10.0f, 50.0f, 0.0f);
         // perspective scale factor for manipulator distance to camera
@@ -89,7 +89,7 @@ namespace UnitTest
             ->MousePosition(finalPositionScreen)
             ->MouseLButtonUp()
             ->ExpectManipulatorNotBeingInteracted()
-            ->ExpectTrue(m_linearManipulator->GetPosition().IsClose(finalPositionWorld, 0.01f))
+            ->ExpectTrue(m_linearManipulator->GetLocalPosition().IsClose(finalPositionWorld, 0.01f))
             ;
     }
 } // namespace UnitTest

Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp

@@ -165,7 +165,7 @@ namespace UnitTest
     void AzManipulatorTestFrameworkWorldSpaceBuilderTestFixture::MoveManipulatorAlongAxis(State& state)
     {
         // the initial starting position of the manipulator (in front of the camera)
-        const auto initialPositionWorld = state.m_linearManipulator->GetPosition();
+        const auto initialPositionWorld = state.m_linearManipulator->GetLocalPosition();
         // where the manipulator should end up (in front and to the left of the camera)
         const auto finalPositionWorld = AZ::Vector3(-10.0f, 50.0f, 0.0f);
         // perspective scale factor for manipulator distance to camera