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

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h
+4 -4
View File
@@ -137,7 +137,7 @@ namespace GraphModelIntegration
////////////////////////////////////////////////////////////////////////////////////
// GraphCanvas::SceneNotificationBus, connections
void OnNodeAdded(const AZ::EntityId& nodeUiId) override;
void OnNodeAdded(const AZ::EntityId& nodeUiId, bool isPaste) override;
void OnNodeRemoved(const AZ::EntityId& nodeUiId) override;
void PreOnNodeRemoved(const AZ::EntityId& nodeUiId) override;
void OnConnectionRemoved(const AZ::EntityId& connectionUiId) override;
@@ -169,8 +169,8 @@ namespace GraphModelIntegration
////////////////////////////////////////////////////////////////////////////////////
// GraphCanvas::GraphModelRequestBus, other
bool EnableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
bool DisableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
void EnableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
void DisableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
AZStd::string GetDataTypeString(const AZ::Uuid& typeId);
@@ -196,7 +196,7 @@ namespace GraphModelIntegration
// GraphCanvas::GraphModelRequestBus, node properties
//! Creates a GraphCanvas::NodePropertyDisplay and a data interface for editing input values
GraphCanvas::NodePropertyDisplay* CreateDataSlotPropertyDisplay(const AZ::Uuid& dataTypeUuid, const GraphCanvas::NodeId& nodeUiId, const GraphCanvas::SlotId& slotUiId) const override;
GraphCanvas::NodePropertyDisplay* CreateDataSlotPropertyDisplay(const AZ::Uuid& dataType, const GraphCanvas::NodeId& nodeId, const GraphCanvas::SlotId& slotId) const override;
GraphCanvas::NodePropertyDisplay* CreatePropertySlotPropertyDisplay(const AZ::Crc32& propertyId, const GraphCanvas::NodeId& nodeUiId, const GraphCanvas::SlotId& slotUiId) const override;
//! Common implementation for CreateDataSlotPropertyDisplay and CreatePropertySlotPropertyDisplay
Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/GraphCanvasNodePaletteItems.h
+1 -1
View File
@@ -54,7 +54,7 @@ namespace GraphModelIntegration
{
AZ::EntityId graphCanvasNodeId = graphCanvasNode->GetId();
GraphCanvas::SceneRequestBus::Event(graphCanvasSceneId, &GraphCanvas::SceneRequests::AddNode, graphCanvasNodeId, dropPosition);
GraphCanvas::SceneRequestBus::Event(graphCanvasSceneId, &GraphCanvas::SceneRequests::AddNode, graphCanvasNodeId, dropPosition, false);
GraphCanvas::SceneMemberUIRequestBus::Event(graphCanvasNodeId, &GraphCanvas::SceneMemberUIRequests::SetSelected, true);
AZ::EntityId gridId;