Merge pull request #526 from aws-lumberyard-dev/Atom/olexl/ATOM-15349

Deleted AzFramework::AtomActiveInterface

Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeEditorModule.cpp

@@ -13,7 +13,6 @@
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Module/Module.h>
 #include <AtomBridgeModule.h>
-#include <BuilderComponent.h>
 
 #include "./Editor/AssetCollectionAsyncLoaderTestComponent.h"
 
@@ -33,7 +32,6 @@ namespace AZ
             {
                 // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here.
                 m_descriptors.insert(m_descriptors.end(), {
-                    BuilderComponent::CreateDescriptor(),
                     AssetCollectionAsyncLoaderTestComponent::CreateDescriptor(),
                     });
             }

Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp

@@ -62,12 +62,10 @@ namespace AZ
 
         AtomBridgeSystemComponent::AtomBridgeSystemComponent()
         {
-            AZ::Interface<AzFramework::AtomActiveInterface>::Register(this);
         }
 
         AtomBridgeSystemComponent::~AtomBridgeSystemComponent()
         {
-            AZ::Interface<AzFramework::AtomActiveInterface>::Unregister(this);
         }
 
         void AtomBridgeSystemComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)

Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h

@@ -17,7 +17,6 @@
 
 #include <AzCore/Component/Component.h>
 
-#include <AzFramework/API/AtomActiveInterface.h>
 #include <AzFramework/Render/RenderSystemBus.h>
 #include <AzFramework/Components/DeprecatedComponentsBus.h>
 
@@ -37,7 +36,6 @@ namespace AZ
 
         class AtomBridgeSystemComponent
             : public Component
-            , public AzFramework::AtomActiveInterface
             , public AzFramework::Render::RenderSystemRequestBus::Handler
             , public AzFramework::Components::DeprecatedComponentsRequestBus::Handler
             , public Render::Bootstrap::NotificationBus::Handler

Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp

@@ -1,55 +0,0 @@
-/*
-* 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 <AzCore/Component/Entity.h>
-#include <AzCore/Serialization/EditContext.h>
-#include <AzCore/Serialization/SerializeContext.h>
-#include <AzCore/Interface/Interface.h>
-
-#include <BuilderComponent.h>
-
-#include <AssetBuilderSDK/AssetBuilderSDK.h>
-
-namespace AZ
-{
-    namespace AtomBridge
-    {
-        void BuilderComponent::Reflect(AZ::ReflectContext* context)
-        {
-            if (auto* serialize = azrtti_cast<AZ::SerializeContext*>(context))
-            {
-                serialize->Class<BuilderComponent, AZ::Component>()
-                    ->Version(0)
-                    ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AssetBuilderSDK::ComponentTags::AssetBuilder }))
-                ;
-            }
-        }
-
-        BuilderComponent::BuilderComponent()
-        {
-            AZ::Interface<AzFramework::AtomActiveInterface>::Register(this);
-        }
-
-        BuilderComponent::~BuilderComponent()
-        {
-            AZ::Interface<AzFramework::AtomActiveInterface>::Unregister(this);
-        }
-
-        void BuilderComponent::Activate()
-        {
-        }
-
-        void BuilderComponent::Deactivate()
-        {
-        }
-    } // namespace RPI
-} // namespace AZ

Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.h

@@ -1,38 +0,0 @@
-/*
-* 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 <AzFramework/API/AtomActiveInterface.h>
-
-namespace AZ
-{
-    namespace AtomBridge
-    {
-        class BuilderComponent final
-            : public AZ::Component
-            , public AzFramework::AtomActiveInterface
-        {
-        public:
-            AZ_COMPONENT(BuilderComponent, "{D1FE015B-8431-4155-8FD0-8197F246901A}");
-            static void Reflect(AZ::ReflectContext* context);
-
-            BuilderComponent();
-            ~BuilderComponent() override;
-
-            // AZ::Component overrides...
-            void Activate() override;
-            void Deactivate() override;
-        };
-    } // namespace RPI
-} // namespace AZ

Gems/AtomLyIntegration/AtomBridge/Code/atombridge_editor_files.cmake

@@ -13,8 +13,6 @@ set(FILES
     Source/AtomBridgeEditorModule.cpp
     Source/AtomBridgeModule.cpp
     Source/AtomBridgeModule.h
-    Source/BuilderComponent.cpp
-    Source/BuilderComponent.h
     Source/Editor/AssetCollectionAsyncLoaderTestComponent.cpp
     Source/Editor/AssetCollectionAsyncLoaderTestComponent.h
 )