Merge branch 'development' into cmake/warn_virtual

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Code/Editor/Core/QtEditorApplication.cpp

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

Code/Editor/CryEditPy.cpp

@@ -77,10 +77,6 @@ namespace
             // This closes the current document (level)
             currentLevel->OnNewDocument();
 
-            // Then we freeze the viewport's input
-            AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Broadcast(
-                &AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Events::FreezeViewportInput, true);
-
             // Then we need to tell the game engine there is no level to render anymore
             if (GetIEditor()->GetGameEngine())
             {

Code/Editor/EditorViewportWidget.cpp

@@ -669,16 +669,6 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
     case eNotify_OnEndSceneSave:
         PopDisableRendering();
         break;
-
-    case eNotify_OnBeginLoad: // disables viewport input when starting to load an existing level
-    case eNotify_OnBeginCreate: // disables viewport input when starting to create a new level
-        m_freezeViewportInput = true;
-        break;
-
-    case eNotify_OnEndLoad: // enables viewport input when finished loading an existing level
-    case eNotify_OnEndCreate: // enables viewport input when finished creating a new level
-        m_freezeViewportInput = false;
-        break;
     }
 }
 
@@ -962,16 +952,6 @@ AzFramework::ScreenPoint EditorViewportWidget::ViewportWorldToScreen(const AZ::V
     return m_renderViewport->ViewportWorldToScreen(worldPosition);
 }
 
-bool EditorViewportWidget::IsViewportInputFrozen()
-{
-    return m_freezeViewportInput;
-}
-
-void EditorViewportWidget::FreezeViewportInput(bool freeze)
-{
-    m_freezeViewportInput = freeze;
-}
-
 QWidget* EditorViewportWidget::GetWidgetForViewportContextMenu()
 {
     return this;
@@ -1057,9 +1037,9 @@ void EditorViewportWidget::SetViewportId(int id)
 
 void EditorViewportWidget::ConnectViewportInteractionRequestBus()
 {
-    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusConnect(GetViewportId());
     AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
     AzToolsFramework::ViewportInteraction::EditorEntityViewportInteractionRequestBus::Handler::BusConnect(GetViewportId());
+    AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusConnect();
     m_viewportUi.ConnectViewportUiBus(GetViewportId());
 
     AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusConnect();
@@ -1070,9 +1050,9 @@ void EditorViewportWidget::DisconnectViewportInteractionRequestBus()
     AzFramework::InputSystemCursorConstraintRequestBus::Handler::BusDisconnect();
 
     m_viewportUi.DisconnectViewportUiBus();
+    AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusDisconnect();
     AzToolsFramework::ViewportInteraction::EditorEntityViewportInteractionRequestBus::Handler::BusDisconnect();
     AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler::BusDisconnect();
-    AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler::BusDisconnect();
 }
 
 namespace AZ::ViewportHelpers

Code/Editor/EditorViewportWidget.h

@@ -89,7 +89,6 @@ class SANDBOX_API EditorViewportWidget final
     , private Camera::EditorCameraRequestBus::Handler
     , private Camera::CameraNotificationBus::Handler
     , private AzFramework::InputSystemCursorConstraintRequestBus::Handler
-    , private AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler
     , private AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
     , private AzToolsFramework::ViewportInteraction::EditorEntityViewportInteractionRequestBus::Handler
     , private AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler
@@ -202,10 +201,6 @@ private:
     // AzFramework::InputSystemCursorConstraintRequestBus overrides ...
     void* GetSystemCursorConstraintWindow() const override;
 
-    // AzToolsFramework::ViewportFreezeRequestBus overrides ...
-    bool IsViewportInputFrozen() override;
-    void FreezeViewportInput(bool freeze) override;
-
     // AzToolsFramework::MainEditorViewportInteractionRequestBus overrides ...
     AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) override;
     AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override;
@@ -387,9 +382,6 @@ private:
     // Unclear if it's still necessary.
     QSet<int> m_keyDown;
 
-    // State for ViewportFreezeRequestBus, currently does nothing
-    bool m_freezeViewportInput = false;
-
     // This widget holds a reference to the manipulator manage because its responsible for drawing manipulators
     AZStd::shared_ptr<AzToolsFramework::ManipulatorManager> m_manipulatorManager;
 

Code/Editor/Style/Editor.qss

@@ -191,94 +191,4 @@ ConsoleTextEdit:focus,
     border-width: 0px;
     border-color: #e9e9e9;
     border-style: solid;
-}
-
-/* Welcome Screen styling */
-
-WelcomeScreenDialog QLabel
-{
-    font-size: 12px;
-    color: #FFFFFF;
-    line-height: 20px;
-    background-color: transparent;
-    margin: 0;
-}
-
-WelcomeScreenDialog QLabel#currentProjectLabel
-{
-    margin-top: 10px;
-}
-
-WelcomeScreenDialog QPushButton
-{
-    font-size: 14px;
-    line-height: 16px;
-}
-
-WelcomeScreenDialog QWidget#articleViewContainerRoot
-{
-    background: #444444;
-}
-
-WelcomeScreenDialog QWidget#levelViewFTUEContainer
-{
-    background: #282828;
-}
-
-QTableWidget#recentLevelTable::item {
-	background-color: rgb(64,64,64);
-	margin-bottom: 4px;
-	margin-top: 4px;
-}
-
-/* Particle Editor */
-
-#NumParticlesLabel
-{
-    margin-top: 6px;
-}
-
-#LibrarySearchIcon
-{
-    max-width: 16px;
-    max-height: 16px;
-    qproperty-iconSize: 16px 16px;
-}
-
-
-#ClosePrefabDialog, #SavePrefabDialog
-{
-    min-width : 640px;
-}
-
-#SaveDependentPrefabsCard
-{
-    margin: 0px 15px 10px 15px;
-}
-
-#PrefabSavedMessageFrame{
-    border: 1px solid green;
-    margin: 10px 15px 10px 15px;
-    border-radius: 2px;
-    padding: 5px 2px 5px 2px;
-}
-
-#ClosePrefabDialog #PrefabSaveWarningFrame
-{
-    border: 1px solid orange;
-    margin: 10px 15px 10px 15px;
-    border-radius: 2px;
-    padding: 5px 2px 5px 2px;
-    color : white;
-}
-
-#SavePrefabDialog #FooterSeparatorLine
-{
-    color: gray;
-}
-
-#SavePrefabDialog #PrefabSavePreferenceHint
-{
-    font: italic;
-    color: #999999;
 }

Code/Editor/TrackView/SequenceBatchRenderDialog.cpp

@@ -36,6 +36,9 @@
 #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
@@ -1234,6 +1237,13 @@ 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();
+        }
     }
 }