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

Add variable, datum sanity for user added slots

Browse Source 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
carlitosan
2022-01-12 16:21:40 -08:00
parent ce2e433b71
commit 4e755cc258
19 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GraphCanvas/Code/Include/GraphCanvas/Components/Connections/ConnectionFilters/DataConnectionFilters.h
+2 -2
View File
@@ -97,7 +97,7 @@ namespace GraphCanvas
// Only want to try to convert to references when we have no connections
if (!hasConnections)
{
DataSlotRequestBus::EventResult(acceptConnection, sourceEndpoint.GetSlotId(), &DataSlotRequests::CanConvertToReference);
DataSlotRequestBus::EventResult(acceptConnection, sourceEndpoint.GetSlotId(), &DataSlotRequests::CanConvertToReference, false);
}
}
else if (targetType == DataSlotType::Value)
@@ -115,7 +115,7 @@ namespace GraphCanvas
// Only want to try to convert to references when we have no connections
if (!hasConnections)
{
DataSlotRequestBus::EventResult(acceptConnection, targetEndpoint.GetSlotId(), &DataSlotRequests::CanConvertToReference);
DataSlotRequestBus::EventResult(acceptConnection, targetEndpoint.GetSlotId(), &DataSlotRequests::CanConvertToReference, false);
}
}
else if (sourceType == DataSlotType::Value)
Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp
+2 -2
View File
@@ -92,7 +92,7 @@ namespace GraphCanvas
}
else if (sourceSlotType == DataSlotType::Reference)
{
DataSlotRequestBus::EventResult(converted, GetTargetSlotId(), &DataSlotRequests::ConvertToReference);
DataSlotRequestBus::EventResult(converted, GetTargetSlotId(), &DataSlotRequests::ConvertToReference, false);
}
}
else if (m_dragContext == DragContext::MoveSource)
@@ -103,7 +103,7 @@ namespace GraphCanvas
}
else if (targetSlotType == DataSlotType::Reference)
{
DataSlotRequestBus::EventResult(converted, GetSourceSlotId(), &DataSlotRequests::ConvertToReference);
DataSlotRequestBus::EventResult(converted, GetSourceSlotId(), &DataSlotRequests::ConvertToReference, false);
}
}
else if (m_dragContext == DragContext::TryConnection)
Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp
+6 -5
View File
@@ -294,9 +294,9 @@ namespace GraphCanvas
}
}
bool DataSlotComponent::ConvertToReference()
bool DataSlotComponent::ConvertToReference(bool isNewSlot)
{
if (CanConvertToReference())
if (CanConvertToReference(isNewSlot))
{
AZ::EntityId nodeId = GetNode();
GraphId graphId;
@@ -307,7 +307,7 @@ namespace GraphCanvas
ScopedGraphUndoBlocker undoBlocker(graphId);
bool convertedToReference = false;
GraphModelRequestBus::EventResult(convertedToReference, graphId, &GraphModelRequests::ConvertSlotToReference, Endpoint(nodeId, GetEntityId()));
GraphModelRequestBus::EventResult(convertedToReference, graphId, &GraphModelRequests::ConvertSlotToReference, Endpoint(nodeId, GetEntityId()), isNewSlot);
if (convertedToReference)
{
@@ -326,8 +326,9 @@ namespace GraphCanvas
return m_dataSlotType == DataSlotType::Reference;
}
bool DataSlotComponent::CanConvertToReference() const
bool DataSlotComponent::CanConvertToReference([[maybe_unused]] bool isNewSlot) const
{
// #sc_user_slot_variable_ux make sure this can be converted to reference, or created as one
bool canToggleReference = false;
if (m_canConvertSlotTypes && DataSlotUtils::IsValueDataSlotType(m_dataSlotType) && !HasConnections())
@@ -336,7 +337,7 @@ namespace GraphCanvas
GraphId graphId;
SceneMemberRequestBus::EventResult(graphId, nodeId, &SceneMemberRequests::GetScene);
GraphModelRequestBus::EventResult(canToggleReference, graphId, &GraphModelRequests::CanConvertSlotToReference, Endpoint(nodeId, GetEntityId()));
GraphModelRequestBus::EventResult(canToggleReference, graphId, &GraphModelRequests::CanConvertSlotToReference, Endpoint(nodeId, GetEntityId()), isNewSlot);
}
return canToggleReference;
Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.h
+2 -2
View File
@@ -47,8 +47,8 @@ namespace GraphCanvas
////
// DataSlotRequestBus
bool ConvertToReference() override;
bool CanConvertToReference() const override;
bool ConvertToReference(bool isNewSlot = false) override;
bool CanConvertToReference(bool isNewSlot = false) const override;
bool ConvertToValue() override;
bool CanConvertToValue() const override;
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h
+2 -2
View File
@@ -70,8 +70,8 @@ namespace GraphCanvas
static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
using BusIdType = AZ::EntityId;
virtual bool ConvertToReference() = 0;
virtual bool CanConvertToReference() const = 0;
virtual bool ConvertToReference(bool isNewSlot = false) = 0;
virtual bool CanConvertToReference(bool isNewSlot = false) const = 0;
virtual bool ConvertToValue() = 0;
virtual bool CanConvertToValue() const = 0;
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Editor/GraphModelBus.h
+5 -4
View File
@@ -125,12 +125,12 @@ namespace GraphCanvas
return false;
}
virtual bool ConvertSlotToReference([[maybe_unused]] const Endpoint& endpoint)
virtual bool ConvertSlotToReference([[maybe_unused]] const Endpoint& endpoint, [[maybe_unused]] bool isNewSlot)
{
return false;
}
virtual bool CanConvertSlotToReference([[maybe_unused]] const Endpoint& endpoint)
virtual bool CanConvertSlotToReference([[maybe_unused]] const Endpoint& endpoint, [[maybe_unused]] bool isNewSlot)
{
return false;
}
@@ -145,12 +145,13 @@ namespace GraphCanvas
return false;
}
virtual bool CanPromoteToVariable([[maybe_unused]] const Endpoint& endpoint) const
virtual bool CanPromoteToVariable([[maybe_unused]] const Endpoint& endpoint, [[maybe_unused]] bool isNewSlot = false) const
{
return false;
}
virtual bool PromoteToVariableAction([[maybe_unused]] const Endpoint& endpoint)
virtual bool PromoteToVariableAction([[maybe_unused]] const Endpoint& endpoint
, [[maybe_unused]] bool isNewSlot)
{
return false;
}
Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/EditorContextMenu/ContextMenuActions/SlotMenuActions/SlotContextMenuActions.cpp
+5 -5
View File
@@ -258,7 +258,7 @@ namespace GraphCanvas
if (DataSlotUtils::IsValueDataSlotType(dataSlotType))
{
setText("Convert to Reference");
DataSlotRequestBus::EventResult(canToggleState, targetId, &DataSlotRequests::CanConvertToReference);
DataSlotRequestBus::EventResult(canToggleState, targetId, &DataSlotRequests::CanConvertToReference, false);
}
else
{
@@ -291,7 +291,7 @@ namespace GraphCanvas
if (DataSlotUtils::IsValueDataSlotType(dataSlotType))
{
DataSlotRequestBus::EventResult(toggledState, targetId, &DataSlotRequests::ConvertToReference);
DataSlotRequestBus::EventResult(toggledState, targetId, &DataSlotRequests::ConvertToReference, false);
}
else
{
@@ -345,14 +345,14 @@ namespace GraphCanvas
if (DataSlotUtils::IsValueDataSlotType(dataSlotType))
{
DataSlotRequestBus::EventResult(enableAction, targetId, &DataSlotRequests::CanConvertToReference);
DataSlotRequestBus::EventResult(enableAction, targetId, &DataSlotRequests::CanConvertToReference, false);
if (enableAction)
{
Endpoint endpoint;
SlotRequestBus::EventResult(endpoint, targetId, &SlotRequests::GetEndpoint);
GraphModelRequestBus::EventResult(enableAction, graphId, &GraphModelRequests::CanPromoteToVariable, endpoint);
GraphModelRequestBus::EventResult(enableAction, graphId, &GraphModelRequests::CanPromoteToVariable, endpoint, false);
}
}
}
@@ -371,7 +371,7 @@ namespace GraphCanvas
SlotRequestBus::EventResult(endpoint, targetId, &SlotRequests::GetEndpoint);
bool promotedElement = false;
GraphModelRequestBus::EventResult(promotedElement, graphId, &GraphModelRequests::PromoteToVariableAction, endpoint);
GraphModelRequestBus::EventResult(promotedElement, graphId, &GraphModelRequests::PromoteToVariableAction, endpoint, false);
if (promotedElement)
{