From 35a228b08f988bc219a67fc78f63253e69a65984 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 14 Sep 2021 18:57:36 +0100 Subject: [PATCH] GetEditorModeState ->GetViewportEditorModes Signed-off-by: John --- .../ViewportEditorModeStateTrackerInterface.h | 2 +- .../API/ViewportEditorModeTrackerInterface.h | 2 +- .../ViewportEditorModeStateTracker.cpp | 2 +- .../ViewportEditorModeStateTracker.h | 2 +- .../ViewportEditorModeTracker.cpp | 2 +- .../ViewportEditorModeTracker.h | 2 +- .../Viewport/ViewportEditorModeTests.cpp | 22 +++++++++---------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h index 09a39b1ec1..706fd98c5e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h @@ -28,7 +28,7 @@ namespace AzToolsFramework virtual void ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) = 0; //! Attempts to retrieve the editor mode state for the specified viewport, otherwise returns nullptr. - virtual const ViewportEditorModesInterface* GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; + virtual const ViewportEditorModesInterface* GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; //! Returns the number of viewports currently being tracked. virtual size_t GetNumTrackedViewports() const = 0; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h index 09a39b1ec1..706fd98c5e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h @@ -28,7 +28,7 @@ namespace AzToolsFramework virtual void ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) = 0; //! Attempts to retrieve the editor mode state for the specified viewport, otherwise returns nullptr. - virtual const ViewportEditorModesInterface* GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; + virtual const ViewportEditorModesInterface* GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; //! Returns the number of viewports currently being tracked. virtual size_t GetNumTrackedViewports() const = 0; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp index 5c9104ab18..e78f564c9d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp @@ -96,7 +96,7 @@ namespace AzToolsFramework viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeExit, *editorModeStates, mode); } - const ViewportEditorModesInterface* ViewportEditorModeTracker::GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const + const ViewportEditorModesInterface* ViewportEditorModeTracker::GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const { if (auto editorModeStates = m_viewportEditorModeStates.find(viewportEditorModeInfo.m_id); editorModeStates != m_viewportEditorModeStates.end()) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h index 23c02dbcdf..be090e6f1f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h @@ -51,7 +51,7 @@ namespace AzToolsFramework // ViewportEditorModeTrackerInterface ... void EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) override; void ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) override; - const ViewportEditorModesInterface* GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; + const ViewportEditorModesInterface* GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; size_t GetNumTrackedViewports() const override; bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp index 5c9104ab18..e78f564c9d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp @@ -96,7 +96,7 @@ namespace AzToolsFramework viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeExit, *editorModeStates, mode); } - const ViewportEditorModesInterface* ViewportEditorModeTracker::GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const + const ViewportEditorModesInterface* ViewportEditorModeTracker::GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const { if (auto editorModeStates = m_viewportEditorModeStates.find(viewportEditorModeInfo.m_id); editorModeStates != m_viewportEditorModeStates.end()) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h index 23c02dbcdf..be090e6f1f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h @@ -51,7 +51,7 @@ namespace AzToolsFramework // ViewportEditorModeTrackerInterface ... void EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) override; void ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) override; - const ViewportEditorModesInterface* GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; + const ViewportEditorModesInterface* GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; size_t GetNumTrackedViewports() const override; bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp index 63f975acdc..d59e017579 100644 --- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp @@ -291,12 +291,12 @@ namespace UnitTest // Given a viewport not currently being tracked const ViewportId viewportid = 0; EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); - EXPECT_EQ(m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }), nullptr); + EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); // When a mode is activated for that viewport const auto editorMode = ViewportEditorMode::Default; m_viewportEditorModeStteTracker.EnterMode({ viewportid }, editorMode); - const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }); + const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); // Expect that viewport to now be tracked EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); @@ -311,7 +311,7 @@ namespace UnitTest // Given a viewport not currently being tracked const ViewportId viewportid = 0; EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); - EXPECT_EQ(m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }), nullptr); + EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); // When a mode is deactivated for that viewport const auto editorMode = ViewportEditorMode::Default; @@ -323,7 +323,7 @@ namespace UnitTest EXPECT_EQ(errorHandler.GetExpectedWarningCount(), 1); // Expect that viewport to now be tracked - const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }); + const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); // Expect the mode for that viewport to be inactive @@ -335,7 +335,7 @@ namespace UnitTest { const ViewportId viewportid = 0; EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); - EXPECT_EQ(m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }), nullptr); + EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); } TEST_F(ViewportEditorModeTrackerTestFixture, EnteringViewportEditorModesForExistingIdInThatStateIssuesWarningMsg) @@ -343,7 +343,7 @@ namespace UnitTest // Given a viewport not currently tracked const ViewportId viewportid = 0; EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); - EXPECT_EQ(m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }), nullptr); + EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); const auto editorMode = ViewportEditorMode::Default; const auto expectedWarning = AZStd::string::format( @@ -359,7 +359,7 @@ namespace UnitTest EXPECT_EQ(errorHandler.GetExpectedWarningCount(), 0); // Expect the mode to be active for the viewport - const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }); + const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_TRUE(viewportEditorModeState->IsModeActive(editorMode)); @@ -373,7 +373,7 @@ namespace UnitTest EXPECT_EQ(errorHandler.GetExpectedWarningCount(), 1); // Expect the mode to still be active for the viewport - const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }); + const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_TRUE(viewportEditorModeState->IsModeActive(editorMode)); @@ -385,7 +385,7 @@ namespace UnitTest // Given a viewport not currently tracked const ViewportId viewportid = 0; EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); - EXPECT_EQ(m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }), nullptr); + EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); const auto editorMode = ViewportEditorMode::Default; const auto expectedWarning = @@ -402,7 +402,7 @@ namespace UnitTest EXPECT_EQ(errorHandler.GetExpectedWarningCount(), 0); // Expect the mode to be inctive for the viewport - const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }); + const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_FALSE(viewportEditorModeState->IsModeActive(editorMode)); @@ -417,7 +417,7 @@ namespace UnitTest EXPECT_EQ(errorHandler.GetExpectedWarningCount(), 1); // Expect the mode to still be inactive for the viewport - const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }); + const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_FALSE(viewportEditorModeState->IsModeActive(editorMode));