izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Editor UI: Added SetNodePosition(...) to GraphSchema, called when Straighthen pin connections.

Browse Source 
Control Rig: Override GraphSchema::SetNodePosition(...) to use RigVMController to perform the set action, UEdGraph is updated through URigVMController::Notify(...)

#jira UE-95907
#rb helge.mathee

[CL 14576697 by jack cai in ue5-main branch]
This commit is contained in:
jack cai
2020-10-26 11:32:22 -04:00
parent 6efffa8698
commit 1852984908
5 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Engine/Plugins/Experimental/ControlRig/Source/ControlRigDeveloper/Private/Graph/ControlRigGraphSchema.cpp
View File

@@ -267,6 +267,20 @@ bool UControlRigGraphSchema::IsStructEditable(UStruct* InStruct) const
return false;
}
void UControlRigGraphSchema::SetNodePosition(UEdGraphNode* Node, const FVector2D& Position) const
{
if (UControlRigGraphNode* RigNode = Cast<UControlRigGraphNode>(Node))
{
UBlueprint* Blueprint = FBlueprintEditorUtils::FindBlueprintForNodeChecked(RigNode);
UControlRigBlueprint* RigBlueprint = Cast<UControlRigBlueprint>(Blueprint);
if (RigBlueprint != nullptr)
{
RigBlueprint->Controller->SetNodePosition(RigNode->GetModelNode(), Position, true, false);
return;
}
}
}
UControlRigGraphNode* UControlRigGraphSchema::CreateGraphNode(UControlRigGraph* InGraph, const FName& InPropertyName) const
{
const bool bSelectNewNode = true;

1
Engine/Plugins/Experimental/ControlRig/Source/ControlRigDeveloper/Public/Graph/ControlRigGraphSchema.h
View File

@@ -76,6 +76,7 @@ public:
virtual bool RequestVariableDropOnPanel(UEdGraph* InGraph, FProperty* InVariableToDrop, const FVector2D& InDropPosition, const FVector2D& InScreenPosition) override;
virtual bool RequestVariableDropOnPin(UEdGraph* InGraph, FProperty* InVariableToDrop, UEdGraphPin* InPin, const FVector2D& InDropPosition, const FVector2D& InScreenPosition) override;
virtual bool IsStructEditable(UStruct* InStruct) const;
virtual void SetNodePosition(UEdGraphNode* Node, const FVector2D& Position) const override;
/** Create a graph node for a rig */
UControlRigGraphNode* CreateGraphNode(UControlRigGraph* InGraph, const FName& InPropertyName) const;

10
Engine/Source/Editor/GraphEditor/Private/SGraphPanel.cpp
View File

@@ -1255,9 +1255,15 @@ private:
AlignmentDelta += (Node->NodePosY + Pins.SrcPin->GetNodeOffset().Y) - (NodeToPins.Key->NodePosY + Pins.DstPin->GetNodeOffset().Y);
}
NodeToPins.Key->Modify();
NodeToPins.Key->NodePosY += AlignmentDelta / NodeToPins.Value.Num();
UEdGraph* GraphObj = NodeToPins.Key->GetGraph();
check(GraphObj);
const UEdGraphSchema* Schema = GraphObj->GetSchema();
float NewNodePosY = NodeToPins.Key->NodePosY + (AlignmentDelta / NodeToPins.Value.Num());
Schema->SetNodePosition(NodeToPins.Key, FVector2D(NodeToPins.Key->NodePosX, NewNodePosY));
VisitedNodes.Add(Node);
VisitedNodes.Add(NodeToPins.Key);

7
Engine/Source/Runtime/Engine/Classes/EdGraph/EdGraphSchema.h
View File

@@ -911,6 +911,13 @@ class ENGINE_API UEdGraphSchema : public UObject
*/
virtual UEdGraphNode* CreateSubstituteNode(UEdGraphNode* Node, const UEdGraph* Graph, FObjectInstancingGraph* InstanceGraph, TSet<FName>& InOutExtraNames) const { return nullptr; }
/**
* Sets a node's position.
*
* @param Node The node to set
* @param Position The target position
*/
virtual void SetNodePosition(UEdGraphNode* Node, const FVector2D& Position) const;
/**
* Returns the currently selected graph node count

8
Engine/Source/Runtime/Engine/Private/EdGraph/EdGraphSchema.cpp
View File

@@ -785,6 +785,14 @@ void UEdGraphSchema::ReconstructNode(UEdGraphNode& TargetNode, bool bIsBatchRequ
#endif //#if WITH_EDITOR
}
void UEdGraphSchema::SetNodePosition(UEdGraphNode* Node, const FVector2D& Position) const
{
check(Node);
Node->Modify();
Node->NodePosX = Position.X;
Node->NodePosY = Position.Y;
}
void UEdGraphSchema::GetGraphDisplayInformation(const UEdGraph& Graph, /*out*/ FGraphDisplayInfo& DisplayInfo) const
{
DisplayInfo.PlainName = FText::FromString( Graph.GetName() );