Add support for border in Focus Mode (#4692)

* restore component mode border Signed-off-by: hultonha <hultonha@amazon.co.uk> * add viewport border for focus mode, remove dead code in ObjectManager Signed-off-by: hultonha <hultonha@amazon.co.uk> * ensure the focus mode border is restored when leaving component mode Signed-off-by: hultonha <hultonha@amazon.co.uk> * update FocusModeNotification call order after merge from development Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-10-15 12:56:05 +01:00
parent bcc0861623
commit 5c8a1b573e
12 changed files with 130 additions and 81 deletions
@@ -137,6 +137,7 @@ namespace AzToolsFramework
            if (componentTypeIt == m_activeComponentTypes.end())
            {
                m_activeComponentTypes.push_back(componentType);
+                m_viewportUiHandlers.emplace_back(componentType);
            }

            // see if we already have a ComponentModeBuilder for the specific component on this entity
@@ -225,6 +226,7 @@ namespace AzToolsFramework
            if (!m_entitiesAndComponentModes.empty())
            {
                RefreshActions();
+                PopulateViewportUi();
            }

            // if entering ComponentMode not as an undo/redo step (an action was
@@ -285,6 +287,10 @@ namespace AzToolsFramework
                componentModeCommand.release();
            }

+            // remove the component mode viewport border
+            ViewportUi::ViewportUiRequestBus::Event(
+                ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RemoveViewportBorder);
+
            // notify listeners the editor has left ComponentMode - listeners may
            // wish to modify state to indicate this (e.g. appearance, functionality etc.)
            m_viewportEditorModeTracker->DeactivateMode({ GetEntityContextId() }, ViewportEditorMode::Component);
@@ -301,6 +307,7 @@ namespace AzToolsFramework
            }
            m_entitiesAndComponentModeBuilders.clear();
            m_activeComponentTypes.clear();
+            m_viewportUiHandlers.clear();

            m_componentMode = false;
            m_selectedComponentModeIndex = 0;
@@ -385,6 +392,24 @@ namespace AzToolsFramework
            return m_activeComponentTypes.size() > 1;
        }

+        static ComponentModeViewportUi* FindViewportUiHandlerForType(
+            AZStd::vector<ComponentModeViewportUi>& viewportUiHandlers, const AZ::Uuid& componentType)
+        {
+            auto handler = AZStd::find_if(
+                viewportUiHandlers.begin(), viewportUiHandlers.end(),
+                [componentType](const ComponentModeViewportUi& handler)
+                {
+                    return handler.GetComponentType() == componentType;
+                });
+
+            if (handler == viewportUiHandlers.end())
+            {
+                return nullptr;
+            }
+
+            return handler;
+        }
+
        bool ComponentModeCollection::ActiveComponentModeChanged(const AZ::Uuid& previousComponentType)
        {
            if (m_activeComponentTypes[m_selectedComponentModeIndex] != previousComponentType)
@@ -410,6 +435,20 @@ namespace AzToolsFramework
                    // replace the current component mode by invoking the builder
                    // for the new 'active' component mode
                    componentMode.m_componentMode = componentModeBuilder->m_componentModeBuilder();
+
+                    // populate the viewport UI with the new component mode
+                    PopulateViewportUi();
+
+                    // set the appropriate viewportUiHandler to active
+                    if (auto viewportUiHandler =
+                            FindViewportUiHandlerForType(m_viewportUiHandlers, m_activeComponentTypes[m_selectedComponentModeIndex]))
+                    {
+                        viewportUiHandler->SetComponentModeViewportUiActive(true);
+                    }
+
+                    ViewportUi::ViewportUiRequestBus::Event(
+                        ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder,
+                        componentMode.m_componentMode->GetComponentModeName().c_str());
                }

                RefreshActions();
@@ -519,5 +558,18 @@ namespace AzToolsFramework
            }
        }

+        void ComponentModeCollection::PopulateViewportUi()
+        {
+            // update viewport UI for new component type
+            if (m_selectedComponentModeIndex < m_activeComponentTypes.size())
+            {
+                // iterate over all entities and their active Component Mode, populate viewport UI for the new mode
+                for (auto& entityAndComponentMode : m_entitiesAndComponentModes)
+                {
+                    // build viewport UI based on current state
+                    entityAndComponentMode.m_componentMode->PopulateViewportUi();
+                }
+            }
+        }
    } // namespace ComponentModeFramework
 } // namespace AzToolsFramework
@@ -55,7 +55,7 @@ namespace AzToolsFramework
                GetEntityComponentIdPair(), elementIdsToDisplay);
            // create the component mode border with the specific name for this component mode
            ViewportUi::ViewportUiRequestBus::Event(
-                ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateComponentModeBorder,
+                ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder,
                GetComponentModeName());
            // set the EntityComponentId for this ComponentMode to active in the ComponentModeViewportUi system
            ComponentModeViewportUiRequestBus::Event(