Change notification buses to be addressed on EntityContextId, and connect the handlers to the default id. Request interfaces should not need that id as they can retrieve it from the entityId.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-28 18:16:02 -07:00
parent ce334f9443
commit c204aa1abe
5 changed files with 40 additions and 9 deletions
@@ -11,19 +11,28 @@
 #include <AzCore/Component/EntityId.h>
 #include <AzCore/EBus/EBus.h>

+#include <AzFramework/Entity/EntityContext.h>
+
 namespace AzToolsFramework
 {
    //! Used to notify when the editor focus changes.
    class FocusModeNotifications
        : public AZ::EBusTraits
    {
-    protected:
-        ~FocusModeNotifications() = default;
-
    public:
+        //////////////////////////////////////////////////////////////////////////
+        // EBusTraits overrides
+        static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
+        static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
+        using BusIdType = AzFramework::EntityContextId;
+        //////////////////////////////////////////////////////////////////////////
+        
        //! Triggered when the editor focus is changed to a different entity.
        //! @param entityId The entity the focus has been moved to.
        virtual void OnEditorFocusChanged(AZ::EntityId entityId) = 0;
+
+    protected:
+        ~FocusModeNotifications() = default;
    };

    using FocusModeNotificationBus = AZ::EBus<FocusModeNotifications>;