Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes

2021-05-19 19:12:07 -07:00
parent 8d4fb4d67d af22a0f44e
commit 1654553e9c
861 changed files with 11241 additions and 41205 deletions
@@ -49,6 +49,7 @@
 #include <AzToolsFramework/API/ComponentEntityObjectBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>

 // AtomToolsFramework
 #include <AtomToolsFramework/Viewport/RenderViewportWidget.h>
@@ -1229,6 +1230,20 @@ void EditorViewportWidget::SetViewportId(int id)
            auto firstPersonWheelCamera = AZStd::make_shared<AzFramework::ScrollTranslationCameraInput>();

            auto orbitCamera = AZStd::make_shared<AzFramework::OrbitCameraInput>();
+            orbitCamera->SetLookAtFn([]() -> AZStd::optional<AZ::Vector3> {
+                AZStd::optional<AZ::Transform> manipulatorTransform;
+                AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+                    manipulatorTransform, AzToolsFramework::GetEntityContextId(),
+                    &AzToolsFramework::EditorTransformComponentSelectionRequestBus::Events::GetManipulatorTransform);
+
+                if (manipulatorTransform)
+                {
+                    return manipulatorTransform->GetTranslation();
+                }
+
+                return {};
+            });
+
            auto orbitRotateCamera = AZStd::make_shared<AzFramework::RotateCameraInput>(AzFramework::CameraOrbitLookButton);
            auto orbitTranslateCamera = AZStd::make_shared<AzFramework::TranslateCameraInput>(AzFramework::OrbitTranslation);
            auto orbitDollyWheelCamera = AZStd::make_shared<AzFramework::OrbitDollyScrollCameraInput>();