ActualHorse/ComboInput
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some grammar issues with the variable names that were annoying me.

Browse Source
This commit is contained in:
Jamie Greunbaum
2023-10-07 18:58:26 -04:00
parent b7d299f8b1
commit 08b89b9d84
10 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/ComboInputEditor/Private/Ed/EdComboActionGraph.cpp
+5 -5
View File
@@ -63,7 +63,7 @@ void UEdComboActionGraph::RebuildComboActionGraph()
if (ChildNode != nullptr)
{
ComboActionGraphNode->ChildrenNodes.Add(ChildNode);
ComboActionGraphNode->ChildNodes.Add(ChildNode);
ChildNode->ParentNodes.Add(ComboActionGraphNode);
}
@@ -168,7 +168,7 @@ void UEdComboActionGraph::Clear()
{
UComboActionGraphNode *MounteaDialogueGraphNode = EdNode->ComboActionGraphNode;
MounteaDialogueGraphNode->ParentNodes.Reset();
MounteaDialogueGraphNode->ChildrenNodes.Reset();
MounteaDialogueGraphNode->ChildNodes.Reset();
MounteaDialogueGraphNode->Edges.Reset();
}
}
@@ -194,12 +194,12 @@ void UEdComboActionGraph::SortNodes(UComboActionGraphNode *RootNode)
return EdNode_LNode->NodePosX < EdNode_RNode->NodePosX;
};
Node->ChildrenNodes.Sort(Comp);
Node->ChildNodes.Sort(Comp);
Node->ParentNodes.Sort(Comp);
for (int j = 0; j < Node->ChildrenNodes.Num(); ++j)
for (int j = 0; j < Node->ChildNodes.Num(); ++j)
{
NextLevelNodes.Add(Node->ChildrenNodes[j]);
NextLevelNodes.Add(Node->ChildNodes[j]);
}
}
Source/ComboInputEditor/Private/Layout/ComboActionForceDirectedSolveLayoutStrategy.cpp
+3 -3
View File
@@ -113,11 +113,11 @@ FBox2D UComboActionForceDirectedSolveLayoutStrategy::LayoutOneTree(UComboActionG
UEdComboActionGraphNode *EdNode_ParentNode = this->EdGraph->NodeMap[Node];
for (int32 j = 0; j < Node->ChildrenNodes.Num(); j++)
for (int32 j = 0; j < Node->ChildNodes.Num(); j++)
{
NextLevelNodes.Add(Node->ChildrenNodes[j]);
NextLevelNodes.Add(Node->ChildNodes[j]);
UEdComboActionGraphNode *EdNode_ChildNode = this->EdGraph->NodeMap[Node->ChildrenNodes[j]];
UEdComboActionGraphNode *EdNode_ChildNode = this->EdGraph->NodeMap[Node->ChildNodes[j]];
Diff.X = EdNode_ChildNode->NodePosX - EdNode_ParentNode->NodePosY;
Diff.Y = EdNode_ChildNode->NodePosY - EdNode_ParentNode->NodePosY;
Source/ComboInputEditor/Private/Layout/ComboActionGraphLayoutStrategy.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ FBox2D UComboActionGraphLayoutStrategy::GetActualBounds(UComboActionGraphNode *R
Rtn += GetNodeBound(this->EdGraph->NodeMap[Node]);
for (UComboActionGraphNode *ChildNode : Node->ChildrenNodes)
for (UComboActionGraphNode *ChildNode : Node->ChildNodes)
{
NextLevelNodes.Add(ChildNode);
}
@@ -82,7 +82,7 @@ void UComboActionGraphLayoutStrategy::RandomLayoutOneTree(UComboActionGraphNode
EdNode_Node->NodePosX = UKismetMathLibrary::RandomFloatInRange(Bound.Min.X, Bound.Max.X);
EdNode_Node->NodePosY = UKismetMathLibrary::RandomFloatInRange(Bound.Min.Y, Bound.Max.Y);
for (UComboActionGraphNode *ChildNode : Node->ChildrenNodes)
for (UComboActionGraphNode *ChildNode : Node->ChildNodes)
{
NextLevelNodes.Add(ChildNode);
}
Source/ComboInputEditor/Private/Layout/ComboActionTreeSolveLayoutStrategy.cpp
+14 -14
View File
@@ -66,13 +66,13 @@ void UComboActionTreeSolveLayoutStrategy::InitPass(UComboActionGraphNode *RootNo
UEdComboActionGraphNode *EdNode_RootNode = this->EdGraph->NodeMap[RootNode];
FVector2D ChildAnchor(FVector2D(0.0f, this->GetNodeHeight(EdNode_RootNode) + this->OptimalDistance + Anchor.Y));
for (int32 i = 0; i < RootNode->ChildrenNodes.Num(); i++)
for (int32 i = 0; i < RootNode->ChildNodes.Num(); i++)
{
UComboActionGraphNode *Child = RootNode->ChildrenNodes[i];
UComboActionGraphNode *Child = RootNode->ChildNodes[i];
UEdComboActionGraphNode *EdNode_ChildNode = this->EdGraph->NodeMap[Child];
if (i > 0)
{
UComboActionGraphNode *PreChild = RootNode->ChildrenNodes[i - 1];
UComboActionGraphNode *PreChild = RootNode->ChildNodes[i - 1];
UEdComboActionGraphNode *EdNode_PreChildNode = this->EdGraph->NodeMap[PreChild];
ChildAnchor.X += this->OptimalDistance + this->GetNodeWidth(EdNode_PreChildNode) / 2;
}
@@ -83,7 +83,7 @@ void UComboActionTreeSolveLayoutStrategy::InitPass(UComboActionGraphNode *RootNo
float NodeWidth = this->GetNodeWidth(EdNode_RootNode);
EdNode_RootNode->NodePosY = Anchor.Y;
if (RootNode->ChildrenNodes.Num() == 0)
if (RootNode->ChildNodes.Num() == 0)
{
EdNode_RootNode->NodePosX = Anchor.X - NodeWidth / 2;
}
@@ -96,9 +96,9 @@ void UComboActionTreeSolveLayoutStrategy::InitPass(UComboActionGraphNode *RootNo
bool UComboActionTreeSolveLayoutStrategy::ResolveConflictPass(UComboActionGraphNode *Node)
{
bool HasConflict = false;
for (int32 i = 0; i < Node->ChildrenNodes.Num(); ++i)
for (int32 i = 0; i < Node->ChildNodes.Num(); ++i)
{
UComboActionGraphNode *Child = Node->ChildrenNodes[i];
UComboActionGraphNode *Child = Node->ChildNodes[i];
if (this->ResolveConflictPass(Child))
{
HasConflict = true;
@@ -107,7 +107,7 @@ bool UComboActionTreeSolveLayoutStrategy::ResolveConflictPass(UComboActionGraphN
for (const UComboActionGraphNode *ParentNode : Node->ParentNodes)
{
for (UComboActionGraphNode *LeftSibling : ParentNode->ChildrenNodes)
for (UComboActionGraphNode *LeftSibling : ParentNode->ChildNodes)
{
if (LeftSibling == Node)
{
@@ -183,7 +183,7 @@ void UComboActionTreeSolveLayoutStrategy::GetLeftContour(UComboActionGraphNode *
Contour[Level] = EdNode_Node;
}
for (UComboActionGraphNode *Child : RootNode->ChildrenNodes)
for (UComboActionGraphNode *Child : RootNode->ChildNodes)
{
this->GetLeftContour(Child, Level + 1, Contour);
}
@@ -201,7 +201,7 @@ void UComboActionTreeSolveLayoutStrategy::GetRightContour(UComboActionGraphNode
Contour[Level] = EdNode_Node;
}
for (UComboActionGraphNode *Child : RootNode->ChildrenNodes)
for (UComboActionGraphNode *Child : RootNode->ChildNodes)
{
this->GetRightContour(Child, Level + 1, Contour);
}
@@ -213,7 +213,7 @@ void UComboActionTreeSolveLayoutStrategy::ShiftSubTree(UComboActionGraphNode *Ro
EdNode_Node->NodePosX += Offset.X;
EdNode_Node->NodePosY += Offset.Y;
for (UComboActionGraphNode *Child : RootNode->ChildrenNodes)
for (UComboActionGraphNode *Child : RootNode->ChildNodes)
{
if (Child->ParentNodes[0] == RootNode)
{
@@ -225,17 +225,17 @@ void UComboActionTreeSolveLayoutStrategy::ShiftSubTree(UComboActionGraphNode *Ro
void UComboActionTreeSolveLayoutStrategy::UpdateParentNodePosition(UComboActionGraphNode *RootNode)
{
UEdComboActionGraphNode *EdNode_ParentNode = this->EdGraph->NodeMap[RootNode];
if (RootNode->ChildrenNodes.Num() % 2 == 0)
if (RootNode->ChildNodes.Num() % 2 == 0)
{
UEdComboActionGraphNode *FirstChild = this->EdGraph->NodeMap[RootNode->ChildrenNodes[0]];
UEdComboActionGraphNode *LastChild = this->EdGraph->NodeMap[RootNode->ChildrenNodes.Last()];
UEdComboActionGraphNode *FirstChild = this->EdGraph->NodeMap[RootNode->ChildNodes[0]];
UEdComboActionGraphNode *LastChild = this->EdGraph->NodeMap[RootNode->ChildNodes.Last()];
float LeftBound = FirstChild->NodePosX;
float RightBound = LastChild->NodePosX + this->GetNodeWidth(LastChild);
EdNode_ParentNode->NodePosX = (LeftBound + RightBound) / 2 - this->GetNodeWidth(EdNode_ParentNode) / 2;
}
else
{
UEdComboActionGraphNode *MidChild = this->EdGraph->NodeMap[RootNode->ChildrenNodes[RootNode->ChildrenNodes.Num() / 2]];
UEdComboActionGraphNode *MidChild = this->EdGraph->NodeMap[RootNode->ChildNodes[RootNode->ChildNodes.Num() / 2]];
EdNode_ParentNode->NodePosX = MidChild->NodePosX + this->GetNodeWidth(MidChild) / 2 - this->GetNodeWidth(EdNode_ParentNode) / 2;
}
}