Integrating latest 47acbe8

Gems/ScriptCanvas/Code/Editor/SystemComponent.h

@@ -24,11 +24,10 @@
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <Editor/Assets/ScriptCanvasAssetTracker.h>
 
-namespace AZ
-{
-    class JobManager;
-    class JobContext;
-}
+#include <AzToolsFramework/Asset/AssetSeedManager.h>
+
+#include <AzCore/Jobs/JobManager.h>
+#include <AzCore/Jobs/JobContext.h>
 
 namespace ScriptCanvasEditor
 {
@@ -39,6 +38,10 @@ namespace ScriptCanvasEditor
         , private AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
         , private ScriptCanvasExecutionBus::Handler
         , private AZ::UserSettingsNotificationBus::Handler
+        , private AzFramework::AssetCatalogEventBus::Handler
+        , private AZ::Data::AssetBus::MultiHandler
+        , private AZ::Interface<IUpgradeRequests>::Registrar
+        , private AzToolsFramework::AssetSeedManagerRequests::Bus::Handler
     {
     public:
         AZ_COMPONENT(SystemComponent, "{1DE7A120-4371-4009-82B5-8140CB1D7B31}");
@@ -54,39 +57,84 @@ namespace ScriptCanvasEditor
         static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
         ////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
+        // AZ::Component...
         void Init() override;
         void Activate() override;
         void Deactivate() override;
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
-        // SystemRequestBus::Handler        
+        // SystemRequestBus::Handler...
         void AddAsyncJob(AZStd::function<void()>&& jobFunc) override;
         void GetEditorCreatableTypes(AZStd::unordered_set<ScriptCanvas::Data::Type>& outCreatableTypes);
         void CreateEditorComponentsOnEntity(AZ::Entity* entity, const AZ::Data::AssetType& assetType) override;
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
-        // AztoolsFramework::EditorEvents::Bus::Handler overrides
+        // AztoolsFramework::EditorEvents::Bus::Handler...
         void PopulateEditorGlobalContextMenu(QMenu* menu, const AZ::Vector2& point, int flags) override;
         void NotifyRegisterViews() override;
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
-        // ScriptCanvasExecutionBus::Handler
-        Reporter RunGraph(AZStd::string_view path) override;
+        // ScriptCanvasExecutionBus::Handler...
+        Reporter RunAssetGraph(AZ::Data::Asset<AZ::Data::AssetData>, ScriptCanvas::ExecutionMode mode) override;
+        Reporter RunGraph(AZStd::string_view path, ScriptCanvas::ExecutionMode mode) override;
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
-        //  AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus overrides
+        //  AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus...
         AzToolsFramework::AssetBrowser::SourceFileDetails GetSourceFileDetails(const char* fullSourceFileName) override;
         void AddSourceFileOpeners(const char* fullSourceFileName, const AZ::Uuid& sourceUUID, AzToolsFramework::AssetBrowser::SourceFileOpenerList& openers) override;
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
-        // AZ::UserSettingsNotificationBus::Handler
-        void OnUserSettingsActivated();
+        // AZ::UserSettingsNotificationBus::Handler...
+        void OnUserSettingsActivated() override;
+        ////////////////////////////////////////////////////////////////////////
+
+        ////////////////////////////////////////////////////////////////////////
+        // AzFramework::AssetCatalogEventBus::Handler...
+        void OnCatalogLoaded(const char* /*catalogFile*/) override;
+        void OnCatalogAssetAdded(const AZ::Data::AssetId& /*assetId*/) override;
+        void OnCatalogAssetRemoved(const AZ::Data::AssetId& /*assetId*/, const AZ::Data::AssetInfo& /*assetInfo*/) override;
+        ////////////////////////////////////////////////////////////////////////
+
+        ////////////////////////////////////////////////////////////////////////
+        // AssetSeedManagerRequests::Bus::Handler...
+        AzToolsFramework::AssetSeedManagerRequests::AssetTypePairs GetAssetTypeMapping() override;
+        ////////////////////////////////////////////////////////////////////////
+
+        ////////////////////////////////////////////////////////////////////////
+        // IUpgradeRequests...
+        IUpgradeRequests::AssetList& GetAssetsToUpgrade() override
+        {
+            return m_assetsToConvert;
+        }
+
+        void GraphNeedsManualUpgrade(const AZ::Data::AssetId& assetId) override
+        {
+            if (AZStd::find(m_assetsThatNeedManualUpgrade.begin(), m_assetsThatNeedManualUpgrade.end(), assetId) == m_assetsThatNeedManualUpgrade.end())
+            {
+                m_assetsThatNeedManualUpgrade.push_back(assetId);
+            }
+        }
+
+        AZStd::vector<AZ::Data::AssetId>& GetGraphsThatNeedManualUpgrade() override
+        {
+            return m_assetsThatNeedManualUpgrade;
+        }
+
+        bool IsUpgrading() override
+        {
+            return m_isUpgrading;
+        }
+
+        void SetIsUpgrading(bool isUpgrading) override
+        {
+            m_isUpgrading = isUpgrading;
+        }
+
         ////////////////////////////////////////////////////////////////////////
 
     private:
@@ -94,6 +142,7 @@ namespace ScriptCanvasEditor
 
         void FilterForScriptCanvasEnabledEntities(AzToolsFramework::EntityIdList& sourceList, AzToolsFramework::EntityIdList& targetList);
         void PopulateEditorCreatableTypes();
+        void AddAssetToUpgrade(const AZ::Data::AssetInfo& assetInfo);
 
         AZStd::unique_ptr<AZ::JobManager> m_jobManager;
         AZStd::unique_ptr<AZ::JobContext> m_jobContext;
@@ -102,5 +151,12 @@ namespace ScriptCanvasEditor
         AZStd::unordered_set<ScriptCanvas::Data::Type> m_creatableTypes;
 
         AssetTracker m_assetTracker;
+
+        IUpgradeRequests::AssetList m_assetsToConvert;
+        AZStd::vector<AZ::Data::AssetId> m_assetsThatNeedManualUpgrade;
+
+        bool m_isUpgrading = false;
+        bool m_upgradeDisabled = false;
+
     };
 }