Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs

Code/Editor/Core/QtEditorApplication.cpp

@@ -44,7 +44,7 @@ enum
 {
     // in milliseconds
     GameModeIdleFrequency = 0,
-    EditorModeIdleFrequency = 0,
+    EditorModeIdleFrequency = 1,
     InactiveModeFrequency = 10,
     UninitializedFrequency = 9999,
 };

Code/Editor/EditorModularViewportCameraComposer.cpp

@@ -175,27 +175,15 @@ namespace SandboxEditor
         m_pivotCamera = AZStd::make_shared<AzFramework::PivotCameraInput>(SandboxEditor::CameraPivotChannelId());
 
         m_pivotCamera->SetPivotFn(
-            [viewportId = m_viewportId]([[maybe_unused]] const AZ::Vector3& position, [[maybe_unused]] const AZ::Vector3& direction)
+            []([[maybe_unused]] const AZ::Vector3& position, [[maybe_unused]] const AZ::Vector3& direction)
             {
-                AZStd::optional<AZ::Vector3> lookAtAfterInterpolation;
-                AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult(
-                    lookAtAfterInterpolation, viewportId,
-                    &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::LookAtAfterInterpolation);
-
-                // initially attempt to use the last set look at point after an interpolation has finished
-                // note: ignore this if it is the same location as the camera (e.g. after go to position)
-                if (lookAtAfterInterpolation.has_value() && !lookAtAfterInterpolation->IsClose(position))
-                {
-                    return *lookAtAfterInterpolation;
-                }
-
-                // otherwise fall back to the selected entity pivot
+                // use the manipulator transform as the pivot point
                 AZStd::optional<AZ::Transform> entityPivot;
                 AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
                     entityPivot, AzToolsFramework::GetEntityContextId(),
                     &AzToolsFramework::EditorTransformComponentSelectionRequestBus::Events::GetManipulatorTransform);
 
-                // finally just use the identity
+                // otherwise just use the identity
                 return entityPivot.value_or(AZ::Transform::CreateIdentity()).GetTranslation();
             });
 

Code/Editor/EditorViewportCamera.cpp

@@ -48,7 +48,7 @@ namespace SandboxEditor
         {
             AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
                 viewportContext->GetId(), &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
-                AZ::Transform::CreateFromQuaternionAndTranslation(CameraRotation(pitch, yaw), position), 0.0f);
+                AZ::Transform::CreateFromQuaternionAndTranslation(CameraRotation(pitch, yaw), position));
         }
     }
 

Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp

@@ -167,7 +167,7 @@ namespace UnitTest
             AZ::Quaternion::CreateRotationZ(AZ::DegToRad(90.0f)), AZ::Vector3(20.0f, 40.0f, 60.0f));
         AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
             TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
-            transformToInterpolateTo, 0.0f);
+            transformToInterpolateTo);
 
         // simulate interpolation
         m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() });
@@ -193,7 +193,7 @@ namespace UnitTest
         // When
         AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
             TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform,
-            transformToInterpolateTo, 0.0f);
+            transformToInterpolateTo);
 
         // simulate interpolation
         m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() });

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -1739,8 +1739,7 @@ void SandboxIntegrationManager::GoToEntitiesInViewports(const AzToolsFramework::
 
             AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event(
                 viewportContext->GetId(),
-                &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, nextCameraTransform,
-                distanceToLookAt);
+                &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, nextCameraTransform);
         }
     }
 }

Code/Editor/TrackView/SequenceBatchRenderDialog.cpp

@@ -36,9 +36,6 @@
 #include "CryEdit.h"
 #include "Viewport.h"
 
-// Atom Renderer
-#include <Atom/RPI.Public/RPISystemInterface.h>
-
 AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 #include <TrackView/ui_SequenceBatchRenderDialog.h>
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
@@ -1237,13 +1234,6 @@ void CSequenceBatchRenderDialog::OnKickIdleTimout()
         {
             componentApplication->TickSystem();
         }
-
-        // Directly tick the renderer, as it's no longer part of the system tick
-        if (auto rpiSystem = AZ::RPI::RPISystemInterface::Get())
-        {
-            rpiSystem->SimulationTick();
-            rpiSystem->RenderTick();
-        }
     }
 }