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/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();