Gems/ScriptCanvas*

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
monroegm-disable-blank-issue-2
Esteban Papp 4 years ago
parent 1d53200eda
commit 711b332ebe

@ -86,7 +86,7 @@ namespace ScriptCanvasEditor
void UpdateFileState(AZ::Data::AssetId assetId, Tracker::ScriptCanvasFileState state) override; void UpdateFileState(AZ::Data::AssetId assetId, Tracker::ScriptCanvasFileState state) override;
AssetTrackerRequests::AssetList GetUnsavedAssets() override; AssetTrackerRequests::AssetList GetUnsavedAssets() override;
AssetTrackerRequests::AssetList GetAssets(); AssetTrackerRequests::AssetList GetAssets() override;
AssetTrackerRequests::AssetList GetAssetsIf(AZStd::function<bool(ScriptCanvasMemoryAsset::pointer asset)> pred = []() { return true; }) override; AssetTrackerRequests::AssetList GetAssetsIf(AZStd::function<bool(ScriptCanvasMemoryAsset::pointer asset)> pred = []() { return true; }) override;
AZ::EntityId GetSceneEntityIdFromEditorEntityId(AZ::Data::AssetId assetId, AZ::EntityId editorEntityId) override; AZ::EntityId GetSceneEntityIdFromEditorEntityId(AZ::Data::AssetId assetId, AZ::EntityId editorEntityId) override;

@ -128,15 +128,15 @@ namespace ScriptCanvasEditor
} }
} }
bool OnPreAssert(const char*, int, const char*, const char*) { return suppressPreAssert; } bool OnPreAssert(const char*, int, const char*, const char*) override { return suppressPreAssert; }
bool OnAssert(const char*) { return suppressAssert; } bool OnAssert(const char*) override { return suppressAssert; }
bool OnException(const char*) { return suppressException; } bool OnException(const char*) override { return suppressException; }
bool OnPreError(const char*, const char*, int, const char*, const char*) { return suppressPreError; } bool OnPreError(const char*, const char*, int, const char*, const char*) override { return suppressPreError; }
bool OnError(const char*, const char*) { return suppressError; } bool OnError(const char*, const char*) override { return suppressError; }
bool OnPreWarning(const char*, const char*, int, const char*, const char*) { return suppressPreWarning; } bool OnPreWarning(const char*, const char*, int, const char*, const char*) override { return suppressPreWarning; }
bool OnWarning(const char*, const char*) { return suppressWarning; } bool OnWarning(const char*, const char*) override { return suppressWarning; }
bool OnPrintf(const char*, const char*) { return suppressPrintf; } bool OnPrintf(const char*, const char*) override { return suppressPrintf; }
bool OnOutput(const char*, const char*) { return suppressAllOutput; } bool OnOutput(const char*, const char*) override { return suppressAllOutput; }
void SuppressPreAssert(bool suppress) override { suppressPreAssert = suppress; } void SuppressPreAssert(bool suppress) override { suppressPreAssert = suppress; }
void SuppressAssert(bool suppress)override { suppressAssert = suppress; } void SuppressAssert(bool suppress)override { suppressAssert = suppress; }

@ -33,9 +33,9 @@ namespace ScriptCanvasEditor
~DynamicSlotComponent() override = default; ~DynamicSlotComponent() override = default;
// AZ::Component // AZ::Component
void Init(); void Init() override;
void Activate(); void Activate() override;
void Deactivate(); void Deactivate() override;
//// ////
// GraphCanvas::SceneMemberNotificationBus // GraphCanvas::SceneMemberNotificationBus

@ -31,8 +31,8 @@ namespace ScriptCanvasEditor
SceneMemberMappingComponent(const AZ::EntityId& sourceId); SceneMemberMappingComponent(const AZ::EntityId& sourceId);
~SceneMemberMappingComponent() = default; ~SceneMemberMappingComponent() = default;
void Activate(); void Activate() override;
void Deactivate(); void Deactivate() override;
// SceneMemberMappingConfigurationRequestBus // SceneMemberMappingConfigurationRequestBus
void ConfigureMapping(const AZ::EntityId& scriptCanvasMemberId) override; void ConfigureMapping(const AZ::EntityId& scriptCanvasMemberId) override;
@ -68,8 +68,8 @@ namespace ScriptCanvasEditor
SlotMappingComponent(const AZ::EntityId& sourceId); SlotMappingComponent(const AZ::EntityId& sourceId);
~SlotMappingComponent() = default; ~SlotMappingComponent() = default;
void Activate(); void Activate() override;
void Deactivate(); void Deactivate() override;
// GraphCanvas::NodeNotificationBus // GraphCanvas::NodeNotificationBus
void OnAddedToScene(const AZ::EntityId&) override; void OnAddedToScene(const AZ::EntityId&) override;

@ -33,9 +33,9 @@ namespace ScriptCanvasEditor
~NodeDescriptorComponent() override = default; ~NodeDescriptorComponent() override = default;
// Component // Component
void Init(); void Init() override;
void Activate(); void Activate() override;
void Deactivate(); void Deactivate() override;
//// ////
// NodeDescriptorBus::Handler // NodeDescriptorBus::Handler

@ -74,7 +74,7 @@ namespace ScriptCanvasEditor
//// ////
// ScriptEventReceiveNodeDescriptorNotifications // ScriptEventReceiveNodeDescriptorNotifications
void OnScriptEventReloaded(const AZ::Data::Asset<ScriptEvents::ScriptEventsAsset>& asset); void OnScriptEventReloaded(const AZ::Data::Asset<ScriptEvents::ScriptEventsAsset>& asset) override;
//// ////
protected: protected:

@ -52,7 +52,7 @@ namespace ScriptCanvasEditor
//// ////
// VariableNodeDescriptorBus // VariableNodeDescriptorBus
ScriptCanvas::VariableId GetVariableId() const; ScriptCanvas::VariableId GetVariableId() const override;
//// ////
protected: protected:

@ -131,7 +131,7 @@ namespace ScriptCanvasEditor
return "vectorized"; return "vectorized";
} }
virtual AZStd::string GetElementStyle(int index) const AZStd::string GetElementStyle(int index) const override
{ {
return AZStd::string::format("vector_%i", index); return AZStd::string::format("vector_%i", index);
} }

@ -88,12 +88,12 @@ namespace ScriptCanvasEditor
//// ////
// GeneralEditorNotifications // GeneralEditorNotifications
void OnUndoRedoBegin() void OnUndoRedoBegin() override
{ {
ScriptCanvas::GraphVariableManagerNotificationBus::Handler::BusDisconnect(); ScriptCanvas::GraphVariableManagerNotificationBus::Handler::BusDisconnect();
} }
void OnUndoRedoEnd() void OnUndoRedoEnd() override
{ {
FinalizeActivation(); FinalizeActivation();
} }
@ -250,7 +250,7 @@ namespace ScriptCanvasEditor
} }
// SystemTickBus // SystemTickBus
void OnSystemTick() void OnSystemTick() override
{ {
AZ::SystemTickBus::Handler::BusDisconnect(); AZ::SystemTickBus::Handler::BusDisconnect();
AssignIndex(m_variableTypeModel.GetDefaultIndex()); AssignIndex(m_variableTypeModel.GetDefaultIndex());
@ -440,7 +440,7 @@ namespace ScriptCanvasEditor
} }
// SystemTickBus // SystemTickBus
void OnSystemTick() void OnSystemTick() override
{ {
AZ::SystemTickBus::Handler::BusDisconnect(); AZ::SystemTickBus::Handler::BusDisconnect();
AssignIndex(m_variableTypeModel.GetDefaultIndex()); AssignIndex(m_variableTypeModel.GetDefaultIndex());
@ -449,7 +449,7 @@ namespace ScriptCanvasEditor
//// ////
// NodeNotificationBus // NodeNotificationBus
void OnSlotDisplayTypeChanged(const ScriptCanvas::SlotId& slotId, [[maybe_unused]] const ScriptCanvas::Data::Type& slotType) void OnSlotDisplayTypeChanged(const ScriptCanvas::SlotId& slotId, [[maybe_unused]] const ScriptCanvas::Data::Type& slotType) override
{ {
if (slotId == GetSlotId()) if (slotId == GetSlotId())
{ {
@ -482,7 +482,7 @@ namespace ScriptCanvasEditor
//// ////
// EndpointNotificationBus // EndpointNotificationBus
void OnEndpointReferenceChanged(const ScriptCanvas::VariableId& variableId) void OnEndpointReferenceChanged(const ScriptCanvas::VariableId& variableId) override
{ {
ScriptCanvas::VariableNotificationBus::Handler::BusDisconnect(); ScriptCanvas::VariableNotificationBus::Handler::BusDisconnect();
ScriptCanvas::VariableNotificationBus::Handler::BusConnect(ScriptCanvas::GraphScopedVariableId(GetScriptCanvasId(), variableId)); ScriptCanvas::VariableNotificationBus::Handler::BusConnect(ScriptCanvas::GraphScopedVariableId(GetScriptCanvasId(), variableId));
@ -490,7 +490,7 @@ namespace ScriptCanvasEditor
SignalValueChanged(); SignalValueChanged();
} }
void OnSlotRecreated() void OnSlotRecreated() override
{ {
ScriptCanvas::Slot* slot = GetSlot(); ScriptCanvas::Slot* slot = GetSlot();

@ -103,7 +103,7 @@ namespace ScriptCanvasEditor
return "???"; return "???";
} }
AZStd::string GetStyle() const AZStd::string GetStyle() const override
{ {
return "vectorized"; return "vectorized";
} }

@ -50,7 +50,7 @@ namespace ScriptCanvasEditor
return m_comboBoxModel.GetIndexForValue(dataValue); return m_comboBoxModel.GetIndexForValue(dataValue);
} }
QString GetDisplayString() const QString GetDisplayString() const override
{ {
int32_t dataValue = GetValue(); int32_t dataValue = GetValue();
return m_comboBoxModel.GetNameForValue(dataValue); return m_comboBoxModel.GetNameForValue(dataValue);

@ -177,7 +177,7 @@ namespace ScriptCanvasEditor
return m_comboBoxModel.GetIndexForValue(dataValue); return m_comboBoxModel.GetIndexForValue(dataValue);
} }
QString GetDisplayString() const QString GetDisplayString() const override
{ {
DataType dataValue = this->GetValue(); DataType dataValue = this->GetValue();
return m_comboBoxModel.GetNameForValue(dataValue); return m_comboBoxModel.GetNameForValue(dataValue);

@ -81,8 +81,8 @@ namespace ScriptCanvasEditor
ScriptCanvas::Graph* GetScriptCanvasGraph() const; ScriptCanvas::Graph* GetScriptCanvasGraph() const;
using Description = ScriptCanvasAssetDescription; using Description = ScriptCanvasAssetDescription;
ScriptCanvas::ScriptCanvasData& GetScriptCanvasData(); ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() override;
const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const; const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const override;
}; };
} }

@ -248,8 +248,8 @@ namespace ScriptCanvasEditor
GraphCanvas::GraphId GetGraphCanvasGraphId() const override; GraphCanvas::GraphId GetGraphCanvasGraphId() const override;
AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* > GetGraphCanvasSaveData(); AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* > GetGraphCanvasSaveData() override;
void UpdateGraphCanvasSaveData(const AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* >& saveData); void UpdateGraphCanvasSaveData(const AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* >& saveData) override;
NodeIdPair CreateCustomNode(const AZ::Uuid& typeId, const AZ::Vector2& position) override; NodeIdPair CreateCustomNode(const AZ::Uuid& typeId, const AZ::Vector2& position) override;
@ -325,7 +325,7 @@ namespace ScriptCanvasEditor
} }
protected: protected:
void PostRestore(const UndoData& restoredData); void PostRestore(const UndoData& restoredData) override;
void UnregisterToast(const GraphCanvas::ToastId& toastId); void UnregisterToast(const GraphCanvas::ToastId& toastId);

@ -82,7 +82,7 @@ namespace ScriptCanvasEditor
StateMachine* GetStateMachine() override { return m_stateMachine; } StateMachine* GetStateMachine() override { return m_stateMachine; }
virtual int GetStateId() const { return Traits::StateID(); } int GetStateId() const override { return Traits::StateID(); }
static int StateID() { return Traits::StateID(); } static int StateID() { return Traits::StateID(); }

@ -40,7 +40,7 @@ namespace ScriptCanvasEditor
ScriptCanvasConstructPresets(); ScriptCanvasConstructPresets();
~ScriptCanvasConstructPresets() override = default; ~ScriptCanvasConstructPresets() override = default;
void InitializeConstructType(GraphCanvas::ConstructType constructType); void InitializeConstructType(GraphCanvas::ConstructType constructType) override;
}; };
class EditorWorkspace class EditorWorkspace

@ -59,7 +59,7 @@ namespace ScriptCanvasEditor
void onChildLineEditValueChange(const QString& value); void onChildLineEditValueChange(const QString& value);
protected: protected:
virtual void focusInEvent(QFocusEvent* e); void focusInEvent(QFocusEvent* e) override;
private: private:
QLineEdit* m_pLineEdit; QLineEdit* m_pLineEdit;

@ -65,7 +65,7 @@ namespace ScriptCanvasEditor
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// SystemRequestBus::Handler... // SystemRequestBus::Handler...
void AddAsyncJob(AZStd::function<void()>&& jobFunc) override; void AddAsyncJob(AZStd::function<void()>&& jobFunc) override;
void GetEditorCreatableTypes(AZStd::unordered_set<ScriptCanvas::Data::Type>& outCreatableTypes); void GetEditorCreatableTypes(AZStd::unordered_set<ScriptCanvas::Data::Type>& outCreatableTypes) override;
void CreateEditorComponentsOnEntity(AZ::Entity* entity, const AZ::Data::AssetType& assetType) override; void CreateEditorComponentsOnEntity(AZ::Entity* entity, const AZ::Data::AssetType& assetType) override;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
@ -110,7 +110,7 @@ namespace ScriptCanvasEditor
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// IUpgradeRequests... // IUpgradeRequests...
void ClearGraphsThatNeedUpgrade() void ClearGraphsThatNeedUpgrade() override
{ {
m_assetsThatNeedManualUpgrade.clear(); m_assetsThatNeedManualUpgrade.clear();
} }

@ -61,7 +61,7 @@ namespace ScriptCanvasEditor
protected: protected:
void resizeEvent(QResizeEvent *ev); void resizeEvent(QResizeEvent *ev) override;
void OnClicked(); void OnClicked();

@ -27,15 +27,15 @@ namespace ScriptCanvasEditor
bool IsCapturingData() const override { return false; } bool IsCapturingData() const override { return false; }
protected: protected:
void Visit(ScriptCanvas::AnnotateNodeSignal&); void Visit(ScriptCanvas::AnnotateNodeSignal&) override;
void Visit(ScriptCanvas::ExecutionThreadEnd&); void Visit(ScriptCanvas::ExecutionThreadEnd&) override;
void Visit(ScriptCanvas::ExecutionThreadBeginning&); void Visit(ScriptCanvas::ExecutionThreadBeginning&) override;
void Visit(ScriptCanvas::GraphActivation&); void Visit(ScriptCanvas::GraphActivation&) override;
void Visit(ScriptCanvas::GraphDeactivation&); void Visit(ScriptCanvas::GraphDeactivation&) override;
void Visit(ScriptCanvas::NodeStateChange&); void Visit(ScriptCanvas::NodeStateChange&) override;
void Visit(ScriptCanvas::InputSignal&); void Visit(ScriptCanvas::InputSignal&) override;
void Visit(ScriptCanvas::OutputSignal&); void Visit(ScriptCanvas::OutputSignal&) override;
void Visit(ScriptCanvas::VariableChange&); void Visit(ScriptCanvas::VariableChange&) override;
private: private:

@ -38,8 +38,8 @@ namespace ScriptCanvasEditor
void OnCurrentTargetChanged() override; void OnCurrentTargetChanged() override;
//// ////
bool CanCaptureData() const; bool CanCaptureData() const override;
bool IsCapturingData() const; bool IsCapturingData() const override;
void StartCaptureData(); void StartCaptureData();
void StopCaptureData(); void StopCaptureData();

@ -97,8 +97,8 @@ namespace ScriptCanvasEditor
//// ////
// AzToolsFramework::EditorEntityContextNotificationBus::Handler // AzToolsFramework::EditorEntityContextNotificationBus::Handler
void OnStartPlayInEditorBegin(); void OnStartPlayInEditorBegin() override;
void OnStopPlayInEditor(); void OnStopPlayInEditor() override;
//// ////
// ScriptCavnas::Debugger::ServiceNotificationsBus // ScriptCavnas::Debugger::ServiceNotificationsBus

@ -88,7 +88,7 @@ namespace ScriptCanvasEditor
AZ::NamedEntityId FindNamedEntityId(const AZ::EntityId& entityId) override; AZ::NamedEntityId FindNamedEntityId(const AZ::EntityId& entityId) override;
//// ////
virtual bool IsCapturingData() const = 0; bool IsCapturingData() const override = 0;
virtual bool CanCaptureData() const = 0; virtual bool CanCaptureData() const = 0;
// Should be bus methods, but don't want to copy data // Should be bus methods, but don't want to copy data

@ -115,7 +115,7 @@ namespace ScriptCanvasEditor
protected: protected:
bool OnMatchesFilter([[maybe_unused]] const DebugLogFilter& treeFilter) { return true; } bool OnMatchesFilter([[maybe_unused]] const DebugLogFilter& treeFilter) override { return true; }
UpdatePolicy m_updatePolicy; UpdatePolicy m_updatePolicy;
QTimer m_additionTimer; QTimer m_additionTimer;

@ -59,8 +59,8 @@ namespace ScriptCanvasEditor
FunctionPaletteTreeItem(const char* name, const ScriptCanvas::Grammar::FunctionSourceId& sourceId, AZ::Data::Asset<AZ::Data::AssetData> asset); FunctionPaletteTreeItem(const char* name, const ScriptCanvas::Grammar::FunctionSourceId& sourceId, AZ::Data::Asset<AZ::Data::AssetData> asset);
~FunctionPaletteTreeItem() = default; ~FunctionPaletteTreeItem() = default;
GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const; GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
QVariant OnData(const QModelIndex& index, int role) const; QVariant OnData(const QModelIndex& index, int role) const override;
ScriptCanvas::Grammar::FunctionSourceId GetFunctionSourceId() const; ScriptCanvas::Grammar::FunctionSourceId GetFunctionSourceId() const;
AZ::Data::AssetId GetSourceAssetId() const; AZ::Data::AssetId GetSourceAssetId() const;

@ -232,8 +232,8 @@ namespace ScriptCanvasEditor
ScriptEventsEventNodePaletteTreeItem(const AZ::Data::AssetId& m_assetId, const ScriptEvents::Method& methodDefinition, const ScriptCanvas::EBusEventId& eventId); ScriptEventsEventNodePaletteTreeItem(const AZ::Data::AssetId& m_assetId, const ScriptEvents::Method& methodDefinition, const ScriptCanvas::EBusEventId& eventId);
~ScriptEventsEventNodePaletteTreeItem() = default; ~ScriptEventsEventNodePaletteTreeItem() = default;
GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const; GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
QVariant OnData(const QModelIndex& index, int role) const; QVariant OnData(const QModelIndex& index, int role) const override;
ScriptCanvas::EBusBusId GetBusIdentifier() const; ScriptCanvas::EBusBusId GetBusIdentifier() const;
ScriptCanvas::EBusEventId GetEventIdentifier() const; ScriptCanvas::EBusEventId GetEventIdentifier() const;

@ -25,7 +25,7 @@ namespace ScriptCanvasEditor
CreateCommentNodeMimeEvent() = default; CreateCommentNodeMimeEvent() = default;
~CreateCommentNodeMimeEvent() = default; ~CreateCommentNodeMimeEvent() = default;
NodeIdPair ConstructNode(const AZ::EntityId& sceneId, const AZ::Vector2& scenePosition); NodeIdPair ConstructNode(const AZ::EntityId& sceneId, const AZ::Vector2& scenePosition) override;
bool ExecuteEvent(const AZ::Vector2& mousePosition, AZ::Vector2& sceneDropPosition, const AZ::EntityId& sceneId) override; bool ExecuteEvent(const AZ::Vector2& mousePosition, AZ::Vector2& sceneDropPosition, const AZ::EntityId& sceneId) override;
}; };
@ -54,7 +54,7 @@ namespace ScriptCanvasEditor
CreateNodeGroupMimeEvent() = default; CreateNodeGroupMimeEvent() = default;
~CreateNodeGroupMimeEvent() = default; ~CreateNodeGroupMimeEvent() = default;
NodeIdPair ConstructNode(const GraphCanvas::GraphId& sceneId, const AZ::Vector2& scenePosition); NodeIdPair ConstructNode(const GraphCanvas::GraphId& sceneId, const AZ::Vector2& scenePosition) override;
bool ExecuteEvent(const AZ::Vector2& mousePosition, AZ::Vector2& sceneDropPosition, const GraphCanvas::GraphId& sceneId) override; bool ExecuteEvent(const AZ::Vector2& mousePosition, AZ::Vector2& sceneDropPosition, const GraphCanvas::GraphId& sceneId) override;
}; };

@ -160,7 +160,7 @@ namespace ScriptCanvasEditor
//// ////
// GraphCanvas::SceneNotifications // GraphCanvas::SceneNotifications
void OnSelectionChanged(); void OnSelectionChanged() override;
//// ////
void ApplyPreferenceSort(); void ApplyPreferenceSort();

@ -272,7 +272,7 @@ namespace ScriptCanvasEditor
private: private:
// UIRequestBus // UIRequestBus
QMainWindow* GetMainWindow() override { return qobject_cast<QMainWindow*>(this); } QMainWindow* GetMainWindow() override { return qobject_cast<QMainWindow*>(this); }
void OpenValidationPanel(); void OpenValidationPanel() override;
// //
// Undo Handlers // Undo Handlers
@ -299,9 +299,9 @@ namespace ScriptCanvasEditor
bool ContainsGraph(const GraphCanvas::GraphId& graphId) const override; bool ContainsGraph(const GraphCanvas::GraphId& graphId) const override;
bool CloseGraph(const GraphCanvas::GraphId& graphId) override; bool CloseGraph(const GraphCanvas::GraphId& graphId) override;
void CustomizeConnectionEntity(AZ::Entity* connectionEntity); void CustomizeConnectionEntity(AZ::Entity* connectionEntity) override;
void ShowAssetPresetsMenu(GraphCanvas::ConstructType constructType); void ShowAssetPresetsMenu(GraphCanvas::ConstructType constructType) override;
GraphCanvas::ContextMenuAction::SceneReaction ShowSceneContextMenuWithGroup(const QPoint& screenPoint, const QPointF& scenePoint, AZ::EntityId groupTarget) override; GraphCanvas::ContextMenuAction::SceneReaction ShowSceneContextMenuWithGroup(const QPoint& screenPoint, const QPointF& scenePoint, AZ::EntityId groupTarget) override;
@ -327,8 +327,8 @@ namespace ScriptCanvasEditor
//// ////
//! ScriptCanvas::BatchOperationsNotificationBus //! ScriptCanvas::BatchOperationsNotificationBus
void OnCommandStarted(AZ::Crc32 commandTag); void OnCommandStarted(AZ::Crc32 commandTag) override;
void OnCommandFinished(AZ::Crc32 commandTag); void OnCommandFinished(AZ::Crc32 commandTag) override;
// File menu // File menu
void OnFileNew(); void OnFileNew();
@ -427,7 +427,7 @@ namespace ScriptCanvasEditor
QVariant GetTabData(const AZ::Data::AssetId& assetId); QVariant GetTabData(const AZ::Data::AssetId& assetId);
//! GeneralRequestBus //! GeneralRequestBus
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAssetId(const AZ::Data::AssetId& assetId); AZ::Outcome<int, AZStd::string> OpenScriptCanvasAssetId(const AZ::Data::AssetId& assetId) override;
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(AZ::Data::AssetId scriptCanvasAssetId, int tabIndex = -1) override; AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(AZ::Data::AssetId scriptCanvasAssetId, int tabIndex = -1) override;
AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(const ScriptCanvasMemoryAsset& scriptCanvasAsset, int tabIndex = -1); AZ::Outcome<int, AZStd::string> OpenScriptCanvasAsset(const ScriptCanvasMemoryAsset& scriptCanvasAsset, int tabIndex = -1);
int CloseScriptCanvasAsset(const AZ::Data::AssetId& assetId) override; int CloseScriptCanvasAsset(const AZ::Data::AssetId& assetId) override;
@ -497,7 +497,7 @@ namespace ScriptCanvasEditor
float GetEdgePanningScrollSpeed() const override; float GetEdgePanningScrollSpeed() const override;
GraphCanvas::EditorConstructPresets* GetConstructPresets() const override; GraphCanvas::EditorConstructPresets* GetConstructPresets() const override;
const GraphCanvas::ConstructTypePresetBucket* GetConstructTypePresetBucket(GraphCanvas::ConstructType constructType) const; const GraphCanvas::ConstructTypePresetBucket* GetConstructTypePresetBucket(GraphCanvas::ConstructType constructType) const override;
GraphCanvas::Styling::ConnectionCurveType GetConnectionCurveType() const override; GraphCanvas::Styling::ConnectionCurveType GetConnectionCurveType() const override;
GraphCanvas::Styling::ConnectionCurveType GetDataConnectionCurveType() const override; GraphCanvas::Styling::ConnectionCurveType GetDataConnectionCurveType() const override;

@ -109,11 +109,11 @@ namespace ScriptCanvas
//! NOTE: There can be multiple Graph components on the same entity so calling FindComponent may not not return this GraphComponent //! NOTE: There can be multiple Graph components on the same entity so calling FindComponent may not not return this GraphComponent
AZ::Entity* GetGraphEntity() const override { return GetEntity(); } AZ::Entity* GetGraphEntity() const override { return GetEntity(); }
Graph* GetGraph() { return this; } Graph* GetGraph() override { return this; }
GraphData* GetGraphData() override { return &m_graphData; } GraphData* GetGraphData() override { return &m_graphData; }
const GraphData* GetGraphDataConst() const override { return &m_graphData; } const GraphData* GetGraphDataConst() const override { return &m_graphData; }
const VariableData* GetVariableDataConst() const { return const_cast<Graph*>(this)->GetVariableData(); } const VariableData* GetVariableDataConst() const override { return const_cast<Graph*>(this)->GetVariableData(); }
bool AddGraphData(const GraphData&) override; bool AddGraphData(const GraphData&) override;
void RemoveGraphData(const GraphData&) override; void RemoveGraphData(const GraphData&) override;
@ -131,7 +131,7 @@ namespace ScriptCanvas
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
// StatusRequestBus // StatusRequestBus
void ValidateGraph(ValidationResults& validationEvents); void ValidateGraph(ValidationResults& validationEvents) override;
void ReportValidationResults(ValidationResults&) override { } void ReportValidationResults(ValidationResults&) override { }
//// ////

@ -31,12 +31,12 @@ namespace ScriptCanvas
SetDescription(AZStd::string::format("Variable with id %s has an invalid type.", variableId.ToString().c_str())); SetDescription(AZStd::string::format("Variable with id %s has an invalid type.", variableId.ToString().c_str()));
} }
bool CanAutoFix() const bool CanAutoFix() const override
{ {
return true; return true;
} }
AZStd::string GetIdentifier() const AZStd::string GetIdentifier() const override
{ {
return DataValidationIds::InvalidVariableTypeId; return DataValidationIds::InvalidVariableTypeId;
} }
@ -46,12 +46,12 @@ namespace ScriptCanvas
return m_variableId; return m_variableId;
} }
AZ::Crc32 GetIdCrc() const AZ::Crc32 GetIdCrc() const override
{ {
return DataValidationIds::InvalidVariableTypeCrc; return DataValidationIds::InvalidVariableTypeCrc;
} }
AZStd::string_view GetTooltip() const AZStd::string_view GetTooltip() const override
{ {
return "Invalid type for variable, auto fixing will remove all invalid variable nodes."; return "Invalid type for variable, auto fixing will remove all invalid variable nodes.";
} }

@ -59,17 +59,17 @@ namespace ScriptCanvas
, targetNode.GetNodeName().data())); , targetNode.GetNodeName().data()));
} }
bool CanAutoFix() const bool CanAutoFix() const override
{ {
return false; return false;
} }
AZStd::string GetIdentifier() const AZStd::string GetIdentifier() const override
{ {
return DataValidationIds::ScopedDataConnectionId; return DataValidationIds::ScopedDataConnectionId;
} }
AZ::Crc32 GetIdCrc() const AZ::Crc32 GetIdCrc() const override
{ {
return DataValidationIds::ScopedDataConnectionCrc; return DataValidationIds::ScopedDataConnectionCrc;
} }
@ -79,7 +79,7 @@ namespace ScriptCanvas
return m_connectionId; return m_connectionId;
} }
AZStd::string_view GetTooltip() const AZStd::string_view GetTooltip() const override
{ {
return "Out of Scope Data Connection"; return "Out of Scope Data Connection";
} }

@ -37,17 +37,17 @@ namespace ScriptCanvas
SetDescription("The Script Event asset this node uses has changed. This node is no longer valid. You can fix this by deleting this node, re-adding it and reconnecting it."); SetDescription("The Script Event asset this node uses has changed. This node is no longer valid. You can fix this by deleting this node, re-adding it and reconnecting it.");
} }
bool CanAutoFix() const bool CanAutoFix() const override
{ {
return false; return false;
} }
AZStd::string GetIdentifier() const AZStd::string GetIdentifier() const override
{ {
return DataValidationIds::ScriptEventVersionMismatchId; return DataValidationIds::ScriptEventVersionMismatchId;
} }
AZ::Crc32 GetIdCrc() const AZ::Crc32 GetIdCrc() const override
{ {
return DataValidationIds::ScriptEventVersionMismatchCrc; return DataValidationIds::ScriptEventVersionMismatchCrc;
} }
@ -57,7 +57,7 @@ namespace ScriptCanvas
return m_definition; return m_definition;
} }
AZStd::string_view GetTooltip() const AZStd::string_view GetTooltip() const override
{ {
return "The Script Event asset has changed, you can fix this problem by deleting the out of date node and re-adding it to your graph."; return "The Script Event asset has changed, you can fix this problem by deleting the out of date node and re-adding it to your graph.";
} }

@ -86,7 +86,7 @@ namespace ScriptCanvas
return DataValidationIds::UnknownSourceEndpointCrc; return DataValidationIds::UnknownSourceEndpointCrc;
} }
AZStd::string_view GetTooltip() const AZStd::string_view GetTooltip() const override
{ {
return "Unknown Source Endpoint"; return "Unknown Source Endpoint";
} }

@ -60,7 +60,7 @@ namespace ScriptCanvas
} }
// HighlightEntityEffect // HighlightEntityEffect
AZ::EntityId GetHighlightTarget() const AZ::EntityId GetHighlightTarget() const override
{ {
return m_nodeId; return m_nodeId;
} }

@ -43,7 +43,7 @@ namespace ScriptCanvas
} }
// HighlightEntityEffect // HighlightEntityEffect
AZ::EntityId GetHighlightTarget() const AZ::EntityId GetHighlightTarget() const override
{ {
return m_nodeId; return m_nodeId;
} }

@ -40,7 +40,7 @@ namespace ScriptCanvas
return true; return true;
} }
AZ::Outcome<DependencyReport, void> GetDependencies() const AZ::Outcome<DependencyReport, void> GetDependencies() const override
{ {
return AZ::Success(DependencyReport{}); return AZ::Success(DependencyReport{});
} }
@ -49,8 +49,6 @@ namespace ScriptCanvas
AZ_INLINE const NamedSlotIdMap& GetNamedSlotIdMap() const { return m_formatSlotMap; } AZ_INLINE const NamedSlotIdMap& GetNamedSlotIdMap() const { return m_formatSlotMap; }
AZ_INLINE const int GetPostDecimalPrecision() const { return m_numericPrecision; } AZ_INLINE const int GetPostDecimalPrecision() const { return m_numericPrecision; }
protected: protected:
// This is a map that binds the index into m_unresolvedString to the SlotId that needs to be checked for a valid datum. // This is a map that binds the index into m_unresolvedString to the SlotId that needs to be checked for a valid datum.

@ -102,7 +102,7 @@ namespace ScriptCanvas
AZ::Outcome<AZStd::string, void> GetFunctionCallName(const Slot* /*slot*/) const override; AZ::Outcome<AZStd::string, void> GetFunctionCallName(const Slot* /*slot*/) const override;
bool IsEBusAddressed() const override; bool IsEBusAddressed() const override;
AZStd::optional<size_t> GetEventIndex(AZStd::string eventName) const; AZStd::optional<size_t> GetEventIndex(AZStd::string eventName) const override;
const EBusEventEntry* FindEvent(const AZStd::string& name) const; const EBusEventEntry* FindEvent(const AZStd::string& name) const;
AZStd::string GetEBusName() const override; AZStd::string GetEBusName() const override;
bool IsAutoConnected() const override; bool IsAutoConnected() const override;
@ -138,7 +138,7 @@ namespace ScriptCanvas
void SetAutoConnectToGraphOwner(bool enabled); void SetAutoConnectToGraphOwner(bool enabled);
void OnDeserialize(); void OnDeserialize() override;
#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// #if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)////
void OnWriteEnd(); void OnWriteEnd();

@ -107,7 +107,7 @@ namespace ScriptCanvas
SlotId GetBusSlotId() const; SlotId GetBusSlotId() const;
void OnDeserialize(); void OnDeserialize() override;
#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// #if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)////
void OnWriteEnd(); void OnWriteEnd();

@ -36,9 +36,9 @@ namespace ScriptCanvas
void OnConfigured() override; void OnConfigured() override;
void ConfigureVisualExtensions() override; void ConfigureVisualExtensions() override;
bool CanDeleteSlot(const SlotId& slotId) const; bool CanDeleteSlot(const SlotId& slotId) const override;
SlotId HandleExtension(AZ::Crc32 extensionId); SlotId HandleExtension(AZ::Crc32 extensionId) override;
AZ::Outcome<DependencyReport, void> GetDependencies() const override; AZ::Outcome<DependencyReport, void> GetDependencies() const override;

@ -29,7 +29,7 @@ namespace ScriptCanvas
IsNull(); IsNull();
AZ::Outcome<DependencyReport, void> GetDependencies() const; AZ::Outcome<DependencyReport, void> GetDependencies() const override;
bool IsIfBranch() const override; bool IsIfBranch() const override;

@ -30,13 +30,13 @@ namespace ScriptCanvas
OrderedSequencer(); OrderedSequencer();
bool CanDeleteSlot(const SlotId& slotId) const; bool CanDeleteSlot(const SlotId& slotId) const override;
AZ::Outcome<DependencyReport, void> GetDependencies() const override; AZ::Outcome<DependencyReport, void> GetDependencies() const override;
ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& executionSlot, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const override; ConstSlotsOutcome GetSlotsInExecutionThreadByTypeImpl(const Slot& executionSlot, CombinedSlotType targetSlotType, const Slot* /*executionChildSlot*/) const override;
SlotId HandleExtension(AZ::Crc32 extensionId); SlotId HandleExtension(AZ::Crc32 extensionId) override;
void OnInit() override; void OnInit() override;

@ -33,9 +33,9 @@ namespace ScriptCanvas
void OnConfigured() override; void OnConfigured() override;
void ConfigureVisualExtensions() override; void ConfigureVisualExtensions() override;
bool CanDeleteSlot(const SlotId& slotId) const; bool CanDeleteSlot(const SlotId& slotId) const override;
SlotId HandleExtension(AZ::Crc32 extensionId); SlotId HandleExtension(AZ::Crc32 extensionId) override;
// Script Canvas Translation... // Script Canvas Translation...
bool IsSwitchStatement() const override { return true; } bool IsSwitchStatement() const override { return true; }

@ -39,7 +39,7 @@ namespace ScriptCanvas
void OnInit() override; void OnInit() override;
void ConfigureVisualExtensions() override; void ConfigureVisualExtensions() override;
bool OnValidateNode(ValidationResults& validationResults); bool OnValidateNode(ValidationResults& validationResults) override;
SlotId HandleExtension(AZ::Crc32 extensionId) override; SlotId HandleExtension(AZ::Crc32 extensionId) override;

@ -74,7 +74,7 @@ namespace ScriptCanvas
ScriptCanvasId FindScriptCanvasId(AZ::Entity* graphEntity) override; ScriptCanvasId FindScriptCanvasId(AZ::Entity* graphEntity) override;
ScriptCanvas::Node* GetNode(const AZ::EntityId&, const AZ::Uuid&) override; ScriptCanvas::Node* GetNode(const AZ::EntityId&, const AZ::Uuid&) override;
ScriptCanvas::Node* CreateNodeOnEntity(const AZ::EntityId& entityId, ScriptCanvasId scriptCanvasId, const AZ::Uuid& nodeType) override; ScriptCanvas::Node* CreateNodeOnEntity(const AZ::EntityId& entityId, ScriptCanvasId scriptCanvasId, const AZ::Uuid& nodeType) override;
SystemComponentConfiguration GetSystemComponentConfiguration() SystemComponentConfiguration GetSystemComponentConfiguration() override
{ {
SystemComponentConfiguration configuration; SystemComponentConfiguration configuration;
configuration.m_maxIterationsForInfiniteLoopDetection = m_infiniteLoopDetectionMaxIterations; configuration.m_maxIterationsForInfiniteLoopDetection = m_infiniteLoopDetectionMaxIterations;

@ -35,6 +35,7 @@ set(FILES
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DynamicDataTypeEvent.h Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DynamicDataTypeEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidExpressionEvent.h Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidExpressionEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidRandomSignalEvent.h Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidRandomSignalEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidVariableTypeEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/SlotReferenceEvent.h Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/SlotReferenceEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h

@ -139,7 +139,7 @@ namespace ScriptCanvasDeveloper
protected: protected:
void OnActionsComplete(); void OnActionsComplete() override;
private: private:
@ -222,7 +222,7 @@ namespace ScriptCanvasDeveloper
CreateGroupAction(GraphCanvas::EditorId editorGraph, GraphCanvas::GraphId graphId, CreationType creationType = CreationType::Hotkey); CreateGroupAction(GraphCanvas::EditorId editorGraph, GraphCanvas::GraphId graphId, CreationType creationType = CreationType::Hotkey);
~CreateGroupAction() override = default; ~CreateGroupAction() override = default;
void SetupAction(); void SetupAction() override;
// GraphCanvas::SceneNotificationBus::Handler // GraphCanvas::SceneNotificationBus::Handler
void OnNodeAdded(const AZ::EntityId& groupId, bool isPaste = false) override; void OnNodeAdded(const AZ::EntityId& groupId, bool isPaste = false) override;
@ -236,7 +236,7 @@ namespace ScriptCanvasDeveloper
void SetupToolbarAction(); void SetupToolbarAction();
void SetupHotkeyAction(); void SetupHotkeyAction();
void OnActionsComplete(); void OnActionsComplete() override;
private: private:

@ -32,7 +32,7 @@ namespace ScriptCanvasDeveloper
bool IsMissingPrecondition() override; bool IsMissingPrecondition() override;
EditorAutomationAction* GenerateMissingPreconditionAction() override; EditorAutomationAction* GenerateMissingPreconditionAction() override;
void SetupAction(); void SetupAction() override;
private: private:
@ -66,9 +66,9 @@ namespace ScriptCanvasDeveloper
ActionReport GenerateReport() const override; ActionReport GenerateReport() const override;
// SceneNotificaitonBus // SceneNotificaitonBus
void OnNodeRemoved(const AZ::EntityId& nodeId); void OnNodeRemoved(const AZ::EntityId& nodeId) override;
void OnConnectionRemoved(const AZ::EntityId& connectionId); void OnConnectionRemoved(const AZ::EntityId& connectionId) override;
//// ////
protected: protected:
@ -98,7 +98,7 @@ namespace ScriptCanvasDeveloper
MouseToNodePropertyEditorAction(GraphCanvas::SlotId slotId); MouseToNodePropertyEditorAction(GraphCanvas::SlotId slotId);
~MouseToNodePropertyEditorAction() override = default; ~MouseToNodePropertyEditorAction() override = default;
void SetupAction(); void SetupAction() override;
private: private:

@ -96,7 +96,7 @@ namespace ScriptCanvasDeveloper
bool IsMissingPrecondition() override; bool IsMissingPrecondition() override;
EditorAutomationAction* GenerateMissingPreconditionAction() override; EditorAutomationAction* GenerateMissingPreconditionAction() override;
void SetupAction(); void SetupAction() override;
// GraphCanvas::SceneNotificationBus // GraphCanvas::SceneNotificationBus
void OnNodeAdded(const AZ::EntityId& nodeId, bool isPaste) override; void OnNodeAdded(const AZ::EntityId& nodeId, bool isPaste) override;
@ -146,7 +146,7 @@ namespace ScriptCanvasDeveloper
ShowGraphVariablesAction() = default; ShowGraphVariablesAction() = default;
~ShowGraphVariablesAction() override = default; ~ShowGraphVariablesAction() override = default;
void SetupAction(); void SetupAction() override;
ActionReport GenerateReport() const override; ActionReport GenerateReport() const override;
}; };

@ -70,7 +70,7 @@ namespace ScriptCanvasDeveloper
FindViewCenterState(AutomationStateModelId outputId); FindViewCenterState(AutomationStateModelId outputId);
~FindViewCenterState() override = default; ~FindViewCenterState() override = default;
void OnCustomAction(); void OnCustomAction() override;
private: private:

@ -118,7 +118,7 @@ namespace ScriptCanvasDeveloper
private: private:
//// ScriptCanvasEditor::EditorGraphNotificationBus //// ScriptCanvasEditor::EditorGraphNotificationBus
void OnGraphCanvasNodeDisplayed(AZ::EntityId graphCanvasEntityId); void OnGraphCanvasNodeDisplayed(AZ::EntityId graphCanvasEntityId) override;
//// ////
AZStd::string m_nodeTitle; AZStd::string m_nodeTitle;

@ -52,7 +52,7 @@ namespace ScriptCanvasDeveloper
void OnActionNameChanged(); void OnActionNameChanged();
void OnClear(); void OnClear() override;
void OnNodeDisplayed(const GraphCanvas::NodeId& graphCanvasNodeId) override; void OnNodeDisplayed(const GraphCanvas::NodeId& graphCanvasNodeId) override;
private: private:

@ -101,7 +101,7 @@ namespace ScriptCanvasDeveloper
void RunTest(QModelIndex index); void RunTest(QModelIndex index);
// SystemTickBus // SystemTickBus
void OnSystemTick(); void OnSystemTick() override;
//// ////
// EditorAutomationTestDialogRequestBus::Handler // EditorAutomationTestDialogRequestBus::Handler

@ -55,8 +55,8 @@ namespace ScriptCanvasDeveloper
protected: protected:
void OnSetupStateActions(EditorAutomationActionRunner& actionRunner); void OnSetupStateActions(EditorAutomationActionRunner& actionRunner) override;
void OnStateActionsComplete(); void OnStateActionsComplete() override;
private: private:

@ -548,7 +548,7 @@ namespace ScriptCanvasTests
bool DestroyEntityById(AZ::EntityId entityId) override; bool DestroyEntityById(AZ::EntityId entityId) override;
AZ::Entity* CloneEntity(const AZ::Entity& sourceEntity) override; AZ::Entity* CloneEntity(const AZ::Entity& sourceEntity) override;
void ResetContext() override; void ResetContext() override;
AZ::EntityId FindLoadedEntityIdMapping(const AZ::EntityId& staticId) const; AZ::EntityId FindLoadedEntityIdMapping(const AZ::EntityId& staticId) const override;
//// ////
void AddEntity(AZ::EntityId entityId); void AddEntity(AZ::EntityId entityId);

@ -237,7 +237,7 @@ namespace ScriptCanvasTesting
return result; return result;
} }
void Void(AZStd::string_view value) void Void(AZStd::string_view value) override
{ {
Call(FN_Void, value); Call(FN_Void, value);
} }

@ -99,7 +99,7 @@ public:
} }
} }
void ConfigureSlots() void ConfigureSlots() override
{ {
ScriptCanvas::SlotExecution::Ins ins; ScriptCanvas::SlotExecution::Ins ins;
{ {

Loading…
Cancel
Save