diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h index 7aaa26c01b..a9949d382e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h @@ -277,20 +277,6 @@ namespace AzToolsFramework } // namespace ViewportInteraction - /// Temporary bus to query if the new Viewport Interaction Model mode is enabled or not. - class NewViewportInteractionModelEnabledRequests - : public AZ::EBusTraits - { - public: - virtual bool IsNewViewportInteractionModelEnabled() = 0; - - protected: - ~NewViewportInteractionModelEnabledRequests() = default; - }; - - /// Type to inherit to implement NewViewportInteractionModelEnabledRequests - using NewViewportInteractionModelEnabledRequestBus = AZ::EBus; - /// Utility function to return EntityContextId. inline AzFramework::EntityContextId GetEntityContextId() { @@ -300,16 +286,4 @@ namespace AzToolsFramework return entityContextId; } - - /// Utility function to return if the new Viewport Interaction Model - /// is enabled (wraps NewViewportInteractionModelEnabledRequests). - inline bool IsNewViewportInteractionModelEnabled() - { - bool newViewportInteractionModelEnabled = false; - NewViewportInteractionModelEnabledRequestBus::BroadcastResult( - newViewportInteractionModelEnabled, - &NewViewportInteractionModelEnabledRequests::IsNewViewportInteractionModelEnabled); - - return newViewportInteractionModelEnabled; - } } // namespace AzToolsFramework diff --git a/Code/Sandbox/Editor/IEditor.h b/Code/Sandbox/Editor/IEditor.h index 4a26e7475f..e1f41b9f41 100644 --- a/Code/Sandbox/Editor/IEditor.h +++ b/Code/Sandbox/Editor/IEditor.h @@ -759,8 +759,6 @@ struct IEditor // reloads the plugins virtual void LoadPlugins() = 0; - - virtual bool IsNewViewportInteractionModelEnabled() const = 0; }; //! Callback used by editor when initializing for info in UI dialogs diff --git a/Code/Sandbox/Editor/IEditorImpl.cpp b/Code/Sandbox/Editor/IEditorImpl.cpp index 04d7b88fb6..a81aff86a9 100644 --- a/Code/Sandbox/Editor/IEditorImpl.cpp +++ b/Code/Sandbox/Editor/IEditorImpl.cpp @@ -1799,11 +1799,6 @@ void CEditorImpl::DestroyQMimeData(QMimeData* data) const delete data; } -bool CEditorImpl::IsNewViewportInteractionModelEnabled() const -{ - return m_isNewViewportInteractionModelEnabled; -} - IEditorPanelUtils* CEditorImpl::GetEditorPanelUtils() { return m_panelEditorUtils; diff --git a/Code/Sandbox/Editor/IEditorImpl.h b/Code/Sandbox/Editor/IEditorImpl.h index cde1012b94..908136297b 100644 --- a/Code/Sandbox/Editor/IEditorImpl.h +++ b/Code/Sandbox/Editor/IEditorImpl.h @@ -339,8 +339,6 @@ public: QMimeData* CreateQMimeData() const override; void DestroyQMimeData(QMimeData* data) const override; - bool IsNewViewportInteractionModelEnabled() const override; - protected: AZStd::string LoadProjectIdFromProjectData(); @@ -442,7 +440,5 @@ protected: CryMutex m_pluginMutex; // protect any pointers that come from plugins, such as the source control cached pointer. static const char* m_crashLogFileName; - - bool m_isNewViewportInteractionModelEnabled = true; }; diff --git a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h b/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h index b51a3d7a4a..27ac7e8a46 100644 --- a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h +++ b/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h @@ -200,7 +200,6 @@ public: MOCK_METHOD0(GetLogFile, ILogFile* ()); MOCK_METHOD0(UnloadPlugins, void()); MOCK_METHOD0(LoadPlugins, void()); - MOCK_CONST_METHOD0(IsNewViewportInteractionModelEnabled, bool()); MOCK_METHOD1(GetSearchPath, QString(EEditorPathName)); MOCK_METHOD0(GetEditorPanelUtils, IEditorPanelUtils* ()); diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp index aab52802ff..ecfb155d79 100644 --- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp +++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp @@ -172,7 +172,6 @@ void SandboxIntegrationManager::Setup() AzFramework::DisplayContextRequestBus::Handler::BusConnect(); SetupFileExtensionMap(); - AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler::BusConnect(); MainWindow::instance()->GetActionManager()->RegisterActionHandler(ID_FILE_SAVE_SLICE_TO_ROOT, [this]() { SaveSlice(false); @@ -376,7 +375,6 @@ void SandboxIntegrationManager::GetEntitiesInSlices( void SandboxIntegrationManager::Teardown() { AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler::BusDisconnect(); - AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler::BusDisconnect(); AzFramework::DisplayContextRequestBus::Handler::BusDisconnect(); if( m_debugDisplayBusImplementationActive) { @@ -2772,11 +2770,6 @@ void SandboxIntegrationManager::PopMatrix() } } -bool SandboxIntegrationManager::IsNewViewportInteractionModelEnabled() -{ - return GetIEditor()->IsNewViewportInteractionModelEnabled(); -} - bool SandboxIntegrationManager::DisplayHelpersVisible() { return GetIEditor()->GetDisplaySettings()->IsDisplayHelpers(); diff --git a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h index 1bcffa8f2c..0cbfe1df93 100644 --- a/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h +++ b/Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h @@ -104,7 +104,6 @@ class SandboxIntegrationManager , private AzToolsFramework::EditorEntityContextNotificationBus::Handler , private AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler , private IUndoManagerListener - , private AzToolsFramework::NewViewportInteractionModelEnabledRequestBus::Handler , private AzToolsFramework::Layers::EditorLayerComponentNotificationBus::Handler { public: @@ -275,9 +274,6 @@ private: void SetDC(DisplayContext* dc) override; DisplayContext* GetDC() override; - // NewViewportInteractionModelEnabledRequestBus - bool IsNewViewportInteractionModelEnabled() override; - // Context menu handlers. void ContextMenu_NewEntity(); AZ::EntityId ContextMenu_NewLayer();