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

Git MainWindow.cpp to point where it compiles, and reveals the radius of changes for everything to work without assets

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-10-18 11:56:14 -07:00
parent 42d286f8a6
commit b7f6ebb708
16 changed files with 534 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Widgets/AssetGraphSceneDataBus.h
+4 -2
View File
@@ -11,14 +11,16 @@
#include <AzCore/Asset/AssetCommon.h>
#include <AzCore/Math/Uuid.h>
#include <AzCore/EBus/EBus.h>
#include <Core/Core.h>
namespace ScriptCanvasEditor
{
// #sc-editor-asset remove this
class AssetGraphScene : public AZ::EBusTraits
{
public:
virtual AZ::EntityId FindEditorNodeIdByAssetNodeId(const AZ::Data::AssetId& assetId, AZ::EntityId assetNodeId) const = 0;
virtual AZ::EntityId FindAssetNodeIdByEditorNodeId(const AZ::Data::AssetId& assetId, AZ::EntityId editorNodeId) const = 0;
virtual AZ::EntityId FindEditorNodeIdByAssetNodeId(const SourceHandle& assetId, AZ::EntityId assetNodeId) const = 0;
virtual AZ::EntityId FindAssetNodeIdByEditorNodeId(const SourceHandle& assetId, AZ::EntityId editorNodeId) const = 0;
};
using AssetGraphSceneBus = AZ::EBus<AssetGraphScene>;
Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
+7 -7
View File
@@ -45,14 +45,14 @@ namespace ScriptCanvasEditor
GraphTabBar(QWidget* parent = nullptr);
~GraphTabBar() override = default;
void AddGraphTab(const AZ::Data::AssetId& assetId);
int InsertGraphTab(int tabIndex, const AZ::Data::AssetId& assetId);
bool SelectTab(const AZ::Data::AssetId& assetId);
void AddGraphTab(ScriptCanvasEditor::SourceHandle assetId);
int InsertGraphTab(int tabIndex, ScriptCanvasEditor::SourceHandle assetId);
bool SelectTab(ScriptCanvasEditor::SourceHandle assetId);
void ConfigureTab(int tabIndex, AZ::Data::AssetId fileAssetId, const AZStd::string& tabName);
void ConfigureTab(int tabIndex, ScriptCanvasEditor::SourceHandle fileAssetId, const AZStd::string& tabName);
int FindTab(const AZ::Data::AssetId& assetId) const;
AZ::Data::AssetId FindAssetId(int tabIndex);
int FindTab(ScriptCanvasEditor::SourceHandle assetId) const;
ScriptCanvasEditor::SourceHandle FindAssetId(int tabIndex);
void CloseTab(int index);
void CloseAllTabs();
@@ -92,7 +92,7 @@ namespace ScriptCanvasEditor
// Called when the selected tab changes
void currentChangedTab(int index);
void SetFileState(AZ::Data::AssetId assetId, Tracker::ScriptCanvasFileState fileState);
void SetFileState(ScriptCanvasEditor::SourceHandle, Tracker::ScriptCanvasFileState fileState);
int m_signalSaveOnChangeTo = -1;
};
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+403 -337
View File
File diff suppressed because it is too large Load Diff
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
+8 -16
View File
@@ -155,7 +155,7 @@ namespace ScriptCanvasEditor
}
};
//! Manages the Save/Restore operations of the user's las topened and focused graphs
//! Manages the Save/Restore operations of the user's last opened and focused graphs
class Workspace
: AssetTrackerNotificationBus::MultiHandler
{
@@ -417,17 +417,17 @@ namespace ScriptCanvasEditor
void CloseNextTab();
bool IsTabOpen(const ScriptCanvasEditor::SourceHandle& assetId, int& outTabIndex) const;
QVariant GetTabData(const ScriptCanvasEditor::SourceHandle& assetId);
bool IsTabOpen(const SourceHandle& assetId, int& outTabIndex) const;
QVariant GetTabData(const SourceHandle& assetId);
//! GeneralRequestBus
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAssetId(const ScriptCanvasEditor::SourceHandle& assetId) override;
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(ScriptCanvasEditor::SourceHandle scriptCanvasAssetId, int tabIndex = -1) override;
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAssetId(const SourceHandle& assetId) override;
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(SourceHandle scriptCanvasAssetId, int tabIndex = -1) override;
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(const ScriptCanvasMemoryAsset& scriptCanvasAsset, int tabIndex = -1);
int CloseScriptCanvasAsset(const ScriptCanvasEditor::SourceHandle& assetId) override;
int CloseScriptCanvasAsset(const SourceHandle& assetId) override;
bool CreateScriptCanvasAssetFor(const TypeDefs::EntityComponentId& requestingEntityId) override;
bool IsScriptCanvasAssetOpen(const ScriptCanvasEditor::SourceHandle& assetId) const override;
bool IsScriptCanvasAssetOpen(const SourceHandle& assetId) const override;
const CategoryInformation* FindNodePaletteCategoryInformation(AZStd::string_view categoryPath) const override;
const NodePaletteModelInformation* FindNodePaletteModelInformation(const ScriptCanvas::NodeTypeIdentifier& nodeType) const override;
@@ -627,15 +627,7 @@ namespace ScriptCanvasEditor
ScriptCanvasEditor::SourceHandle GetSourceAssetId(const ScriptCanvasEditor::SourceHandle& memoryAssetId) const
{
ScriptCanvasMemoryAsset::pointer memoryAsset;
AssetTrackerRequestBus::BroadcastResult(memoryAsset, &AssetTrackerRequests::GetAsset, memoryAssetId);
if (memoryAsset)
{
return memoryAsset->GetFileAssetId();
}
return ScriptCanvasEditor::SourceHandle();
return memoryAssetId;
}
int InsertTabForAsset(AZStd::string_view assetPath, ScriptCanvasEditor::SourceHandle assetId, int tabIndex = -1);