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

merge system component

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-09-24 13:05:59 -07:00
parent e125462eaa 66a875bf79
commit 72ff163ff0
1762 changed files with 66552 additions and 51567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
+1 -1
View File
@@ -86,7 +86,7 @@ namespace ScriptCanvasEditor
void UpdateFileState(AZ::Data::AssetId assetId, Tracker::ScriptCanvasFileState state) 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;
AZ::EntityId GetSceneEntityIdFromEditorEntityId(AZ::Data::AssetId assetId, AZ::EntityId editorEntityId) override;
Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasTraceUtilities.h
+9 -9
View File
@@ -128,15 +128,15 @@ namespace ScriptCanvasEditor
}
}
bool OnPreAssert(const char*, int, const char*, const char*) { return suppressPreAssert; }
bool OnAssert(const char*) { return suppressAssert; }
bool OnException(const char*) { return suppressException; }
bool OnPreError(const char*, const char*, int, const char*, const char*) { return suppressPreError; }
bool OnError(const char*, const char*) { return suppressError; }
bool OnPreWarning(const char*, const char*, int, const char*, const char*) { return suppressPreWarning; }
bool OnWarning(const char*, const char*) { return suppressWarning; }
bool OnPrintf(const char*, const char*) { return suppressPrintf; }
bool OnOutput(const char*, const char*) { return suppressAllOutput; }
bool OnPreAssert(const char*, int, const char*, const char*) override { return suppressPreAssert; }
bool OnAssert(const char*) override { return suppressAssert; }
bool OnException(const char*) override { return suppressException; }
bool OnPreError(const char*, const char*, int, const char*, const char*) override { return suppressPreError; }
bool OnError(const char*, const char*) override { return suppressError; }
bool OnPreWarning(const char*, const char*, int, const char*, const char*) override { return suppressPreWarning; }
bool OnWarning(const char*, const char*) override { return suppressWarning; }
bool OnPrintf(const char*, const char*) override { return suppressPrintf; }
bool OnOutput(const char*, const char*) override { return suppressAllOutput; }
void SuppressPreAssert(bool suppress) override { suppressPreAssert = suppress; }
void SuppressAssert(bool suppress)override { suppressAssert = suppress; }
Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.h
+3 -3
View File
@@ -33,9 +33,9 @@ namespace ScriptCanvasEditor
~DynamicSlotComponent() override = default;
// AZ::Component
void Init();
void Activate();
void Deactivate();
void Init() override;
void Activate() override;
void Deactivate() override;
////
// GraphCanvas::SceneMemberNotificationBus
Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.h
+4 -4
View File
@@ -31,8 +31,8 @@ namespace ScriptCanvasEditor
SceneMemberMappingComponent(const AZ::EntityId& sourceId);
~SceneMemberMappingComponent() = default;
void Activate();
void Deactivate();
void Activate() override;
void Deactivate() override;
// SceneMemberMappingConfigurationRequestBus
void ConfigureMapping(const AZ::EntityId& scriptCanvasMemberId) override;
@@ -68,8 +68,8 @@ namespace ScriptCanvasEditor
SlotMappingComponent(const AZ::EntityId& sourceId);
~SlotMappingComponent() = default;
void Activate();
void Deactivate();
void Activate() override;
void Deactivate() override;
// GraphCanvas::NodeNotificationBus
void OnAddedToScene(const AZ::EntityId&) override;
Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.h
+3 -3
View File
@@ -33,9 +33,9 @@ namespace ScriptCanvasEditor
~NodeDescriptorComponent() override = default;
// Component
void Init();
void Activate();
void Deactivate();
void Init() override;
void Activate() override;
void Deactivate() override;
////
// NodeDescriptorBus::Handler
Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.h
+1 -1
View File
@@ -74,7 +74,7 @@ namespace ScriptCanvasEditor
////
// ScriptEventReceiveNodeDescriptorNotifications
void OnScriptEventReloaded(const AZ::Data::Asset<ScriptEvents::ScriptEventsAsset>& asset);
void OnScriptEventReloaded(const AZ::Data::Asset<ScriptEvents::ScriptEventsAsset>& asset) override;
////
protected:
Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.h
+1 -1
View File
@@ -52,7 +52,7 @@ namespace ScriptCanvasEditor
////
// VariableNodeDescriptorBus
ScriptCanvas::VariableId GetVariableId() const;
ScriptCanvas::VariableId GetVariableId() const override;
////
protected:
Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasColorDataInterface.h
+1 -1
View File
@@ -131,7 +131,7 @@ namespace ScriptCanvasEditor
return "vectorized";
}
virtual AZStd::string GetElementStyle(int index) const
AZStd::string GetElementStyle(int index) const override
{
return AZStd::string::format("vector_%i", index);
}
Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVariableDataInterface.h
+7 -7
View File
@@ -88,12 +88,12 @@ namespace ScriptCanvasEditor
////
// GeneralEditorNotifications
void OnUndoRedoBegin()
void OnUndoRedoBegin() override
{
ScriptCanvas::GraphVariableManagerNotificationBus::Handler::BusDisconnect();
}
void OnUndoRedoEnd()
void OnUndoRedoEnd() override
{
FinalizeActivation();
}
@@ -250,7 +250,7 @@ namespace ScriptCanvasEditor
}
// SystemTickBus
void OnSystemTick()
void OnSystemTick() override
{
AZ::SystemTickBus::Handler::BusDisconnect();
AssignIndex(m_variableTypeModel.GetDefaultIndex());
@@ -440,7 +440,7 @@ namespace ScriptCanvasEditor
}
// SystemTickBus
void OnSystemTick()
void OnSystemTick() override
{
AZ::SystemTickBus::Handler::BusDisconnect();
AssignIndex(m_variableTypeModel.GetDefaultIndex());
@@ -449,7 +449,7 @@ namespace ScriptCanvasEditor
////
// 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())
{
@@ -482,7 +482,7 @@ namespace ScriptCanvasEditor
////
// EndpointNotificationBus
void OnEndpointReferenceChanged(const ScriptCanvas::VariableId& variableId)
void OnEndpointReferenceChanged(const ScriptCanvas::VariableId& variableId) override
{
ScriptCanvas::VariableNotificationBus::Handler::BusDisconnect();
ScriptCanvas::VariableNotificationBus::Handler::BusConnect(ScriptCanvas::GraphScopedVariableId(GetScriptCanvasId(), variableId));
@@ -490,7 +490,7 @@ namespace ScriptCanvasEditor
SignalValueChanged();
}
void OnSlotRecreated()
void OnSlotRecreated() override
{
ScriptCanvas::Slot* slot = GetSlot();
Gems/ScriptCanvas/Code/Editor/GraphCanvas/DataInterfaces/ScriptCanvasVectorDataInterface.h
+1 -1
View File
@@ -103,7 +103,7 @@ namespace ScriptCanvasEditor
return "???";
}
AZStd::string GetStyle() const
AZStd::string GetStyle() const override
{
return "vectorized";
}
Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasEnumComboBoxPropertyDataInterface.h
+1 -1
View File
@@ -50,7 +50,7 @@ namespace ScriptCanvasEditor
return m_comboBoxModel.GetIndexForValue(dataValue);
}
QString GetDisplayString() const
QString GetDisplayString() const override
{
int32_t dataValue = GetValue();
return m_comboBoxModel.GetNameForValue(dataValue);
Gems/ScriptCanvas/Code/Editor/GraphCanvas/PropertyInterfaces/ScriptCanvasPropertyDataInterface.h
+1 -1
View File
@@ -177,7 +177,7 @@ namespace ScriptCanvasEditor
return m_comboBoxModel.GetIndexForValue(dataValue);
}
QString GetDisplayString() const
QString GetDisplayString() const override
{
DataType dataValue = this->GetValue();
return m_comboBoxModel.GetNameForValue(dataValue);
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAsset.h
+2 -2
View File
@@ -81,8 +81,8 @@ namespace ScriptCanvasEditor
ScriptCanvas::Graph* GetScriptCanvasGraph() const;
using Description = ScriptCanvasAssetDescription;
ScriptCanvas::ScriptCanvasData& GetScriptCanvasData();
const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const;
ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() override;
const ScriptCanvas::ScriptCanvasData& GetScriptCanvasData() const override;
};
}
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
+3 -3
View File
@@ -248,8 +248,8 @@ namespace ScriptCanvasEditor
GraphCanvas::GraphId GetGraphCanvasGraphId() const override;
AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* > GetGraphCanvasSaveData();
void UpdateGraphCanvasSaveData(const AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* >& saveData);
AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* > GetGraphCanvasSaveData() override;
void UpdateGraphCanvasSaveData(const AZStd::unordered_map< AZ::EntityId, GraphCanvas::EntitySaveDataContainer* >& saveData) override;
NodeIdPair CreateCustomNode(const AZ::Uuid& typeId, const AZ::Vector2& position) override;
@@ -325,7 +325,7 @@ namespace ScriptCanvasEditor
}
protected:
void PostRestore(const UndoData& restoredData);
void PostRestore(const UndoData& restoredData) override;
void UnregisterToast(const GraphCanvas::ToastId& toastId);
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/GraphUpgrade.h
+1 -1
View File
@@ -82,7 +82,7 @@ namespace ScriptCanvasEditor
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(); }
Gems/ScriptCanvas/Code/Editor/Settings.h
+1 -1
View File
@@ -40,7 +40,7 @@ namespace ScriptCanvasEditor
ScriptCanvasConstructPresets();
~ScriptCanvasConstructPresets() override = default;
void InitializeConstructType(GraphCanvas::ConstructType constructType);
void InitializeConstructType(GraphCanvas::ConstructType constructType) override;
};
class EditorWorkspace
Gems/ScriptCanvas/Code/Editor/Static/Include/ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h
+1 -1
View File
@@ -59,7 +59,7 @@ namespace ScriptCanvasEditor
void onChildLineEditValueChange(const QString& value);
protected:
virtual void focusInEvent(QFocusEvent* e);
void focusInEvent(QFocusEvent* e) override;
private:
QLineEdit* m_pLineEdit;
Gems/ScriptCanvas/Code/Editor/SystemComponent.h
+2 -1
View File
@@ -60,7 +60,7 @@ namespace ScriptCanvasEditor
////////////////////////////////////////////////////////////////////////
// SystemRequestBus::Handler...
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;
////////////////////////////////////////////////////////////////////////
@@ -97,6 +97,7 @@ namespace ScriptCanvasEditor
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
void ClearGraphsThatNeedUpgrade()
private:
SystemComponent(const SystemComponent&) = delete;
Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.h
+1 -1
View File
@@ -61,7 +61,7 @@ namespace ScriptCanvasEditor
protected:
void resizeEvent(QResizeEvent *ev);
void resizeEvent(QResizeEvent *ev) override;
void OnClicked();
Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.h
+9 -9
View File
@@ -27,15 +27,15 @@ namespace ScriptCanvasEditor
bool IsCapturingData() const override { return false; }
protected:
void Visit(ScriptCanvas::AnnotateNodeSignal&);
void Visit(ScriptCanvas::ExecutionThreadEnd&);
void Visit(ScriptCanvas::ExecutionThreadBeginning&);
void Visit(ScriptCanvas::GraphActivation&);
void Visit(ScriptCanvas::GraphDeactivation&);
void Visit(ScriptCanvas::NodeStateChange&);
void Visit(ScriptCanvas::InputSignal&);
void Visit(ScriptCanvas::OutputSignal&);
void Visit(ScriptCanvas::VariableChange&);
void Visit(ScriptCanvas::AnnotateNodeSignal&) override;
void Visit(ScriptCanvas::ExecutionThreadEnd&) override;
void Visit(ScriptCanvas::ExecutionThreadBeginning&) override;
void Visit(ScriptCanvas::GraphActivation&) override;
void Visit(ScriptCanvas::GraphDeactivation&) override;
void Visit(ScriptCanvas::NodeStateChange&) override;
void Visit(ScriptCanvas::InputSignal&) override;
void Visit(ScriptCanvas::OutputSignal&) override;
void Visit(ScriptCanvas::VariableChange&) override;
private:
Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.h
+2 -2
View File
@@ -38,8 +38,8 @@ namespace ScriptCanvasEditor
void OnCurrentTargetChanged() override;
////
bool CanCaptureData() const;
bool IsCapturingData() const;
bool CanCaptureData() const override;
bool IsCapturingData() const override;
void StartCaptureData();
void StopCaptureData();
Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.h
+2 -2
View File
@@ -97,8 +97,8 @@ namespace ScriptCanvasEditor
////
// AzToolsFramework::EditorEntityContextNotificationBus::Handler
void OnStartPlayInEditorBegin();
void OnStopPlayInEditor();
void OnStartPlayInEditorBegin() override;
void OnStopPlayInEditor() override;
////
// ScriptCavnas::Debugger::ServiceNotificationsBus
Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.h
+1 -1
View File
@@ -88,7 +88,7 @@ namespace ScriptCanvasEditor
AZ::NamedEntityId FindNamedEntityId(const AZ::EntityId& entityId) override;
////
virtual bool IsCapturingData() const = 0;
bool IsCapturingData() const override = 0;
virtual bool CanCaptureData() const = 0;
// Should be bus methods, but don't want to copy data
Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.h
+1 -1
View File
@@ -115,7 +115,7 @@ namespace ScriptCanvasEditor
protected:
bool OnMatchesFilter([[maybe_unused]] const DebugLogFilter& treeFilter) { return true; }
bool OnMatchesFilter([[maybe_unused]] const DebugLogFilter& treeFilter) override { return true; }
UpdatePolicy m_updatePolicy;
QTimer m_additionTimer;
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h
+2 -2
View File
@@ -59,8 +59,8 @@ namespace ScriptCanvasEditor
FunctionPaletteTreeItem(const char* name, const ScriptCanvas::Grammar::FunctionSourceId& sourceId, AZ::Data::Asset<AZ::Data::AssetData> asset);
~FunctionPaletteTreeItem() = default;
GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const;
QVariant OnData(const QModelIndex& index, int role) const;
GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
QVariant OnData(const QModelIndex& index, int role) const override;
ScriptCanvas::Grammar::FunctionSourceId GetFunctionSourceId() const;
AZ::Data::AssetId GetSourceAssetId() const;
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
+1 -1
View File
@@ -1322,7 +1322,7 @@ namespace ScriptCanvasEditor
if (seperator == AZStd::string_view::npos)
{
categoryTrail = nullptr;
categoryTrail = {};
}
else
{
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.h
+2 -2
View File
@@ -232,8 +232,8 @@ namespace ScriptCanvasEditor
ScriptEventsEventNodePaletteTreeItem(const AZ::Data::AssetId& m_assetId, const ScriptEvents::Method& methodDefinition, const ScriptCanvas::EBusEventId& eventId);
~ScriptEventsEventNodePaletteTreeItem() = default;
GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const;
QVariant OnData(const QModelIndex& index, int role) const;
GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
QVariant OnData(const QModelIndex& index, int role) const override;
ScriptCanvas::EBusBusId GetBusIdentifier() const;
ScriptCanvas::EBusEventId GetEventIdentifier() const;
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
+2 -2
View File
@@ -25,7 +25,7 @@ namespace ScriptCanvasEditor
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;
};
@@ -54,7 +54,7 @@ namespace ScriptCanvasEditor
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;
};
Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.h
+1 -1
View File
@@ -160,7 +160,7 @@ namespace ScriptCanvasEditor
////
// GraphCanvas::SceneNotifications
void OnSelectionChanged();
void OnSelectionChanged() override;
////
void ApplyPreferenceSort();
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
+7 -7
View File
@@ -271,7 +271,7 @@ namespace ScriptCanvasEditor
private:
// UIRequestBus
QMainWindow* GetMainWindow() override { return qobject_cast<QMainWindow*>(this); }
void OpenValidationPanel();
void OpenValidationPanel() override;
//
// Undo Handlers
@@ -298,9 +298,9 @@ namespace ScriptCanvasEditor
bool ContainsGraph(const GraphCanvas::GraphId& graphId) const 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;
@@ -326,8 +326,8 @@ namespace ScriptCanvasEditor
////
//! ScriptCanvas::BatchOperationsNotificationBus
void OnCommandStarted(AZ::Crc32 commandTag);
void OnCommandFinished(AZ::Crc32 commandTag);
void OnCommandStarted(AZ::Crc32 commandTag) override;
void OnCommandFinished(AZ::Crc32 commandTag) override;
// File menu
void OnFileNew();
@@ -426,7 +426,7 @@ namespace ScriptCanvasEditor
QVariant GetTabData(const AZ::Data::AssetId& assetId);
//! 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(const ScriptCanvasMemoryAsset& scriptCanvasAsset, int tabIndex = -1);
int CloseScriptCanvasAsset(const AZ::Data::AssetId& assetId) override;
@@ -496,7 +496,7 @@ namespace ScriptCanvasEditor
float GetEdgePanningScrollSpeed() 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 GetDataConnectionCurveType() const override;
Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
+21
View File
@@ -61,7 +61,10 @@ namespace ScriptCanvasEditor
bool IsInSubMenu() const override;
AZStd::string GetSubMenuPath() const override;
using GraphCanvas::SceneContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SceneContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
};
@@ -77,7 +80,10 @@ namespace ScriptCanvasEditor
GraphCanvas::ActionGroupId GetActionGroupId() const override;
using GraphCanvas::ContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::ContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
private:
@@ -110,7 +116,10 @@ namespace ScriptCanvasEditor
GraphCanvas::ActionGroupId GetActionGroupId() const override;
using SlotManipulationMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using SlotManipulationMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
private:
@@ -127,7 +136,10 @@ namespace ScriptCanvasEditor
ExposeSlotMenuAction(QObject* parent);
virtual ~ExposeSlotMenuAction() = default;
using GraphCanvas::SlotContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SlotContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
protected:
@@ -145,7 +157,10 @@ namespace ScriptCanvasEditor
virtual ~SetDataSlotTypeMenuAction() = default;
static bool IsSupportedSlotType(const AZ::EntityId& slotId);
using GraphCanvas::SlotContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SlotContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
private:
@@ -164,7 +179,10 @@ namespace ScriptCanvasEditor
CreateAzEventHandlerSlotMenuAction(QObject* parent);
using GraphCanvas::SlotContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SlotContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
static const AZ::BehaviorMethod* FindBehaviorMethodWithAzEventReturn(const GraphCanvas::GraphId& graphId, AZ::EntityId targetId);
@@ -239,7 +257,10 @@ namespace ScriptCanvasEditor
RenameFunctionDefinitionNodeAction(NodeDescriptorComponent* descriptor, QObject* parent);
virtual ~RenameFunctionDefinitionNodeAction() = default;
using GraphCanvas::NodeContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::NodeContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
NodeDescriptorComponent* m_descriptor;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.h
+3 -3
View File
@@ -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
AZ::Entity* GetGraphEntity() const override { return GetEntity(); }
Graph* GetGraph() { return this; }
Graph* GetGraph() override { return this; }
GraphData* GetGraphData() 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;
void RemoveGraphData(const GraphData&) override;
@@ -131,7 +131,7 @@ namespace ScriptCanvas
///////////////////////////////////////////////////////////
// StatusRequestBus
void ValidateGraph(ValidationResults& validationEvents);
void ValidateGraph(ValidationResults& validationEvents) override;
void ReportValidationResults(ValidationResults&) override { }
////
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
+13 -12
View File
@@ -69,14 +69,14 @@ namespace ScriptCanvas
{
public:
/// Called right before we start reading from the instance pointed by classPtr.
void OnReadBegin(void* objectPtr)
void OnReadBegin(void* objectPtr) override
{
t_Class* deserializedObject = reinterpret_cast<t_Class*>(objectPtr);
deserializedObject->OnReadBegin();
}
/// Called after we are done reading from the instance pointed by classPtr.
void OnReadEnd(void* objectPtr)
void OnReadEnd(void* objectPtr) override
{
t_Class* deserializedObject = reinterpret_cast<t_Class*>(objectPtr);
deserializedObject->OnReadEnd();
@@ -178,8 +178,8 @@ namespace ScriptCanvas
NodePropertyInterface() = default;
public:
AZ_RTTI(NodePropertyInterface, "{265A2163-D3AE-4C4E-BDCC-37BA0084BF88}");
virtual ~NodePropertyInterface() = default;
virtual Data::Type GetDataType() = 0;
@@ -217,14 +217,14 @@ namespace ScriptCanvas
AZ_RTTI((TypedNodePropertyInterface<DataType>, "{24248937-86FB-406C-8DD5-023B10BD0B60}", DataType), NodePropertyInterface);
TypedNodePropertyInterface() = default;
~TypedNodePropertyInterface() = default;
virtual ~TypedNodePropertyInterface() = default;
void SetPropertyReference(DataType* dataReference)
{
m_dataType = dataReference;
}
virtual Data::Type GetDataType() override
Data::Type GetDataType() override
{
return Data::FromAZType(azrtti_typeid<DataType>());
}
@@ -283,7 +283,7 @@ namespace ScriptCanvas
AZ_RTTI((TypedComboBoxNodePropertyInterface<DataType>, "{24248937-86FB-406C-8DD5-023B10BD0B60}", DataType), TypedNodePropertyInterface<DataType>, ComboBoxPropertyInterface);
TypedComboBoxNodePropertyInterface() = default;
~TypedComboBoxNodePropertyInterface() = default;
virtual ~TypedComboBoxNodePropertyInterface() = default;
// TypedNodePropertyInterface
void ResetToDefault() override
@@ -310,7 +310,7 @@ namespace ScriptCanvas
}
// ComboBoxPropertyInterface
int GetSelectedIndex() const
int GetSelectedIndex() const override
{
int counter = -1;
@@ -328,7 +328,7 @@ namespace ScriptCanvas
return counter;
}
void SetSelectedIndex(int index)
void SetSelectedIndex(int index) override
{
if (index >= 0 || index < m_displaySet.size())
{
@@ -354,6 +354,7 @@ namespace ScriptCanvas
{
public:
AZ_RTTI(EnumComboBoxNodePropertyInterface, "{7D46B998-9E05-401A-AC92-37A90BAF8F60}", TypedComboBoxNodePropertyInterface<int32_t>);
virtual ~EnumComboBoxNodePropertyInterface() = default;
// No way of identifying Enum types properly yet. Going to fake a BCO object type for now.
static const AZ::Uuid k_EnumUUID;
@@ -512,13 +513,13 @@ namespace ScriptCanvas
//! Node internal initialization, for custom init, use OnInit
void Init() override final;
void Init() final;
//! Node internal activation and housekeeping, for custom activation configuration use OnActivate
void Activate() override final;
void Activate() final;
//! Node internal deactivation and housekeeping, for custom deactivation configuration use OnDeactivate
void Deactivate() override final;
void Deactivate() final;
void PostActivate();
@@ -590,7 +591,7 @@ namespace ScriptCanvas
NodeDisabledFlag GetNodeDisabledFlag() const;
void SetNodeDisabledFlag(NodeDisabledFlag disabledFlag);
bool RemoveVariableReferences(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds);
bool RemoveVariableReferences(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) override;
////
Slot* GetSlotByName(AZStd::string_view slotName) const;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ClientTransceiver.h
+1 -1
View File
@@ -78,7 +78,7 @@ namespace ScriptCanvas
//////////////////////////////////////////////////////////////////////////
// TargetManagerClient
void DesiredTargetConnected(bool connected) override;
void DesiredTargetChanged(AZ::u32 newId, AZ::u32 oldId);
void DesiredTargetChanged(AZ::u32 newId, AZ::u32 oldId) override;
void TargetJoinedNetwork(AzFramework::TargetInfo info) override;
void TargetLeftNetwork(AzFramework::TargetInfo info) override;
//////////////////////////////////////////////////////////////////////////
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidVariableTypeEvent.h
+4 -4
View File
@@ -31,12 +31,12 @@ namespace ScriptCanvas
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;
}
AZStd::string GetIdentifier() const
AZStd::string GetIdentifier() const override
{
return DataValidationIds::InvalidVariableTypeId;
}
@@ -46,12 +46,12 @@ namespace ScriptCanvas
return m_variableId;
}
AZ::Crc32 GetIdCrc() const
AZ::Crc32 GetIdCrc() const override
{
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.";
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScopedDataConnectionEvent.h
+4 -4
View File
@@ -59,17 +59,17 @@ namespace ScriptCanvas
, targetNode.GetNodeName().data()));
}
bool CanAutoFix() const
bool CanAutoFix() const override
{
return false;
}
AZStd::string GetIdentifier() const
AZStd::string GetIdentifier() const override
{
return DataValidationIds::ScopedDataConnectionId;
}
AZ::Crc32 GetIdCrc() const
AZ::Crc32 GetIdCrc() const override
{
return DataValidationIds::ScopedDataConnectionCrc;
}
@@ -79,7 +79,7 @@ namespace ScriptCanvas
return m_connectionId;
}
AZStd::string_view GetTooltip() const
AZStd::string_view GetTooltip() const override
{
return "Out of Scope Data Connection";
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/ScriptEventVersionMismatch.h
+4 -4
View File
@@ -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.");
}
bool CanAutoFix() const
bool CanAutoFix() const override
{
return false;
}
AZStd::string GetIdentifier() const
AZStd::string GetIdentifier() const override
{
return DataValidationIds::ScriptEventVersionMismatchId;
}
AZ::Crc32 GetIdCrc() const
AZ::Crc32 GetIdCrc() const override
{
return DataValidationIds::ScriptEventVersionMismatchCrc;
}
@@ -57,7 +57,7 @@ namespace ScriptCanvas
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.";
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h
+1 -1
View File
@@ -86,7 +86,7 @@ namespace ScriptCanvas
return DataValidationIds::UnknownSourceEndpointCrc;
}
AZStd::string_view GetTooltip() const
AZStd::string_view GetTooltip() const override
{
return "Unknown Source Endpoint";
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ExecutionValidation/UnusedNodeEvent.h
+1 -1
View File
@@ -60,7 +60,7 @@ namespace ScriptCanvas
}
// HighlightEntityEffect
AZ::EntityId GetHighlightTarget() const
AZ::EntityId GetHighlightTarget() const override
{
return m_nodeId;
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Debugger/ValidationEvents/ParsingValidation/ParsingValidations.h
+1 -1
View File
@@ -43,7 +43,7 @@ namespace ScriptCanvas
}
// HighlightEntityEffect
AZ::EntityId GetHighlightTarget() const
AZ::EntityId GetHighlightTarget() const override
{
return m_nodeId;
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.h
+1 -3
View File
@@ -40,7 +40,7 @@ namespace ScriptCanvas
return true;
}
AZ::Outcome<DependencyReport, void> GetDependencies() const
AZ::Outcome<DependencyReport, void> GetDependencies() const override
{
return AZ::Success(DependencyReport{});
}
@@ -49,8 +49,6 @@ namespace ScriptCanvas
AZ_INLINE const NamedSlotIdMap& GetNamedSlotIdMap() const { return m_formatSlotMap; }
AZ_INLINE const int GetPostDecimalPrecision() const { return m_numericPrecision; }
protected:
// This is a map that binds the index into m_unresolvedString to the SlotId that needs to be checked for a valid datum.
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h
+2 -2
View File
@@ -102,7 +102,7 @@ namespace ScriptCanvas
AZ::Outcome<AZStd::string, void> GetFunctionCallName(const Slot* /*slot*/) 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;
AZStd::string GetEBusName() const override;
bool IsAutoConnected() const override;
@@ -138,7 +138,7 @@ namespace ScriptCanvas
void SetAutoConnectToGraphOwner(bool enabled);
void OnDeserialize();
void OnDeserialize() override;
#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)////
void OnWriteEnd();
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h
+1 -1
View File
@@ -107,7 +107,7 @@ namespace ScriptCanvas
SlotId GetBusSlotId() const;
void OnDeserialize();
void OnDeserialize() override;
#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)////
void OnWriteEnd();
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Cycle.h
+2 -2
View File
@@ -36,9 +36,9 @@ namespace ScriptCanvas
void OnConfigured() 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;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/IsNull.h
+1 -1
View File
@@ -29,7 +29,7 @@ namespace ScriptCanvas
IsNull();
AZ::Outcome<DependencyReport, void> GetDependencies() const;
AZ::Outcome<DependencyReport, void> GetDependencies() const override;
bool IsIfBranch() const override;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h
+2 -2
View File
@@ -30,13 +30,13 @@ namespace ScriptCanvas
OrderedSequencer();
bool CanDeleteSlot(const SlotId& slotId) const;
bool CanDeleteSlot(const SlotId& slotId) const override;
AZ::Outcome<DependencyReport, void> GetDependencies() 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;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h
+2 -2
View File
@@ -33,9 +33,9 @@ namespace ScriptCanvas
void OnConfigured() 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...
bool IsSwitchStatement() const override { return true; }
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h
+1 -1
View File
@@ -39,7 +39,7 @@ namespace ScriptCanvas
void OnInit() override;
void ConfigureVisualExtensions() override;
bool OnValidateNode(ValidationResults& validationResults);
bool OnValidateNode(ValidationResults& validationResults) override;
SlotId HandleExtension(AZ::Crc32 extensionId) override;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/SystemComponent.h
+1 -1
View File
@@ -74,7 +74,7 @@ namespace ScriptCanvas
ScriptCanvasId FindScriptCanvasId(AZ::Entity* graphEntity) 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;
SystemComponentConfiguration GetSystemComponentConfiguration()
SystemComponentConfiguration GetSystemComponentConfiguration() override
{
SystemComponentConfiguration configuration;
configuration.m_maxIterationsForInfiniteLoopDetection = m_infiniteLoopDetectionMaxIterations;
Gems/ScriptCanvas/Code/scriptcanvasgem_debugger_files.cmake
+1
View File
@@ -35,6 +35,7 @@ set(FILES
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/DynamicDataTypeEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/InvalidExpressionEvent.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/SlotReferenceEvent.h
Include/ScriptCanvas/Debugger/ValidationEvents/DataValidation/UnknownEndpointEvent.h
Gems/ScriptCanvas/gem.json
+14 -3
View File
@@ -5,9 +5,20 @@
"origin": "Open 3D Engine - o3de.org",
"type": "Tool",
"summary": "The Script Canvas Gem provides Open 3D Engine's visual scripting environment, Script Canvas.",
"canonical_tags": ["Gem"],
"user_tags": ["Scripting", "Tools", "Utility"],
"canonical_tags": [
"Gem"
],
"user_tags": [
"Scripting",
"Tools",
"Utility"
],
"icon_path": "preview.png",
"requirements": "",
"documentation_url": "https://o3de.org/docs/user-guide/gems/reference/script/script-canvas/"
"documentation_url": "https://o3de.org/docs/user-guide/gems/reference/script/script-canvas/",
"dependencies": [
"ScriptEvents",
"ExpressionEvaluation",
"GraphCanvas"
]
}