From 7960c68b487622f0e99ed8f0f7d72699276d85b5 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 14 Sep 2021 19:16:22 +0100 Subject: [PATCH] IsViewportStateBeingTracked -> IsViewportModeTracked 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 7d51dd64a1..53b0729bac 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h @@ -34,7 +34,7 @@ namespace AzToolsFramework virtual size_t GetTrackedViewportCount() const = 0; //! Returns true if the specified viewport is being tracked, otherwise false. - virtual bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; + virtual bool IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; private: }; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h index 7d51dd64a1..53b0729bac 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h @@ -34,7 +34,7 @@ namespace AzToolsFramework virtual size_t GetTrackedViewportCount() const = 0; //! Returns true if the specified viewport is being tracked, otherwise false. - virtual bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; + virtual bool IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; private: }; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp index 3d88d7d93e..2eb8cdb9d8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp @@ -114,7 +114,7 @@ namespace AzToolsFramework return m_viewportEditorModeStates.size(); } - bool ViewportEditorModeTracker::IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const + bool ViewportEditorModeTracker::IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const { return m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id) > 0; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h index 12a64cbbf9..0ec5a31ddd 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h @@ -53,7 +53,7 @@ namespace AzToolsFramework void ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) override; const ViewportEditorModesInterface* GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; size_t GetTrackedViewportCount() const override; - bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; + bool IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; private: using ViewportEditorModess = AZStd::unordered_map; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp index 3d88d7d93e..2eb8cdb9d8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp @@ -114,7 +114,7 @@ namespace AzToolsFramework return m_viewportEditorModeStates.size(); } - bool ViewportEditorModeTracker::IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const + bool ViewportEditorModeTracker::IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const { return m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id) > 0; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h index 12a64cbbf9..0ec5a31ddd 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h @@ -53,7 +53,7 @@ namespace AzToolsFramework void ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) override; const ViewportEditorModesInterface* GetViewportEditorModes(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; size_t GetTrackedViewportCount() const override; - bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; + bool IsViewportModeTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; private: using ViewportEditorModess = AZStd::unordered_map; diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp index 8e9b1ba59b..7603f68b64 100644 --- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp @@ -290,7 +290,7 @@ namespace UnitTest { // Given a viewport not currently being tracked const ViewportId viewportid = 0; - EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); // When a mode is activated for that viewport @@ -299,7 +299,7 @@ namespace UnitTest const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); // Expect that viewport to now be tracked - EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); // Expect the mode for that viewport to be active @@ -310,7 +310,7 @@ namespace UnitTest { // Given a viewport not currently being tracked const ViewportId viewportid = 0; - EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); // When a mode is deactivated for that viewport @@ -324,7 +324,7 @@ namespace UnitTest // Expect that viewport to now be tracked const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); - EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); // Expect the mode for that viewport to be inactive EXPECT_NE(viewportEditorModeState, nullptr); @@ -334,7 +334,7 @@ namespace UnitTest TEST_F(ViewportEditorModeTrackerTestFixture, GettingNonExistentViewportEditorModesForIdReturnsNull) { const ViewportId viewportid = 0; - EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); } @@ -342,7 +342,7 @@ namespace UnitTest { // Given a viewport not currently tracked const ViewportId viewportid = 0; - EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); const auto editorMode = ViewportEditorMode::Default; @@ -360,7 +360,7 @@ namespace UnitTest // Expect the mode to be active for the viewport const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); - EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_TRUE(viewportEditorModeState->IsModeActive(editorMode)); } @@ -374,7 +374,7 @@ namespace UnitTest // Expect the mode to still be active for the viewport const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); - EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_TRUE(viewportEditorModeState->IsModeActive(editorMode)); } @@ -384,7 +384,7 @@ namespace UnitTest { // Given a viewport not currently tracked const ViewportId viewportid = 0; - EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_EQ(m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }), nullptr); const auto editorMode = ViewportEditorMode::Default; @@ -403,7 +403,7 @@ namespace UnitTest // Expect the mode to be inctive for the viewport const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); - EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_FALSE(viewportEditorModeState->IsModeActive(editorMode)); } @@ -418,7 +418,7 @@ namespace UnitTest // Expect the mode to still be inactive for the viewport const auto* viewportEditorModeState = m_viewportEditorModeStteTracker.GetViewportEditorModes({ viewportid }); - EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); + EXPECT_TRUE(m_viewportEditorModeStteTracker.IsViewportModeTracked({ viewportid })); EXPECT_NE(viewportEditorModeState, nullptr); EXPECT_FALSE(viewportEditorModeState->IsModeActive(editorMode)); }