Merge branch 'main' into cgalvan/RemoveLegacyEditTools

Code/Sandbox/Editor/EditorViewportWidget.cpp

@@ -678,6 +678,11 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
             }
             SetCurrentCursor(STD_CURSOR_GAME);
         }
+
+        if (m_renderViewport)
+        {
+            m_renderViewport->GetControllerList()->SetEnabled(false);
+        }
     }
     break;
 
@@ -696,6 +701,11 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
 
             RestoreViewportAfterGameMode();
         }
+
+        if (m_renderViewport)
+        {
+            m_renderViewport->GetControllerList()->SetEnabled(true);
+        }
         break;
 
     case eNotify_OnCloseScene:
@@ -726,6 +736,8 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
             // meters above the terrain (default terrain height is 32)
             viewTM.SetTranslation(Vec3(sx * 0.5f, sy * 0.5f, 34.0f));
             SetViewTM(viewTM);
+
+            UpdateScene();
         }
         break;
 

Code/Sandbox/Editor/LegacyViewportCameraController.cpp

@@ -408,6 +408,13 @@ bool LegacyViewportCameraControllerInstance::HandleInputChannelEvent(const AzFra
         }
     }
 
+    UpdateCursorCapture(shouldCaptureCursor);
+
+    return shouldConsumeEvent;
+}
+
+void LegacyViewportCameraControllerInstance::UpdateCursorCapture(bool shouldCaptureCursor)
+{
     if (m_capturingCursor != shouldCaptureCursor)
     {
         if (shouldCaptureCursor)
@@ -427,8 +434,14 @@ bool LegacyViewportCameraControllerInstance::HandleInputChannelEvent(const AzFra
 
         m_capturingCursor = shouldCaptureCursor;
     }
+}
 
-    return shouldConsumeEvent;
+void LegacyViewportCameraControllerInstance::ResetInputChannels()
+{
+    m_modifiers = 0;
+    m_pressedKeys.clear();
+    UpdateCursorCapture(false);
+    m_inRotateMode = m_inMoveMode = m_inOrbitMode = m_inZoomMode = false;
 }
 
 void LegacyViewportCameraControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)

Code/Sandbox/Editor/LegacyViewportCameraController.h

@@ -35,6 +35,7 @@ namespace SandboxEditor
         explicit LegacyViewportCameraControllerInstance(AzFramework::ViewportId viewport);
 
         bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
+        void ResetInputChannels() override;
         void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
 
     private:
@@ -53,6 +54,7 @@ namespace SandboxEditor
         bool HandleMouseMove(const AzFramework::ScreenPoint& currentMousePos, const AzFramework::ScreenPoint& previousMousePos);
         bool HandleMouseWheel(float zDelta);
         bool IsKeyDown(Qt::Key key) const;
+        void UpdateCursorCapture(bool shouldCaptureCursor);
 
         bool m_inRotateMode = false;
         bool m_inMoveMode = false;

Code/Sandbox/Editor/QtViewPaneManager.cpp

@@ -36,6 +36,8 @@
 #include <algorithm>
 #include <QScopedValueRollback>
 
+#include <AzFramework/API/ApplicationAPI.h>
+
 #include <AzAssetBrowser/AzAssetBrowserWindow.h>
 #include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
 #include <AzQtComponents/Utilities/AutoSettingsGroup.h>
@@ -983,6 +985,11 @@ bool QtViewPaneManager::ClosePanesWithRollback(const QVector<QString>& panesToKe
  */
 void QtViewPaneManager::RestoreDefaultLayout(bool resetSettings)
 {
+    // Get whether the prefab system is enabled
+    bool isPrefabSystemEnabled = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        isPrefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+
     if (resetSettings)
     {
         // We're going to do something destructive (removing all of the viewpane settings). Better confirm with the user
@@ -1022,7 +1029,11 @@ void QtViewPaneManager::RestoreDefaultLayout(bool resetSettings)
         state.viewPanes.push_back(LyViewPane::EntityInspector);
         state.viewPanes.push_back(LyViewPane::AssetBrowser);
         state.viewPanes.push_back(LyViewPane::Console);
-        state.viewPanes.push_back(LyViewPane::LevelInspector);
+
+        if (!isPrefabSystemEnabled)
+        {
+            state.viewPanes.push_back(LyViewPane::LevelInspector);
+        }
 
         state.mainWindowState = m_defaultMainWindowState;
 
@@ -1047,7 +1058,12 @@ void QtViewPaneManager::RestoreDefaultLayout(bool resetSettings)
     const QtViewPane* assetBrowserViewPane = OpenPane(LyViewPane::AssetBrowser, QtViewPane::OpenMode::UseDefaultState);
     const QtViewPane* entityInspectorViewPane = OpenPane(LyViewPane::EntityInspector, QtViewPane::OpenMode::UseDefaultState);
     const QtViewPane* consoleViewPane = OpenPane(LyViewPane::Console, QtViewPane::OpenMode::UseDefaultState);
-    const QtViewPane* levelInspectorPane = OpenPane(LyViewPane::LevelInspector, QtViewPane::OpenMode::UseDefaultState);
+
+    const QtViewPane* levelInspectorPane = nullptr;
+    if (!isPrefabSystemEnabled)
+    {
+        levelInspectorPane = OpenPane(LyViewPane::LevelInspector, QtViewPane::OpenMode::UseDefaultState);
+    }
 
     // This class does all kinds of behind the scenes magic to make docking / restore work, especially with groups
     // so instead of doing our special default layout attach / docking right now, we want to make it happen

Code/Sandbox/Editor/ViewportManipulatorController.cpp

@@ -202,6 +202,12 @@ bool ViewportManipulatorControllerInstance::HandleInputChannelEvent(const AzFram
     return interactionHandled;
 }
 
+void ViewportManipulatorControllerInstance::ResetInputChannels()
+{
+    m_pendingDoubleClicks.clear();
+    m_state = AzToolsFramework::ViewportInteraction::MouseInteraction();
+}
+
 void ViewportManipulatorControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event)
 {
     m_curTime = event.m_time;

Code/Sandbox/Editor/ViewportManipulatorController.h

@@ -26,6 +26,7 @@ namespace SandboxEditor
         explicit ViewportManipulatorControllerInstance(AzFramework::ViewportId viewport);
 
         bool HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event) override;
+        void ResetInputChannels() override;
         void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override;
 
     private:

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp

@@ -143,15 +143,6 @@ ComponentEntityEditorPlugin::ComponentEntityEditorPlugin([[maybe_unused]] IEdito
         LyViewPane::CategoryTools,
         pinnedInspectorOptions);
 
-    ViewPaneOptions levelInspectorOptions;
-    levelInspectorOptions.canHaveMultipleInstances = false;
-    levelInspectorOptions.preferedDockingArea = Qt::RightDockWidgetArea;
-    levelInspectorOptions.paneRect = QRect(50, 50, 400, 700);
-    RegisterViewPane<QComponentLevelEntityEditorInspectorWindow>(
-        LyViewPane::LevelInspector,
-        LyViewPane::CategoryTools,
-        levelInspectorOptions);
-
     bool prefabSystemEnabled = false;
     AzFramework::ApplicationRequests::Bus::BroadcastResult(prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
 
@@ -170,8 +161,14 @@ ComponentEntityEditorPlugin::ComponentEntityEditorPlugin([[maybe_unused]] IEdito
     }
     else
     {
-        // Add the Legacy Outliner to the Tools Menu
+        ViewPaneOptions levelInspectorOptions;
+        levelInspectorOptions.canHaveMultipleInstances = false;
+        levelInspectorOptions.preferedDockingArea = Qt::RightDockWidgetArea;
+        levelInspectorOptions.paneRect = QRect(50, 50, 400, 700);
+        RegisterViewPane<QComponentLevelEntityEditorInspectorWindow>(
+            LyViewPane::LevelInspector, LyViewPane::CategoryTools, levelInspectorOptions);
 
+        // Add the Legacy Outliner to the Tools Menu
         ViewPaneOptions outlinerOptions;
         outlinerOptions.canHaveMultipleInstances = true;
         outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;