build fixes

Signed-off-by: greerdv <[email protected]>

Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/ViewportEditUtilities.cpp

@@ -1,21 +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 <AzToolsFramework/ComponentModes/ViewportEditUtilities.h>
-
-namespace AzToolsFramework
-{
-    template <typename T>
-    AZ::Vector3 GetPositionInManipulatorFrame(float worldUniformScale, const AZ::Transform& manipulatorLocalTransform,
-        const T& action)
-    {
-        return manipulatorLocalTransform.GetInverse().TransformPoint(
-            action.m_start.m_localPosition +
-            action.LocalPositionOffset() / AZ::GetClamp(worldUniformScale, AZ::MinTransformScale, AZ::MaxTransformScale));
-    }
-} // namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/ComponentModes/ViewportEditUtilities.h

@@ -16,6 +16,10 @@ namespace AzToolsFramework
     //! Removes the effects of the manipulator local transform, and accounts for world transform scale in
     //! the action local offset.
     template<typename T>
-    AZ::Vector3 GetPositionInManipulatorFrame(float worldUniformScale, const AZ::Transform& manipulatorLocalTransform,
-        const T& action);    
+    AZ::Vector3 GetPositionInManipulatorFrame(float worldUniformScale, const AZ::Transform& manipulatorLocalTransform, const T& action)
+    {
+        return manipulatorLocalTransform.GetInverse().TransformPoint(
+            action.m_start.m_localPosition +
+            action.LocalPositionOffset() / AZ::GetClamp(worldUniformScale, AZ::MinTransformScale, AZ::MaxTransformScale));
+    }
 } // namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake

@@ -647,7 +647,6 @@ set(FILES
     ComponentModes/ShapeTranslationOffsetViewportEdit.h
     ComponentModes/ShapeTranslationOffsetViewportEdit.cpp
     ComponentModes/ViewportEditUtilities.h
-    ComponentModes/ViewportEditUtilities.cpp
     ViewportSelection/EditorBoxSelect.h
     ViewportSelection/EditorBoxSelect.cpp
     ViewportSelection/EditorDefaultSelection.h

Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp

@@ -669,8 +669,8 @@ namespace UnitTest
 
         // the offset should not have changed, because the editing was symmetrical
         AZ::Vector3 newBoxOffset = AZ::Vector3::CreateZero();
-        AzToolsFramework::BoxManipulatorRequestBus::EventResult(
-            newBoxOffset, m_idPair, &AzToolsFramework::BoxManipulatorRequests::GetTranslationOffset);
+        AzToolsFramework::ShapeManipulatorRequestBus::EventResult(
+            newBoxOffset, m_idPair, &AzToolsFramework::ShapeManipulatorRequests::GetTranslationOffset);
 
         EXPECT_THAT(newBoxOffset, IsCloseTolerance(boxOffset, ManipulatorTolerance));
     }
@@ -725,8 +725,8 @@ namespace UnitTest
 
         // the offset should have changed, because the editing was asymmetrical
         AZ::Vector3 newBoxOffset = AZ::Vector3::CreateZero();
-        AzToolsFramework::BoxManipulatorRequestBus::EventResult(
-            newBoxOffset, m_idPair, &AzToolsFramework::BoxManipulatorRequests::GetTranslationOffset);
+        AzToolsFramework::ShapeManipulatorRequestBus::EventResult(
+            newBoxOffset, m_idPair, &AzToolsFramework::ShapeManipulatorRequests::GetTranslationOffset);
 
         // the offset should have moved 0.25 units (half the change in the z dimension)
         // along the -z axis, tranformed by the local rotation of the box