From 9553f4cc0f3d66578b85bc64d9dd12dfd541f51d Mon Sep 17 00:00:00 2001 From: John Date: Tue, 14 Sep 2021 18:56:41 +0100 Subject: [PATCH] ViewportEditorModesTracker -> ViewportEditorModeTracker Signed-off-by: John --- ...ViewportEditorModeStateTrackerInterface.h} | 8 +- .../API/ViewportEditorModeTrackerInterface.h | 42 ++++++ ...iewportEditorModeTrackerNotificationBus.h} | 0 ...cpp => ViewportEditorModeStateTracker.cpp} | 26 ++-- ...ker.h => ViewportEditorModeStateTracker.h} | 10 +- .../ViewportEditorModeTracker.cpp | 121 ++++++++++++++++++ .../ViewportEditorModeTracker.h | 62 +++++++++ .../aztoolsframework_files.cmake | 8 +- .../Viewport/ViewportEditorModeTests.cpp | 22 ++-- 9 files changed, 262 insertions(+), 37 deletions(-) rename Code/Framework/AzToolsFramework/AzToolsFramework/API/{ViewportEditorModesTrackerInterface.h => ViewportEditorModeStateTrackerInterface.h} (83%) create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h rename Code/Framework/AzToolsFramework/AzToolsFramework/API/{ViewportEditorModesTrackerNotificationBus.h => ViewportEditorModeTrackerNotificationBus.h} (100%) rename Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/{ViewportEditorModesTracker.cpp => ViewportEditorModeStateTracker.cpp} (76%) rename Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/{ViewportEditorModesTracker.h => ViewportEditorModeStateTracker.h} (88%) create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModesTrackerInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h similarity index 83% rename from Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModesTrackerInterface.h rename to Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h index b13085bc83..09a39b1ec1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModesTrackerInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeStateTrackerInterface.h @@ -9,17 +9,17 @@ #pragma once #include -#include +#include namespace AzToolsFramework { //! The AZ::Interface of the central editor mode state tracker for all viewports. - class ViewportEditorModesTrackerInterface + class ViewportEditorModeTrackerInterface { public: - AZ_RTTI(ViewportEditorModesTrackerInterface, "{7D72A4F7-2147-4ED9-A315-E456A3BE3CF6}"); + AZ_RTTI(ViewportEditorModeTrackerInterface, "{7D72A4F7-2147-4ED9-A315-E456A3BE3CF6}"); - virtual ~ViewportEditorModesTrackerInterface() = default; + virtual ~ViewportEditorModeTrackerInterface() = default; //! Enters the specified editor mode for the specified viewport. virtual void EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) = 0; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h new file mode 100644 index 0000000000..09a39b1ec1 --- /dev/null +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerInterface.h @@ -0,0 +1,42 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. + * For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#pragma once + +#include +#include + +namespace AzToolsFramework +{ + //! The AZ::Interface of the central editor mode state tracker for all viewports. + class ViewportEditorModeTrackerInterface + { + public: + AZ_RTTI(ViewportEditorModeTrackerInterface, "{7D72A4F7-2147-4ED9-A315-E456A3BE3CF6}"); + + virtual ~ViewportEditorModeTrackerInterface() = default; + + //! Enters the specified editor mode for the specified viewport. + virtual void EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) = 0; + + //! Exits the specified editor mode for the specified viewport. + 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; + + //! Returns the number of viewports currently being tracked. + virtual size_t GetNumTrackedViewports() const = 0; + + //! Returns true if the specified viewport is being tracked, otherwise false. + virtual bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const = 0; + + private: + }; +} // namespace AzToolsFramework + diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModesTrackerNotificationBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h similarity index 100% rename from Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModesTrackerNotificationBus.h rename to Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.h diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModesTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp similarity index 76% rename from Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModesTracker.cpp rename to Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp index 5e6f73f963..5c9104ab18 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModesTracker.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.cpp @@ -6,8 +6,8 @@ * */ -#include -#include +#include +#include namespace AzToolsFramework { @@ -43,23 +43,23 @@ namespace AzToolsFramework return m_editorModes[static_cast(mode)]; } - void ViewportEditorModesTracker::RegisterInterface() + void ViewportEditorModeTracker::RegisterInterface() { - if (AZ::Interface::Get() == nullptr) + if (AZ::Interface::Get() == nullptr) { - AZ::Interface::Register(this); + AZ::Interface::Register(this); } } - void ViewportEditorModesTracker::UnregisterInterface() + void ViewportEditorModeTracker::UnregisterInterface() { - if (AZ::Interface::Get() != nullptr) + if (AZ::Interface::Get() != nullptr) { - AZ::Interface::Unregister(this); + AZ::Interface::Unregister(this); } } - void ViewportEditorModesTracker::EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) + void ViewportEditorModeTracker::EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) { auto& editorModeStates = m_viewportEditorModeStates[viewportEditorModeInfo.m_id]; AZ_Warning( @@ -71,7 +71,7 @@ namespace AzToolsFramework viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeEnter, editorModeStates, mode); } - void ViewportEditorModesTracker::ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) + void ViewportEditorModeTracker::ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) { ViewportEditorModes* editorModeStates = nullptr; if (m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id)) @@ -96,7 +96,7 @@ namespace AzToolsFramework viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeExit, *editorModeStates, mode); } - const ViewportEditorModesInterface* ViewportEditorModesTracker::GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const + const ViewportEditorModesInterface* ViewportEditorModeTracker::GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const { if (auto editorModeStates = m_viewportEditorModeStates.find(viewportEditorModeInfo.m_id); editorModeStates != m_viewportEditorModeStates.end()) @@ -109,12 +109,12 @@ namespace AzToolsFramework } } - size_t ViewportEditorModesTracker::GetNumTrackedViewports() const + size_t ViewportEditorModeTracker::GetNumTrackedViewports() const { return m_viewportEditorModeStates.size(); } - bool ViewportEditorModesTracker::IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const + bool ViewportEditorModeTracker::IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const { return m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id) > 0; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModesTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h similarity index 88% rename from Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModesTracker.h rename to Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h index 4acd7f09b6..23c02dbcdf 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModesTracker.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeStateTracker.h @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include namespace AzToolsFramework { @@ -38,8 +38,8 @@ namespace AzToolsFramework }; //! The implementation of the central editor mode state tracker for all viewports. - class ViewportEditorModesTracker - : public ViewportEditorModesTrackerInterface + class ViewportEditorModeTracker + : public ViewportEditorModeTrackerInterface { public: //! Registers this object with the AZ::Interface. @@ -48,7 +48,7 @@ namespace AzToolsFramework //! Unregisters this object with the AZ::Interface. void UnregisterInterface(); - // ViewportEditorModesTrackerInterface ... + // 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; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp new file mode 100644 index 0000000000..5c9104ab18 --- /dev/null +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.cpp @@ -0,0 +1,121 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. + * For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#include +#include + +namespace AzToolsFramework +{ + static constexpr const char* ViewportEditorModeLogWindow = "ViewportEditorMode"; + + void ViewportEditorModes::SetModeActive(ViewportEditorMode mode) + { + if (const AZ::u32 modeIndex = static_cast(mode); + modeIndex < NumEditorModes) + { + m_editorModes[modeIndex] = true; + } + else + { + AZ_Error(ViewportEditorModeLogWindow, false, "Cannot activate mode %u, mode is not recognized", modeIndex) + } + } + + void ViewportEditorModes::SetModeInactive(ViewportEditorMode mode) + { + if (const AZ::u32 modeIndex = static_cast(mode); modeIndex < NumEditorModes) + { + m_editorModes[modeIndex] = false; + } + else + { + AZ_Error(ViewportEditorModeLogWindow, false, "Cannot deactivate mode %u, mode is not recognized", modeIndex) + } + } + + bool ViewportEditorModes::IsModeActive(ViewportEditorMode mode) const + { + return m_editorModes[static_cast(mode)]; + } + + void ViewportEditorModeTracker::RegisterInterface() + { + if (AZ::Interface::Get() == nullptr) + { + AZ::Interface::Register(this); + } + } + + void ViewportEditorModeTracker::UnregisterInterface() + { + if (AZ::Interface::Get() != nullptr) + { + AZ::Interface::Unregister(this); + } + } + + void ViewportEditorModeTracker::EnterMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) + { + auto& editorModeStates = m_viewportEditorModeStates[viewportEditorModeInfo.m_id]; + AZ_Warning( + ViewportEditorModeLogWindow, !editorModeStates.IsModeActive(mode), + AZStd::string::format( + "Duplicate call to EnterMode for mode '%u' on id '%i'", static_cast(mode), viewportEditorModeInfo.m_id).c_str()); + editorModeStates.SetModeActive(mode); + ViewportEditorModeNotificationsBus::Event( + viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeEnter, editorModeStates, mode); + } + + void ViewportEditorModeTracker::ExitMode(const ViewportEditorModeInfo& viewportEditorModeInfo, ViewportEditorMode mode) + { + ViewportEditorModes* editorModeStates = nullptr; + if (m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id)) + { + editorModeStates = &m_viewportEditorModeStates.at(viewportEditorModeInfo.m_id); + AZ_Warning( + ViewportEditorModeLogWindow, editorModeStates->IsModeActive(mode), + AZStd::string::format( + "Duplicate call to ExitMode for mode '%u' on id '%i'", static_cast(mode), viewportEditorModeInfo.m_id).c_str()); + } + else + { + AZ_Warning( + ViewportEditorModeLogWindow, false, "Call to ExitMode for mode '%u' on id '%i' without precursor call to EnterMode", + static_cast(mode), viewportEditorModeInfo.m_id); + + editorModeStates = &m_viewportEditorModeStates[viewportEditorModeInfo.m_id]; + } + + editorModeStates->SetModeInactive(mode); + ViewportEditorModeNotificationsBus::Event( + viewportEditorModeInfo.m_id, &ViewportEditorModeNotificationsBus::Events::OnEditorModeExit, *editorModeStates, mode); + } + + const ViewportEditorModesInterface* ViewportEditorModeTracker::GetEditorModeState(const ViewportEditorModeInfo& viewportEditorModeInfo) const + { + if (auto editorModeStates = m_viewportEditorModeStates.find(viewportEditorModeInfo.m_id); + editorModeStates != m_viewportEditorModeStates.end()) + { + return &editorModeStates->second; + } + else + { + return nullptr; + } + } + + size_t ViewportEditorModeTracker::GetNumTrackedViewports() const + { + return m_viewportEditorModeStates.size(); + } + + bool ViewportEditorModeTracker::IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const + { + return m_viewportEditorModeStates.count(viewportEditorModeInfo.m_id) > 0; + } +} // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h new file mode 100644 index 0000000000..23c02dbcdf --- /dev/null +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/ViewportEditorModeTracker.h @@ -0,0 +1,62 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. + * For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#pragma once + +#include +#include +#include +#include +#include + +namespace AzToolsFramework +{ + //! The encapsulation of the editor modes for a given viewport. + class ViewportEditorModes + : public ViewportEditorModesInterface + { + public: + + //! The number of currently supported viewport editor modes. + static constexpr AZ::u8 NumEditorModes = 4; + + //! Sets the specified mode as active. + void SetModeActive(ViewportEditorMode mode); + + // Sets the specified mode as inactive. + void SetModeInactive(ViewportEditorMode mode); + + // ViewportEditorModesInterface ... + bool IsModeActive(ViewportEditorMode mode) const override; + private: + AZStd::array m_editorModes{}; //!< State flags to track active/inactive status of viewport editor modes. + }; + + //! The implementation of the central editor mode state tracker for all viewports. + class ViewportEditorModeTracker + : public ViewportEditorModeTrackerInterface + { + public: + //! Registers this object with the AZ::Interface. + void RegisterInterface(); + + //! Unregisters this object with the AZ::Interface. + void UnregisterInterface(); + + // 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; + size_t GetNumTrackedViewports() const override; + bool IsViewportStateBeingTracked(const ViewportEditorModeInfo& viewportEditorModeInfo) const override; + + private: + using ViewportEditorModess = AZStd::unordered_map; + ViewportEditorModess m_viewportEditorModeStates; //!< Editor mode state per viewport. + }; +} // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake index 65bc4e6b50..3932190d8e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake @@ -34,7 +34,7 @@ set(FILES API/EditorAnimationSystemRequestBus.h API/EditorEntityAPI.h API/EditorLevelNotificationBus.h - API/ViewportEditorModesTrackerNotificationBus.h + API/ViewportEditorModeTrackerNotificationBus.h API/EditorVegetationRequestsBus.h API/EditorPythonConsoleBus.h API/EditorPythonRunnerRequestsBus.h @@ -45,7 +45,7 @@ set(FILES API/EntityCompositionNotificationBus.h API/EditorViewportIconDisplayInterface.h API/ViewPaneOptions.h - API/ViewportEditorModesTrackerInterface.h + API/ViewportEditorModeTrackerInterface.h Application/Ticker.h Application/Ticker.cpp Application/EditorEntityManager.cpp @@ -540,8 +540,8 @@ set(FILES ViewportSelection/EditorTransformComponentSelectionRequestBus.cpp ViewportSelection/EditorVisibleEntityDataCache.h ViewportSelection/EditorVisibleEntityDataCache.cpp - ViewportSelection/ViewportEditorModesTracker.cpp - ViewportSelection/ViewportEditorModesTracker.h + ViewportSelection/ViewportEditorModeTracker.cpp + ViewportSelection/ViewportEditorModeTracker.h ToolsFileUtils/ToolsFileUtils.h AssetBrowser/AssetBrowserBus.h AssetBrowser/AssetBrowserSourceDropBus.h diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp index 777fbe0585..63f975acdc 100644 --- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp @@ -8,13 +8,13 @@ #include #include -#include +#include namespace UnitTest { using ViewportEditorMode = AzToolsFramework::ViewportEditorMode; using ViewportEditorModes = AzToolsFramework::ViewportEditorModes; - using ViewportEditorModesTracker = AzToolsFramework::ViewportEditorModesTracker; + using ViewportEditorModeTracker = AzToolsFramework::ViewportEditorModeTracker; using ViewportEditorModeInfo = AzToolsFramework::ViewportEditorModeInfo; using ViewportId = ViewportEditorModeInfo::IdType; using ViewportEditorModesInterface = AzToolsFramework::ViewportEditorModesInterface; @@ -58,11 +58,11 @@ namespace UnitTest }; // Fixture for testing the viewport editor mode state tracker - class ViewportEditorModesTrackerTestFixture + class ViewportEditorModeTrackerTestFixture : public ToolsApplicationFixture { public: - ViewportEditorModesTracker m_viewportEditorModeStteTracker; + ViewportEditorModeTracker m_viewportEditorModeStteTracker; }; // Subscriber of viewport editor mode notifications for a single viewport that expects a single mode to be activated/deactivated @@ -117,7 +117,7 @@ namespace UnitTest // Fixture for testing viewport editor mode notifications publishing class ViewportEditorModePublisherTestFixture - : public ViewportEditorModesTrackerTestFixture + : public ViewportEditorModeTrackerTestFixture { public: @@ -281,12 +281,12 @@ namespace UnitTest EXPECT_EQ(1, UnitTest::TestRunner::Instance().StopAssertTests()); } - TEST_F(ViewportEditorModesTrackerTestFixture, InitialCentralStateTrackerHasNoViewportEditorModess) + TEST_F(ViewportEditorModeTrackerTestFixture, InitialCentralStateTrackerHasNoViewportEditorModess) { EXPECT_EQ(m_viewportEditorModeStteTracker.GetNumTrackedViewports(), 0); } - TEST_F(ViewportEditorModesTrackerTestFixture, EnteringViewportEditorModeForNonExistentIdCreatesViewportEditorModesForThatId) + TEST_F(ViewportEditorModeTrackerTestFixture, EnteringViewportEditorModeForNonExistentIdCreatesViewportEditorModesForThatId) { // Given a viewport not currently being tracked const ViewportId viewportid = 0; @@ -306,7 +306,7 @@ namespace UnitTest EXPECT_TRUE(viewportEditorModeState->IsModeActive(editorMode)); } - TEST_F(ViewportEditorModesTrackerTestFixture, ExitingViewportEditorModeForNonExistentIdCreatesViewportEditorModesForThatIdButIssuesErrorMsg) + TEST_F(ViewportEditorModeTrackerTestFixture, ExitingViewportEditorModeForNonExistentIdCreatesViewportEditorModesForThatIdButIssuesErrorMsg) { // Given a viewport not currently being tracked const ViewportId viewportid = 0; @@ -331,14 +331,14 @@ namespace UnitTest EXPECT_FALSE(viewportEditorModeState->IsModeActive(editorMode)); } - TEST_F(ViewportEditorModesTrackerTestFixture, GettingNonExistentViewportEditorModesForIdReturnsNull) + TEST_F(ViewportEditorModeTrackerTestFixture, GettingNonExistentViewportEditorModesForIdReturnsNull) { const ViewportId viewportid = 0; EXPECT_FALSE(m_viewportEditorModeStteTracker.IsViewportStateBeingTracked({ viewportid })); EXPECT_EQ(m_viewportEditorModeStteTracker.GetEditorModeState({ viewportid }), nullptr); } - TEST_F(ViewportEditorModesTrackerTestFixture, EnteringViewportEditorModesForExistingIdInThatStateIssuesWarningMsg) + TEST_F(ViewportEditorModeTrackerTestFixture, EnteringViewportEditorModesForExistingIdInThatStateIssuesWarningMsg) { // Given a viewport not currently tracked const ViewportId viewportid = 0; @@ -380,7 +380,7 @@ namespace UnitTest } } - TEST_F(ViewportEditorModesTrackerTestFixture, ExitingViewportEditorModesForExistingIdNotInThatStateIssuesWarningMsg) + TEST_F(ViewportEditorModeTrackerTestFixture, ExitingViewportEditorModesForExistingIdNotInThatStateIssuesWarningMsg) { // Given a viewport not currently tracked const ViewportId viewportid = 0;