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

the bloodbath compiles

Browse Source 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
carlitosan
2021-12-14 17:32:22 -08:00
parent 2271fa3dc6
commit 81bb7aab80
22 changed files with 171 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ namespace ScriptCanvasEditor
// and then a lambda which will be activated if the user chooses to open it with your opener:
openers.push_back({ "ScriptCanvas_Editor_Asset_Edit", "Script Canvas Editor..."
, QIcon(ScriptCanvasAssetDescription().GetIconPathImpl()),
, QIcon(ScriptCanvasEditor::SourceDescription::GetIconPath()),
[](const char*, const AZ::Uuid& scSourceUuid)
{
AzToolsFramework::OpenViewPane(LyViewPane::ScriptCanvas);
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
+1 -5
View File
@@ -150,11 +150,7 @@ namespace ScriptCanvasEditor
bool IsValidSourceFile(const AZStd::string& filePath, [[maybe_unused]] ScriptCanvas::ScriptCanvasId scriptCanvasId)
{
ScriptCanvasAssetDescription assetDescription;
return AZ::StringFunc::EndsWith(filePath, assetDescription.GetExtensionImpl(), false);
{
return true;
}
return AZ::StringFunc::EndsWith(filePath, ScriptCanvasEditor::SourceDescription::GetFileExtension(), false);
}
}
}
Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
-1
View File
@@ -77,7 +77,6 @@ AZ_POP_DISABLE_WARNING
#include <Libraries/Core/EBusEventHandler.h>
#include <Libraries/Core/ReceiveScriptEvent.h>
#include <Libraries/Core/ScriptEventBase.h>
#include <ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h>
#include <Libraries/Core/SendScriptEvent.h>
#include <ScriptCanvas/Asset/RuntimeAsset.h>
#include <ScriptCanvas/Core/Connection.h>
Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
+24 -27
View File
@@ -149,36 +149,33 @@ namespace ScriptCanvasEditor
}
}
AZ_INLINE void RunEditorAsset(AZ::Data::Asset<AZ::Data::AssetData> asset, Reporter& reporter, ScriptCanvas::ExecutionMode mode)
AZ_INLINE void RunEditorAsset(SourceHandle asset, Reporter& reporter, ScriptCanvas::ExecutionMode mode)
{
if (asset.IsReady())
AZ::Data::AssetId assetId = asset.Id();
AZ::Data::AssetId runtimeAssetId(assetId.m_guid, AZ_CRC("RuntimeData", 0x163310ae));
AZ::Data::Asset<ScriptCanvas::RuntimeAsset> runtimeAsset;
if (!runtimeAsset.Create(runtimeAssetId, true))
{
AZ::Data::AssetId assetId = asset.GetId();
AZ::Data::AssetId runtimeAssetId(assetId.m_guid, AZ_CRC("RuntimeData", 0x163310ae));
AZ::Data::Asset<ScriptCanvas::RuntimeAsset> runtimeAsset;
if (!runtimeAsset.Create(runtimeAssetId, true))
{
return;
}
reporter.SetExecutionMode(mode);
LoadTestGraphResult loadResult;
loadResult.m_editorAsset = SourceHandle(nullptr, assetId.m_guid, asset.GetHint());
AZ::EntityId scriptCanvasId;
loadResult.m_entity = AZStd::make_unique<AZ::Entity>("Loaded test graph");
loadResult.m_runtimeAsset = runtimeAsset;
RunGraphSpec runGraphSpec;
runGraphSpec.dirPath = "";
runGraphSpec.graphPath = asset.GetHint().c_str();
runGraphSpec.runSpec.duration.m_spec = eDuration::Ticks;
runGraphSpec.runSpec.duration.m_ticks = 10;
runGraphSpec.runSpec.execution = mode;
runGraphSpec.runSpec.release = true;
runGraphSpec.runSpec.debug = runGraphSpec.runSpec.traced = false;
RunGraphImplementation(runGraphSpec, loadResult, reporter);
return;
}
reporter.SetExecutionMode(mode);
LoadTestGraphResult loadResult;
loadResult.m_editorAsset = SourceHandle(nullptr, assetId.m_guid, asset.Path());
AZ::EntityId scriptCanvasId;
loadResult.m_entity = AZStd::make_unique<AZ::Entity>("Loaded test graph");
loadResult.m_runtimeAsset = runtimeAsset;
RunGraphSpec runGraphSpec;
runGraphSpec.dirPath = "";
runGraphSpec.graphPath = asset.Path().c_str();
runGraphSpec.runSpec.duration.m_spec = eDuration::Ticks;
runGraphSpec.runSpec.duration.m_ticks = 10;
runGraphSpec.runSpec.execution = mode;
runGraphSpec.runSpec.release = true;
runGraphSpec.runSpec.debug = runGraphSpec.runSpec.traced = false;
RunGraphImplementation(runGraphSpec, loadResult, reporter);
}
AZ_INLINE void RunGraphImplementation(const RunGraphSpec& runGraphSpec, Reporter& reporter)
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/RequestBus.h
-5
View File
@@ -37,11 +37,6 @@ namespace GraphCanvas
class NodePaletteDockWidget;
}
namespace ScriptCanvas
{
class ScriptCanvasAssetBase;
}
namespace ScriptCanvasEditor
{
struct CategoryInformation;
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/ScriptCanvasExecutionBus.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvasEditor
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
virtual Reporter RunGraph(AZStd::string_view path, ScriptCanvas::ExecutionMode mode) = 0;
virtual Reporter RunAssetGraph(AZ::Data::Asset<AZ::Data::AssetData>, ScriptCanvas::ExecutionMode mode) = 0;
virtual Reporter RunAssetGraph(SourceHandle source, ScriptCanvas::ExecutionMode mode) = 0;
};
using ScriptCanvasExecutionBus = AZ::EBus<ScriptCanvasExecutionRequests>;
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorDeprecationData.h
+12 -10
View File
@@ -17,6 +17,18 @@ namespace ScriptCanvasEditor
{
namespace Deprecated
{
// only used as a pass-through to loading a guid / hint during version conversion
class ScriptCanvasAsset
: public AZ::Data::AssetData
{
public:
AZ_TYPE_INFO(ScriptCanvasAsset, "{FA10C3DA-0717-4B72-8944-CD67D13DFA2B}");
AZ_CLASS_ALLOCATOR(ScriptCanvasAsset, AZ::SystemAllocator, 0);
ScriptCanvasAsset() = default;
};
// only used as a pass-through to loading a guid / hint during version conversion
class ScriptCanvasAssetHolder
{
public:
@@ -30,15 +42,5 @@ namespace ScriptCanvasEditor
ScriptCanvasAssetHolder() = default;
};
// only is used as a pass-through to loading a guid / hint during versioning
class ScriptCanvasAsset
: public AZ::Data::AssetData
{
public:
AZ_TYPE_INFO(ScriptCanvasAsset, "{FA10C3DA-0717-4B72-8944-CD67D13DFA2B}");
AZ_CLASS_ALLOCATOR(ScriptCanvasAsset, AZ::SystemAllocator, 0);
ScriptCanvasAsset() = default;
};
}
}
Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp
+86 -10
View File
@@ -6,26 +6,102 @@
*
*/
#include <Editor/ReflectComponent.h>
#include <AssetBuilderSDK/AssetBuilderSDK.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <Editor/Include/ScriptCanvas/Components/EditorGraph.h>
#include <Editor/ReflectComponent.h>
#include <Editor/View/Dialogs/SettingsDialog.h>
#include <Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h>
#include <Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h>
#include <Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h>
#include <Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.h>
#include <Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h>
#include <Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h>
#include <Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h>
#include <Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h>
#include <Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.h>
#include <Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h>
#include <ScriptCanvas/Components/EditorDeprecationData.h>
#include <ScriptCanvas/Bus/UndoBus.h>
#include <ScriptCanvas/Components/EditorDeprecationData.h>
#include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
#include <ScriptCanvas/Variable/GraphVariableManagerComponent.h>
namespace CoreCpp
{
static bool ScriptCanvasDataVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& rootDataElementNode)
{
if (rootDataElementNode.GetVersion() == 0)
{
int scriptCanvasEntityIndex = rootDataElementNode.FindElement(AZ_CRC("m_scriptCanvas", 0xfcd20d85));
if (scriptCanvasEntityIndex == -1)
{
AZ_Error("Script Canvas", false, "Version Converter failed, The Script Canvas Entity is missing");
return false;
}
auto scComponentElements = AZ::Utils::FindDescendantElements(context, rootDataElementNode, AZStd::vector<AZ::Crc32>{AZ_CRC("m_scriptCanvas", 0xfcd20d85),
AZ_CRC("element", 0x41405e39), AZ_CRC("Components", 0xee48f5fd)});
if (!scComponentElements.empty())
{
scComponentElements.front()->AddElementWithData(context, "element", ScriptCanvasEditor::EditorGraphVariableManagerComponent());
}
}
if (rootDataElementNode.GetVersion() < 4)
{
auto scEntityElements = AZ::Utils::FindDescendantElements(context, rootDataElementNode,
AZStd::vector<AZ::Crc32>{AZ_CRC("m_scriptCanvas", 0xfcd20d85), AZ_CRC("element", 0x41405e39)});
if (scEntityElements.empty())
{
AZ_Error("Script Canvas", false, "Version Converter failed, The Script Canvas Entity is missing");
return false;
}
auto& scEntityDataElement = *scEntityElements.front();
AZ::Entity scEntity;
if (!scEntityDataElement.GetData(scEntity))
{
AZ_Error("Script Canvas", false, "Unable to retrieve entity data from the Data Element");
return false;
}
auto graph = AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvas::Graph>(&scEntity);
if (!graph)
{
AZ_Error("Script Canvas", false, "Script Canvas graph component could not be found on Script Canvas Entity for ScriptCanvasData version %u", rootDataElementNode.GetVersion());
return false;
}
auto variableManager = AZ::EntityUtils::FindFirstDerivedComponent<ScriptCanvas::GraphVariableManagerComponent>(&scEntity);
if (!variableManager)
{
AZ_Error("Script Canvas", false, "Script Canvas variable manager component could not be found on Script Canvas Entity for ScriptCanvasData version %u", rootDataElementNode.GetVersion());
return false;
}
variableManager->ConfigureScriptCanvasId(graph->GetScriptCanvasId());
if (!scEntityDataElement.SetData(context, scEntity))
{
AZ_Error("Script Canvas", false, "Failed to set converted Script Canvas Entity back on data element node when transitioning from version %u to version 4", rootDataElementNode.GetVersion());
return false;
}
}
return true;
}
}
namespace ScriptCanvas
{
void ScriptCanvasData::Reflect(AZ::ReflectContext* reflectContext)
{
if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext))
{
serializeContext->Class<ScriptCanvasData>()
->Version(4, &CoreCpp::ScriptCanvasDataVersionConverter)
->Field("m_scriptCanvas", &ScriptCanvasData::m_scriptCanvasEntity)
;
}
}
}
namespace ScriptCanvasEditor
{
Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+4 -4
View File
@@ -316,8 +316,8 @@ namespace ScriptCanvasEditor
using namespace AzToolsFramework::AssetBrowser;
bool isScriptCanvasAsset = false;
ScriptCanvasAssetDescription scriptCanvasAssetDescription;
if (AZStd::wildcard_match(AZStd::string::format("*%s", scriptCanvasAssetDescription.GetExtensionImpl()).c_str(), fullSourceFileName))
if (AZStd::wildcard_match(ScriptCanvasEditor::SourceDescription::GetFileExtension(), fullSourceFileName))
{
isScriptCanvasAsset = true;
}
@@ -339,7 +339,7 @@ namespace ScriptCanvasEditor
}
};
openers.push_back({ "O3DE_ScriptCanvasEditor", "Open In Script Canvas Editor...", QIcon(ScriptCanvasAssetDescription().GetIconPathImpl()), scriptCanvasEditorCallback });
openers.push_back({ "O3DE_ScriptCanvasEditor", "Open In Script Canvas Editor...", QIcon(ScriptCanvasEditor::SourceDescription::GetIconPath()), scriptCanvasEditorCallback });
}
}
@@ -394,7 +394,7 @@ namespace ScriptCanvasEditor
return ScriptCanvasEditor::RunGraph(runGraphSpec).front();
}
Reporter SystemComponent::RunAssetGraph(AZ::Data::Asset<AZ::Data::AssetData> asset, ScriptCanvas::ExecutionMode mode)
Reporter SystemComponent::RunAssetGraph(SourceHandle asset, ScriptCanvas::ExecutionMode mode)
{
Reporter reporter;
RunEditorAsset(asset, reporter, mode);
Gems/ScriptCanvas/Code/Editor/SystemComponent.h
+1 -1
View File
@@ -78,7 +78,7 @@ namespace ScriptCanvasEditor
////////////////////////////////////////////////////////////////////////
// ScriptCanvasExecutionBus::Handler...
Reporter RunAssetGraph(AZ::Data::Asset<AZ::Data::AssetData>, ScriptCanvas::ExecutionMode mode) override;
Reporter RunAssetGraph(SourceHandle source, ScriptCanvas::ExecutionMode mode) override;
Reporter RunGraph(AZStd::string_view path, ScriptCanvas::ExecutionMode mode) override;
////////////////////////////////////////////////////////////////////////
Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
+3 -3
View File
@@ -78,7 +78,7 @@ namespace ScriptCanvasEditor
if (!tabDataVariant.value<GraphTabMetadata>().m_canvasWidget)
{
CanvasWidget* canvasWidget = new CanvasWidget(tabDataVariant.value<GraphTabMetadata>().m_assetId, this);
canvasWidget->SetDefaultBorderColor(ScriptCanvasAssetDescription().GetDisplayColorImpl());
canvasWidget->SetDefaultBorderColor(ScriptCanvasEditor::SourceDescription::GetDisplayColor());
GraphTabMetadata replacement = tabDataVariant.value<GraphTabMetadata>();
replacement.m_canvasWidget = canvasWidget;
tabDataVariant.setValue(replacement);
@@ -147,11 +147,11 @@ namespace ScriptCanvasEditor
{
if (!SelectTab(assetId))
{
QIcon tabIcon = QIcon(ScriptCanvasAssetDescription().GetIconPathImpl());
QIcon tabIcon = QIcon(ScriptCanvasEditor::SourceDescription::GetIconPath());
tabIndex = qobject_cast<AzQtComponents::TabWidget*>(parent())->insertTab(tabIndex, new QWidget(), tabIcon, "");
GraphTabMetadata metaData;
CanvasWidget* canvasWidget = new CanvasWidget(assetId, this);
canvasWidget->SetDefaultBorderColor(ScriptCanvasAssetDescription().GetDisplayColorImpl());
canvasWidget->SetDefaultBorderColor(SourceDescription::GetDisplayColor());
metaData.m_canvasWidget = canvasWidget;
metaData.m_assetId = assetId;
metaData.m_fileState = fileState;
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
+1 -1
View File
@@ -17,7 +17,7 @@
#include <ScriptCanvas/Bus/NodeIdPair.h>
#include <ScriptCanvas/Bus/RequestBus.h>
#include <Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h>
#include <ScriptCanvas/Core/SubgraphInterface.h>
#include <ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
namespace AZ
Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp
+4 -1
View File
@@ -182,6 +182,7 @@ namespace ScriptCanvasEditor
return nodeIter->second;
}
/*
void ScriptCanvasAssetNodeUsageTreeItem::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
{
ProcessAsset(asset);
@@ -200,7 +201,8 @@ namespace ScriptCanvasEditor
ProcessAsset(asset);
}
void ScriptCanvasAssetNodeUsageTreeItem::ProcessAsset(const AZ::Data::Asset<ScriptCanvas::ScriptCanvasAssetBase>& scriptCanvasAsset)
// #sc_editor_asset_redux fix graph use statistics
void ScriptCanvasAssetNodeUsageTreeItem::ProcessAsset(const AZ::Data::Asset<LegacyScriptCanvasBaseAsset>& scriptCanvasAsset)
{
if (scriptCanvasAsset.IsReady())
{
@@ -222,6 +224,7 @@ namespace ScriptCanvasEditor
}
}
}
*/
///////////////////////////////////////////
// ScriptCanvasAssetNodeUsageTreeItemRoot
Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.h
+5 -4
View File
@@ -94,15 +94,16 @@ namespace ScriptCanvasEditor
void SetActiveNodeType(const ScriptCanvas::NodeTypeIdentifier& nodeTypeIdentifier);
int GetNodeCount() const;
private:
// AZ::Data::AssetBus::Handler
/*
void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
void OnAssetSaved(AZ::Data::Asset<AZ::Data::AssetData> asset, bool isSuccessful) override;
void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
*/
////
private:
void ProcessAsset(const AZ::Data::Asset<ScriptCanvas::ScriptCanvasAssetBase>& scriptCanvasAsset);
// void ProcessAsset(const AZ::Data::Asset<LegacyScriptCanvasBaseAsset>& scriptCanvasAsset);
QString m_name;
QIcon m_icon;
Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp
+2 -2
View File
@@ -435,9 +435,9 @@ namespace ScriptCanvasEditor
}
}
void StatisticsDialog::ProcessAsset(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry)
void StatisticsDialog::ProcessAsset([[maybe_unused]] const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry)
{
// #sc_editor_asset_redux cut or update
// #sc_editor_asset_redux cut or update
// if (entry)
// {
// if (entry->GetEntryType() == AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Product)
Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp
+6 -6
View File
@@ -574,14 +574,14 @@ namespace ScriptCanvasEditor
void UnitTestDockWidget::RunTestGraph(SourceHandle asset, ScriptCanvas::ExecutionMode mode)
{
Reporter reporter;
UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestStart, asset);
UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestStart, asset.Id());
ScriptCanvasExecutionBus::BroadcastResult(reporter, &ScriptCanvasExecutionRequests::RunAssetGraph, asset, mode);
UnitTestResult testResult;
UnitTestVerificationBus::BroadcastResult(testResult, &UnitTestVerificationRequests::Verify, reporter);
UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestResult, asset, testResult);
UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestResult, asset.Id(), testResult);
m_pendingTests.Add(asset, mode);
@@ -603,7 +603,7 @@ namespace ScriptCanvasEditor
++m_testMetrics[static_cast<int>(mode)].m_compilationFailures;
}
m_pendingTests.Complete(asset.GetId(), mode);
m_pendingTests.Complete(asset, mode);
}
void UnitTestDockWidget::OnSystemTick()
@@ -614,14 +614,14 @@ namespace ScriptCanvasEditor
}
}
void UnitTestDockWidget::PendingTests::Add(AZ::Data::AssetId assetId, ExecutionMode mode)
void UnitTestDockWidget::PendingTests::Add(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode)
{
m_pendingTests.push_back(AZStd::make_pair(assetId, mode));
}
void UnitTestDockWidget::PendingTests::Complete(AZ::Data::AssetId assetId, ExecutionMode mode)
void UnitTestDockWidget::PendingTests::Complete(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode)
{
AZStd::erase_if(m_pendingTests, [assetId, mode](const AZStd::pair<AZ::Data::AssetId, ExecutionMode>& pending)
AZStd::erase_if(m_pendingTests, [assetId, mode](const AZStd::pair<ScriptCanvasEditor::SourceHandle, ExecutionMode>& pending)
{
return (assetId == pending.first && mode == pending.second);
});
Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.h
+4 -4
View File
@@ -162,7 +162,7 @@ namespace ScriptCanvasEditor
void OpenTestResults(AZ::Uuid sourceUuid, AZStd::string_view sourceDisplayName);
void RunTests(const AZStd::vector<AZ::Uuid>& scriptUuids);
void RunTestGraph(AZ::Data::Asset<AZ::Data::AssetData>, ScriptCanvas::ExecutionMode);
void RunTestGraph(SourceHandle sourceHandle, ScriptCanvas::ExecutionMode);
void OnTestsComplete();
@@ -184,15 +184,15 @@ namespace ScriptCanvasEditor
{
public:
void Add(AZ::Data::AssetId assetId, ExecutionMode mode);
void Add(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode);
void Complete(AZ::Data::AssetId assetId, ExecutionMode mode);
void Complete(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode);
bool IsFinished() const;
private:
AZStd::vector<AZStd::pair<AZ::Data::AssetId, ExecutionMode>> m_pendingTests;
AZStd::vector<AZStd::pair<SourceHandle, ExecutionMode>> m_pendingTests;
};
PendingTests m_pendingTests;
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
+2 -4
View File
@@ -56,10 +56,9 @@
#if SCRIPTCANVAS_EDITOR
#include <Include/EditorCoreAPI.h>
#endif
#endif//#if SCRIPTCANVAS_EDITOR
#include <ScriptCanvas/Asset/ScriptCanvasAssetBase.h>
#endif
#endif//#if !defined(Q_MOC_RUN)
namespace GraphCanvas
{
@@ -87,7 +86,6 @@ namespace AzQtComponents
class QDir;
class QFile;
class QProgressDialog;
namespace ScriptCanvas { class ScriptCanvasAssetBase; }
namespace ScriptCanvasEditor
{
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp
+1 -1
View File
@@ -6,13 +6,13 @@
*
*/
#include <AzFramework/StringFunc/StringFunc.h>
#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
#include <AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h>
#include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
#include <Editor/View/Windows/Tools/UpgradeTool/LogTraits.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Scanner.h>
#include <ScriptCanvas/Assets/ScriptCanvasFileHandling.h>
namespace ScannerCpp
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
-1
View File
@@ -13,7 +13,6 @@
#include <AzCore/RTTI/ReflectContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/StringFunc/StringFunc.h>
#include <Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h>
#include "Attributes.h"
#include "Core.h"
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
+12 -11
View File
@@ -321,17 +321,18 @@ namespace ScriptCanvasEditor
{
public:
static inline constexpr const char* GetAssetGroup() { return "ScriptCanvas"; }
inline static constexpr const char* GetType() { return "{FA10C3DA-0717-4B72-8944-CD67D13DFA2B}"; } // type
inline static constexpr const char* GetName() { return "Script Canvas"; } // name
inline static constexpr const char* GetDescription() { return "Script Canvas Graph Asset"; } // description
inline static constexpr const char* GetSuggestedSavePath() { return "@projectroot@/scriptcanvas"; } // suggested save path
inline static constexpr const char* GetFileExtension() { return ".scriptcanvas"; } // fileExtention
inline static constexpr const char* GetGroup() { return "Script Canvas"; } // group
inline static constexpr const char* GetAssetNamePattern() { return "Untitled-%i"; } // asset name pattern
inline static constexpr const char* GetFileFilter() { return "Script Canvas Files (*.scriptcanvas)"; } // file filter
inline static constexpr const char* GetAssetTypeDisplayName() { return "Script Canvas"; } // asset type display name
inline static constexpr const char* GetEntityName() { return "Script Canvas"; } // entity name
inline static constexpr const char* GetIconPath() { return "Icons/ScriptCanvas/Viewport/ScriptCanvas.png"; } // icon pa
inline static constexpr const char* GetType() { return "{FA10C3DA-0717-4B72-8944-CD67D13DFA2B}"; }
inline static constexpr const char* GetName() { return "Script Canvas"; }
inline static constexpr const char* GetDescription() { return "Script Canvas Graph File"; }
inline static constexpr const char* GetSuggestedSavePath() { return "@projectroot@/scriptcanvas"; }
inline static constexpr const char* GetFileExtension() { return ".scriptcanvas"; }
inline static constexpr const char* GetGroup() { return "Script Canvas"; }
inline static constexpr const char* GetAssetNamePattern() { return "Untitled-%i"; }
inline static constexpr const char* GetFileFilter() { return "Script Canvas Files (*.scriptcanvas)"; }
inline static constexpr const char* GetAssetTypeDisplayName() { return "Script Canvas"; }
inline static constexpr const char* GetEntityName() { return "Script Canvas"; }
inline static constexpr const char* GetIconPath() { return "Icons/ScriptCanvas/Viewport/ScriptCanvas.png"; }
inline static AZ::Color GetDisplayColor() { return AZ::Color(1.0f, 0.0f, 0.0f, 1.0f); };
};
class SourceHandle
Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake
+1
View File
@@ -9,6 +9,7 @@
set(FILES
Include/ScriptCanvas/SystemComponent.h
Include/ScriptCanvas/ScriptCanvasGem.h
Include/ScriptCanvas/Asset/AssetDescription.h
Include/ScriptCanvas/Asset/AssetRegistry.h
Include/ScriptCanvas/Asset/AssetRegistryBus.h
Include/ScriptCanvas/Asset/ExecutionLogAsset.h