Allow ComponentAdapter (and related types) to work with EntityComponentIdPairs as well as EntityIds (#920)

* provide the ability for component adapters to support multiple components per entity * add missing explicit keywords * updates following review feedback - update how template logic works * small updats (fix typo, remove redundant includes) * add missing this-> * naming change, common -> controller * add [[maybe_unused]]
2021-05-27 09:34:52 +01:00
parent 592114bd4f
commit 4205a69106
7 changed files with 159 additions and 125 deletions
@@ -1,22 +1,22 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */

 #pragma once

 #include <AzCore/Component/Component.h>
 #include <AzCore/RTTI/RTTI.h>
-#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
+#include <AzCore/Serialization/SerializeContext.h>

 namespace AzFramework
 {
@@ -64,15 +64,13 @@ namespace AzFramework
        the EditContext. TController can friend itself to the editor component to make this work if required.
    */
        template<typename TController, typename TConfiguration = AZ::ComponentConfig>
-        class ComponentAdapter
-            : public AZ::Component
+        class ComponentAdapter : public AZ::Component
        {
        public:
-
            AZ_RTTI((ComponentAdapter, "{644A9187-4FDB-42C1-9D59-DD75304B551A}", TController, TConfiguration), AZ::Component);

            ComponentAdapter() = default;
-            ComponentAdapter(const TConfiguration& configuration);
+            explicit ComponentAdapter(const TConfiguration& configuration);

            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services);
            static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services);
@@ -85,7 +83,6 @@ namespace AzFramework
            void Deactivate() override;

        protected:
-
            static void Reflect(AZ::ReflectContext* context);

            // AZ::Component overrides ...
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */

 #include <AzFramework/Components/ComponentAdapterHelpers.h>

@@ -32,10 +32,12 @@ namespace AzFramework

            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
            {
+                // clang-format off
                serializeContext->Class<ComponentAdapter, Component>()
                    ->Version(1)
                    ->Field("Controller", &ComponentAdapter::m_controller)
                    ;
+                // clang-format on
            }
        }

@@ -66,9 +68,6 @@ namespace AzFramework
            GetDependentServicesHelper<TController>(services, typename AZ::HasComponentDependentServices<TController>::type());
        }

-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-
        template<typename TController, typename TConfiguration>
        void ComponentAdapter<TController, TConfiguration>::Init()
        {
@@ -78,7 +77,7 @@ namespace AzFramework
        template<typename TController, typename TConfiguration>
        void ComponentAdapter<TController, TConfiguration>::Activate()
        {
-            m_controller.Activate(GetEntityId());
+            ComponentActivateHelper<TController>::Activate(m_controller, AZ::EntityComponentIdPair(GetEntityId(), GetId()));
        }

        template<typename TController, typename TConfiguration>
@@ -13,6 +13,7 @@
 #pragma once

 #include <AzCore/Component/Component.h>
+#include <AzCore/Component/EntityBus.h>

 namespace AzFramework
 {
@@ -27,18 +28,43 @@ namespace AzFramework
        template<typename T, typename = void>
        struct ComponentInitHelper
        {
-            static void Init(T& common)
+            static void Init([[maybe_unused]] T& controller)
            {
-                AZ_UNUSED(common);
            }
        };

        template<typename T>
        struct ComponentInitHelper<T, AZStd::void_t<decltype(AZStd::declval<T>().Init())>>
        {
-            static void Init(T& common)
+            static void Init(T& controller)
            {
-                common.Init();
+                controller.Init();
+            }
+        };
+
+        template<typename T, typename = void>
+        struct ComponentActivateHelper
+        {
+            static void Activate([[maybe_unused]] T& controller, [[maybe_unused]] const AZ::EntityComponentIdPair& entityComponentIdPair)
+            {
+            }
+        };
+
+        template<typename T>
+        struct ComponentActivateHelper<T, AZStd::void_t<decltype(AZStd::declval<T>().Activate(AZ::EntityId()))>>
+        {
+            static void Activate(T& controller, const AZ::EntityComponentIdPair& entityComponentIdPair)
+            {
+                controller.Activate(entityComponentIdPair.GetEntityId());
+            }
+        };
+
+        template<typename T>
+        struct ComponentActivateHelper<T, AZStd::void_t<decltype(AZStd::declval<T>().Activate(AZ::EntityComponentIdPair()))>>
+        {
+            static void Activate(T& controller, const AZ::EntityComponentIdPair& entityComponentIdPair)
+            {
+                controller.Activate(entityComponentIdPair);
            }
        };

@@ -1,22 +1,22 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */

 #pragma once

-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>

 namespace AzToolsFramework
 {
@@ -31,7 +31,7 @@ namespace AzToolsFramework
        To use the EditorComponentAdapter, 3 classes are required:
         - a class that implements the functions required for TController (see below)
         - a configuration struct/class which extends AZ::ComponentConfig
-         - A runtime component that will be generated by the editor comoinent on export
+         - A runtime component that will be generated by the editor component on export

         The concrete component extends the adapter and implements behavior which is unique to the component.

@@ -64,15 +64,15 @@ namespace AzToolsFramework
        the EditContext. TController can friend itself to the editor component to make this work if required.
    */
        template<typename TController, typename TRuntimeComponent, typename TConfiguration = AZ::ComponentConfig>
-        class EditorComponentAdapter
-            : public EditorComponentBase
+        class EditorComponentAdapter : public EditorComponentBase
        {
        public:
-
-            AZ_RTTI((EditorComponentAdapter, "{2F5A3669-FFE9-4CD7-B9E2-7FC8100CF1A2}", TController, TRuntimeComponent, TConfiguration), EditorComponentBase);
+            AZ_RTTI(
+                (EditorComponentAdapter, "{2F5A3669-FFE9-4CD7-B9E2-7FC8100CF1A2}", TController, TRuntimeComponent, TConfiguration),
+                EditorComponentBase);

            EditorComponentAdapter() = default;
-            EditorComponentAdapter(const TConfiguration& configuration);
+            explicit EditorComponentAdapter(const TConfiguration& configuration);

            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services);
            static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services);
@@ -86,7 +86,6 @@ namespace AzToolsFramework
            void BuildGameEntity(AZ::Entity* gameEntity) override;

        protected:
-
            static void Reflect(AZ::ReflectContext* context);

            // AZ::Component overrides ...
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */

 #include <AzFramework/Components/ComponentAdapterHelpers.h>

@@ -28,23 +28,21 @@ namespace AzToolsFramework
        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::Reflect(AZ::ReflectContext* context)
        {
-            if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
            {
-                serializeContext->Class<EditorComponentAdapter, EditorComponentBase>()
-                    ->Version(1)
-                    ->Field("Controller", &EditorComponentAdapter::m_controller)
-                    ;
+                serializeContext->Class<EditorComponentAdapter, EditorComponentBase>()->Version(1)->Field(
+                    "Controller", &EditorComponentAdapter::m_controller);

                if (AZ::EditContext* editContext = serializeContext->GetEditContext())
                {
-                    editContext->Class<EditorComponentAdapter>(
-                        "EditorComponentAdapter", "")
+                    // clang-format off
+                    editContext->Class<EditorComponentAdapter>("EditorComponentAdapter", "")
                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                        ->DataElement(AZ::Edit::UIHandlers::Default, &EditorComponentAdapter::m_controller, "Controller", "")
                            ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                            ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorComponentAdapter::OnConfigurationChanged)
-                        ;
+                            ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorComponentAdapter::OnConfigurationChanged);
+                    // clang-format on
                }
            }
        }
@@ -53,27 +51,35 @@ namespace AzToolsFramework
        // Get*Services functions

        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetProvidedServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
        {
-            AzFramework::Components::GetProvidedServicesHelper<TController>(services, typename AZ::HasComponentProvidedServices<TController>::type());
+            AzFramework::Components::GetProvidedServicesHelper<TController>(
+                services, typename AZ::HasComponentProvidedServices<TController>::type());
        }

        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetRequiredServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
        {
-            AzFramework::Components::GetRequiredServicesHelper<TController>(services, typename AZ::HasComponentRequiredServices<TController>::type());
+            AzFramework::Components::GetRequiredServicesHelper<TController>(
+                services, typename AZ::HasComponentRequiredServices<TController>::type());
        }

        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetIncompatibleServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
        {
-            AzFramework::Components::GetIncompatibleServicesHelper<TController>(services, typename AZ::HasComponentIncompatibleServices<TController>::type());
+            AzFramework::Components::GetIncompatibleServicesHelper<TController>(
+                services, typename AZ::HasComponentIncompatibleServices<TController>::type());
        }

        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetDependentServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
        {
-            AzFramework::Components::GetDependentServicesHelper<TController>(services, typename AZ::HasComponentDependentServices<TController>::type());
+            AzFramework::Components::GetDependentServicesHelper<TController>(
+                services, typename AZ::HasComponentDependentServices<TController>::type());
        }

        //////////////////////////////////////////////////////////////////////////
@@ -99,7 +105,8 @@ namespace AzToolsFramework

            if (ShouldActivateController())
            {
-                m_controller.Activate(GetEntityId());
+                AzFramework::Components::ComponentActivateHelper<TController>::Activate(
+                    m_controller, AZ::EntityComponentIdPair(GetEntityId(), GetId()));
            }
        }

@@ -122,7 +129,8 @@ namespace AzToolsFramework
        }

        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        bool EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::WriteOutConfig(AZ::ComponentConfig* outBaseConfig) const
+        bool EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::WriteOutConfig(
+            AZ::ComponentConfig* outBaseConfig) const
        {
            if (auto config = azrtti_cast<TConfiguration*>(outBaseConfig))
            {
@@ -139,7 +147,8 @@ namespace AzToolsFramework

            if (ShouldActivateController())
            {
-                m_controller.Activate(GetEntityId());
+                AzFramework::Components::ComponentActivateHelper<TController>::Activate(
+                    m_controller, AZ::EntityComponentIdPair(GetEntityId(), GetId()));
            }

            return AZ::Edit::PropertyRefreshLevels::None;
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */

 #pragma once

@@ -26,14 +26,15 @@ namespace AZ
            , public AzToolsFramework::EditorEntityVisibilityNotificationBus::Handler
        {
        public:
-
            using BaseClass = AzToolsFramework::Components::EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>;
-            AZ_RTTI((EditorRenderComponentAdapter, "{AAF38BE4-EA2F-408B-9C44-63C7FBAC6B33}", TController, TRuntimeComponent, TConfiguration), BaseClass);
+            AZ_RTTI(
+                (EditorRenderComponentAdapter, "{AAF38BE4-EA2F-408B-9C44-63C7FBAC6B33}", TController, TRuntimeComponent, TConfiguration),
+                BaseClass);

            static void Reflect(AZ::ReflectContext* context);

            EditorRenderComponentAdapter() = default;
-            EditorRenderComponentAdapter(const TConfiguration& config);
+            explicit EditorRenderComponentAdapter(const TConfiguration& config);

            // AzToolsFramework::Components::EditorComponentAdapter overrides
            void Activate() override;
@@ -50,7 +51,8 @@ namespace AZ

            // Convert pre-existing EditorCompnentAdapter based serialized data to EditorRenderComponentAdapter
            template<int TVersion>
-            static bool ConvertToEditorRenderComponentAdapter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
+            static bool ConvertToEditorRenderComponentAdapter(
+                AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
        };
    } // namespace Render
 } // namespace AZ
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */

 #include <Atom/Feature/Utils/EditorRenderComponentAdapter.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
@@ -19,11 +19,12 @@ namespace AZ
    {
        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
        template<int TVersion>
-        bool EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::ConvertToEditorRenderComponentAdapter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
+        bool EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::ConvertToEditorRenderComponentAdapter(
+            AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
        {
            if (classElement.GetVersion() < TVersion)
            {
-                // Get the and remove the EditorComponentAdapter base class data that was previpously serialized
+                // Get the and remove the EditorComponentAdapter base class data that was previously serialized
                AzToolsFramework::Components::EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration> oldBaseClassData;

                if (!classElement.FindSubElementAndGetData(AZ_CRC("BaseClass1", 0xd4925735), oldBaseClassData))
@@ -41,8 +42,8 @@ namespace AZ
                // Replace the old base class data with EditorRenderComponentAdapter
                EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration> newBaseClassData;

-                AZ::SerializeContext::DataElementNode& newBaseClassElement = classElement.GetSubElement(
-                    classElement.AddElementWithData(context, "BaseClass1", newBaseClassData));
+                AZ::SerializeContext::DataElementNode& newBaseClassElement =
+                    classElement.GetSubElement(classElement.AddElementWithData(context, "BaseClass1", newBaseClassData));

                // Overwrite EditorRenderComponentAdapter base class data with retrieved EditorComponentAdapter base class data
                if (!newBaseClassElement.RemoveElementByName(AZ_CRC("BaseClass1", 0xd4925735)))
@@ -62,25 +63,24 @@ namespace AZ
        {
            BaseClass::Reflect(context);

-            if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
            {
-                serializeContext->Class<EditorRenderComponentAdapter, BaseClass>()
-                    ->Version(0)
-                    ;
+                serializeContext->Class<EditorRenderComponentAdapter, BaseClass>()->Version(0);

                if (AZ::EditContext* editContext = serializeContext->GetEditContext())
                {
-                    editContext->Class<EditorRenderComponentAdapter>(
-                        "EditorRenderComponentAdapter", "")
+                    // clang-format off
+                    editContext->Class<EditorRenderComponentAdapter>("EditorRenderComponentAdapter", "")
                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ;
+                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
+                    // clang-format on
                }
            }
        }

        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::EditorRenderComponentAdapter(const TConfiguration& config)
+        EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::EditorRenderComponentAdapter(
+            const TConfiguration& config)
            : BaseClass(config)
        {
        }
@@ -103,7 +103,8 @@ namespace AZ
        bool EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::IsVisible() const
        {
            bool visible = true;
-            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(visible, this->GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
+            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+                visible, this->GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
            return visible;
        }

@@ -114,15 +115,16 @@ namespace AZ
        }

        template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::OnEntityVisibilityChanged([[maybe_unused]] bool visibility)
+        void EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::OnEntityVisibilityChanged(
+            [[maybe_unused]] bool visibility)
        {
            this->m_controller.Deactivate();

            if (this->ShouldActivateController())
            {
-                this->m_controller.Activate(this->GetEntityId());
+                AzFramework::Components::ComponentActivateHelper<TController>::Activate(
+                    this->m_controller, AZ::EntityComponentIdPair(this->GetEntityId(), this->GetId()));
            }
        }
-
    } // namespace Render
 } // namespace AZ