birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scan refactor is in a working state

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-09-13 15:30:31 -07:00
parent cbaa2fcff5
commit 1badb5a31f
14 changed files with 485 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/SystemComponent.h
+10 -59
View File
@@ -9,23 +9,20 @@
#pragma once
#include <Core/GraphBus.h>
#include <ScriptCanvas/Bus/ScriptCanvasBus.h>
#include <ScriptCanvas/Bus/ScriptCanvasExecutionBus.h>
#include <AzCore/Component/Component.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzCore/Jobs/JobContext.h>
#include <AzCore/Jobs/JobManager.h>
#include <AzCore/UserSettings/UserSettingsProvider.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/Asset/AssetSeedManager.h>
#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
#include <Core/GraphBus.h>
#include <Editor/Assets/ScriptCanvasAssetTracker.h>
#include <AzToolsFramework/Asset/AssetSeedManager.h>
#include <AzCore/Jobs/JobManager.h>
#include <AzCore/Jobs/JobContext.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Model.h>
#include <ScriptCanvas/Bus/ScriptCanvasBus.h>
#include <ScriptCanvas/Bus/ScriptCanvasExecutionBus.h>
namespace ScriptCanvasEditor
{
@@ -36,9 +33,7 @@ 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
, private AzToolsFramework::EditorContextMenuBus::Handler
{
@@ -96,74 +91,30 @@ namespace ScriptCanvasEditor
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...
void ClearGraphsThatNeedUpgrade()
{
m_assetsThatNeedManualUpgrade.clear();
}
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);
}
}
const AZStd::vector<AZ::Data::AssetId>& GetGraphsThatNeedManualUpgrade() const override
{
return m_assetsThatNeedManualUpgrade;
}
bool IsUpgrading() override
{
return m_isUpgrading;
}
void SetIsUpgrading(bool isUpgrading) override
{
m_isUpgrading = isUpgrading;
}
////////////////////////////////////////////////////////////////////////
private:
SystemComponent(const SystemComponent&) = delete;
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;
AZStd::unique_ptr<VersionExplorer::Model> m_versionExplorer;
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;
};
}