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

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/RequestBus.h
+10 -1
View File
@@ -31,6 +31,8 @@ class QPushButton;
class QTableView;
class QToolButton;
namespace ScriptCanvas { class Slot; }
namespace GraphCanvas
{
struct Endpoint;
@@ -83,7 +85,6 @@ namespace ScriptCanvasEditor
virtual void OnChangeActiveGraphTab(AZ::Data::AssetId) {}
virtual void CreateNewFunctionAsset() = 0;
virtual void CreateNewRuntimeAsset() = 0;
virtual ScriptCanvas::ScriptCanvasId GetActiveScriptCanvasId() const
@@ -195,6 +196,14 @@ namespace ScriptCanvasEditor
virtual void RegisterVariableType(const ScriptCanvas::Data::Type& variabletype) = 0;
virtual bool IsValidVariableType(const ScriptCanvas::Data::Type& variableType) const = 0;
struct SlotSetup
{
AZStd::string m_name;
AZ::Uuid m_type = AZ::Uuid::CreateNull();
};
virtual bool ShowSlotTypeSelector(ScriptCanvas::Slot* slot, const QPoint& scenePosition, SlotSetup&) = 0;
};
using VariablePaletteRequestBus = AZ::EBus<VariablePaletteRequests>;
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorGraph.h
+4 -1
View File
@@ -196,7 +196,7 @@ namespace ScriptCanvasEditor
GraphCanvas::CanHandleMimeEventOutcome CanHandleValueMimeEvent(const GraphCanvas::Endpoint& endpoint, const QMimeData* mimeData) override;
bool HandleValueMimeEvent(const GraphCanvas::Endpoint& endpoint, const QMimeData* mimeData) override;
GraphCanvas::SlotId RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId) override;
GraphCanvas::SlotId RequestExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId, GraphModelRequests::ExtensionRequestReason ) override;
void ExtensionCancelled(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId) override;
void FinalizeExtension(const GraphCanvas::NodeId& nodeId, const GraphCanvas::ExtenderId& extenderId) override;
@@ -357,6 +357,9 @@ namespace ScriptCanvasEditor
AZStd::unordered_map< GraphCanvas::ToastId, AZ::EntityId > m_toastNodeIds;
// Function Definition Node Extension
void HandleFunctionDefinitionExtension(ScriptCanvas::Node* node, GraphCanvas::SlotId graphCanvasSlotId, const GraphCanvas::NodeId& nodeId);
//// Version Update code
AZ::Outcome<ScriptCanvas::Node*> ReplaceNodeByConfig(ScriptCanvas::Node*, const ScriptCanvas::NodeConfiguration&, ScriptCanvas::ReplacementConnectionMap&);
bool SanityCheckNodeReplacement(ScriptCanvas::Node*, ScriptCanvas::Node*, AZStd::unordered_map<ScriptCanvas::SlotId, AZStd::vector<ScriptCanvas::SlotId>>&);
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
-2
View File
@@ -146,8 +146,6 @@ namespace ScriptCanvasEditor
void LoadVariables(const ScriptCanvasMemoryAsset::pointer memoryAsset);
void ClearVariables();
void GetScriptCanvasId();
private:
AZ::Data::AssetId m_removedCatalogId;
AZ::Data::AssetId m_previousAssetId;
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h
+5 -1
View File
@@ -53,7 +53,9 @@ namespace ScriptCanvasEditor
AzEventHandler,
Invalid
};
class NodeDescriptorComponent;
class NodeDescriptorRequests : public AZ::EBusTraits
{
public:
@@ -74,6 +76,8 @@ namespace ScriptCanvasEditor
return GetType() == descriptorType;
}
virtual NodeDescriptorComponent* GetDescriptorComponent() = 0;
};
using NodeDescriptorRequestBus = AZ::EBus<NodeDescriptorRequests>;