From cc34e36cd29388e32283dad12ff5287d60eea4e6 Mon Sep 17 00:00:00 2001 From: jyelon Date: Wed, 20 May 2026 18:16:58 -0400 Subject: [PATCH] A small refactor in UEWingman, for readability --- .../Handlers/ActorComponent_Remove.h | 4 +- .../Handlers/ActorComponent_Reparent.h | 4 +- .../UEWingman/Handlers/BlueprintGraph_Add.h | 4 +- .../Handlers/BlueprintGraph_Remove.h | 4 +- .../Handlers/BlueprintOverride_Add.h | 4 +- .../Handlers/BlueprintOverride_ShowMenu.h | 4 +- .../UEWingman/Handlers/Blueprint_Dump.h | 4 +- .../Source/UEWingman/Handlers/Details_Dump.h | 4 +- .../Source/UEWingman/Handlers/Details_Get.h | 4 +- .../Source/UEWingman/Handlers/Details_Set.h | 4 +- .../UEWingman/Handlers/Editor_OpenAsset.h | 4 +- .../UEWingman/Handlers/EventDispatcher_Add.h | 4 +- .../Handlers/EventDispatcher_Remove.h | 4 +- .../Source/UEWingman/Handlers/GraphNode_Add.h | 4 +- .../UEWingman/Handlers/GraphNode_ChooseMenu.h | 4 +- .../UEWingman/Handlers/GraphNode_Dump.h | 4 +- .../UEWingman/Handlers/GraphNode_GetComment.h | 4 +- .../UEWingman/Handlers/GraphNode_Remove.h | 4 +- .../UEWingman/Handlers/GraphNode_Rename.h | 4 +- .../Handlers/GraphNode_SearchTypes.h | 4 +- .../UEWingman/Handlers/GraphNode_SetComment.h | 4 +- .../UEWingman/Handlers/GraphNode_SetDefault.h | 33 ++++------- .../Handlers/GraphNode_SetPosition.h | 11 +--- .../UEWingman/Handlers/GraphNode_ShowMenu.h | 4 +- .../UEWingman/Handlers/GraphPin_Connect.h | 4 +- .../UEWingman/Handlers/GraphPin_Disconnect.h | 4 +- .../Source/UEWingman/Handlers/Graph_Dump.h | 4 +- .../Source/UEWingman/Handlers/Test_TMaps.h | 59 ------------------- .../Source/UEWingman/Handlers/Variables_Add.h | 4 +- .../UEWingman/Handlers/Variables_Dump.h | 4 +- .../UEWingman/Handlers/Variables_Modify.h | 4 +- .../UEWingman/Handlers/Variables_Remove.h | 4 +- .../Source/UEWingman/Handlers/Widget_Add.h | 4 +- .../Source/UEWingman/Handlers/Widget_Remove.h | 4 +- .../UEWingman/Handlers/Widget_Reparent.h | 4 +- 35 files changed, 76 insertions(+), 155 deletions(-) delete mode 100644 Plugins/UEWingman/Source/UEWingman/Handlers/Test_TMaps.h diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h index 0a8c4642..e2e18a58 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h @@ -19,7 +19,7 @@ class UWing_ActorComponent_Remove : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to the component (e.g. '/Game/MyBP,component:MyComp')")) - FString Component; + FString ComponentPath; virtual void Register() override { @@ -29,7 +29,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UWingComponentRef* CompRef = F.Walk(Component).Cast(); + UWingComponentRef* CompRef = F.Walk(ComponentPath).Cast(); if (!CompRef) return; if (!UWingComponent::DeleteComponent(CompRef, WingOut::Stdout)) return; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h index 274bf59b..363c5e1e 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h @@ -21,7 +21,7 @@ class UWing_ActorComponent_Reparent : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to the component (e.g. '/Game/MyBP,component:MyComp')")) - FString Component; + FString ComponentPath; UPROPERTY(EditAnywhere, meta=(Description="New parent component name.")) FString Parent; @@ -34,7 +34,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UWingComponentRef* CompRef = F.Walk(Component).Cast(); + UWingComponentRef* CompRef = F.Walk(ComponentPath).Cast(); if (!CompRef) return; // Find the new parent among all components (if specified) diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h index 6f2bd076..97b49989 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Add.h @@ -24,7 +24,7 @@ class UWing_BlueprintGraph_Add : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Blueprint name or package path")) - FString Blueprint; + FString BlueprintPath; UPROPERTY(EditAnywhere, meta=(Description="Name for the new graph")) FString Graph; @@ -51,7 +51,7 @@ public: } WingFetcher F(WingOut::Stdout); - UBlueprint* BP = F.Walk(Blueprint).Cast(); + UBlueprint* BP = F.Walk(BlueprintPath).Cast(); if (!BP) return; // Check that this graph type is valid for this blueprint type diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h index 0c0b58fe..99128783 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintGraph_Remove.h @@ -22,7 +22,7 @@ class UWing_BlueprintGraph_Remove : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to the graph, e.g. /Game/MyBP,graph:MyFunction")) - FString Graph; + FString GraphPath; virtual void Register() override { @@ -32,7 +32,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraph* FoundGraph = F.Walk(Graph).Cast(); + UEdGraph* FoundGraph = F.Walk(GraphPath).Cast(); if (!FoundGraph) return; UBlueprint* BP = FBlueprintEditorUtils::FindBlueprintForGraph(FoundGraph); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_Add.h index 314af620..fe0dc214 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_Add.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_Add.h @@ -22,7 +22,7 @@ class UWing_BlueprintOverride_Add : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Blueprint path")) - FString Blueprint; + FString BlueprintPath; UPROPERTY(EditAnywhere, meta=(Description="Function to override, in Class|Function format")) FString Function; @@ -36,7 +36,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UBlueprint* BP = F.Walk(Blueprint).Cast(); + UBlueprint* BP = F.Walk(BlueprintPath).Cast(); if (!BP) return; // Find the function by matching against the menu string format (Class|Function) diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_ShowMenu.h b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_ShowMenu.h index 844f91e3..53d70a38 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_ShowMenu.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/BlueprintOverride_ShowMenu.h @@ -21,7 +21,7 @@ class UWing_BlueprintOverride_ShowMenu : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Blueprint path")) - FString Blueprint; + FString BlueprintPath; virtual void Register() override { @@ -32,7 +32,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UBlueprint* BP = F.Walk(Blueprint).Cast(); + UBlueprint* BP = F.Walk(BlueprintPath).Cast(); if (!BP) return; TArray Results = WingUtils::GetOverridableFunctions(BP); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h index 270b2d94..99f89a17 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h @@ -30,7 +30,7 @@ class UWing_Blueprint_Dump : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Blueprint path")) - FString Blueprint; + FString BlueprintPath; virtual void Register() override { @@ -41,7 +41,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UBlueprint* BP = F.Walk(Blueprint).Cast(); + UBlueprint* BP = F.Walk(BlueprintPath).Cast(); if (!BP) return; // Header diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h index 3a41e12a..cac51966 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Dump.h @@ -14,7 +14,7 @@ class UWing_Details_Dump : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target object")) - FString Object; + FString ObjectPath; virtual void Register() override { @@ -25,7 +25,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Target = F.Walk(Object).Cast(); + UObject* Target = F.Walk(ObjectPath).Cast(); if (!Target) return; TArray Props = FWingProperty::GetDetails(Target, false); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h index 4b8351f0..abb128ff 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Get.h @@ -15,7 +15,7 @@ class UWing_Details_Get : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target object")) - FString Object; + FString ObjectPath; UPROPERTY(EditAnywhere, meta=(Description="Property name")) FString Property; @@ -29,7 +29,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Obj = F.Walk(Object).Cast(); + UObject* Obj = F.Walk(ObjectPath).Cast(); if (!Obj) return; TArray Props = FWingProperty::GetDetails(Obj, false); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h index f572db86..c113a335 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Details_Set.h @@ -15,7 +15,7 @@ class UWing_Details_Set : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target object")) - FString Object; + FString ObjectPath; UPROPERTY(EditAnywhere, meta=(Description="Property name")) FString Property; @@ -32,7 +32,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Obj = F.Walk(Object).Cast(); + UObject* Obj = F.Walk(ObjectPath).Cast(); if (!Obj) return; TArray Props = FWingProperty::GetDetails(Obj, true); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h index 5a5adff6..d8b689a7 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Editor_OpenAsset.h @@ -20,7 +20,7 @@ class UWing_Editor_OpenAsset : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Asset to open")) - FString Asset; + FString AssetPath; virtual void Register() override { @@ -30,7 +30,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Obj = F.Walk(Asset).Cast(); + UObject* Obj = F.Walk(AssetPath).Cast(); if (!Obj) return; UAssetEditorSubsystem* Sub = GEditor->GetEditorSubsystem(); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h index 10836b9d..45be66a9 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Add.h @@ -23,7 +23,7 @@ class UWing_EventDispatcher_Add : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Blueprint name or package path")) - FString Blueprint; + FString BlueprintPath; UPROPERTY(EditAnywhere, meta=(Description="Name of the new event dispatcher")) FString Dispatcher; @@ -42,7 +42,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UBlueprint* BP = F.Walk(Blueprint).Cast(); + UBlueprint* BP = F.Walk(BlueprintPath).Cast(); if (!BP) return; // Check for valid proposed name diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h index 59449ebf..5dba9660 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/EventDispatcher_Remove.h @@ -21,7 +21,7 @@ class UWing_EventDispatcher_Remove : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Blueprint name or package path")) - FString Blueprint; + FString BlueprintPath; UPROPERTY(EditAnywhere, meta=(Description="Name of the event dispatcher to delete")) FString Dispatcher; @@ -34,7 +34,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UBlueprint* BP = F.Walk(Blueprint).Cast(); + UBlueprint* BP = F.Walk(BlueprintPath).Cast(); if (!BP) return; FBPVariableDescription* Var = WingUtils::FindOneWithExternalID(Dispatcher, BP->NewVariables, TEXT("Dispatcher"), WingOut::Stdout); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h index 3fe06d0c..5616d572 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Add.h @@ -22,7 +22,7 @@ class UWing_GraphNode_Add : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target graph")) - FString Graph; + FString GraphPath; UPROPERTY(EditAnywhere, meta=(Description="Node type, from GraphNode_SearchTypes")) FString Type; @@ -42,7 +42,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraph* TargetGraph = F.Walk(Graph).Cast(); + UEdGraph* TargetGraph = F.Walk(GraphPath).Cast(); if (!TargetGraph) return; FWingGraphActions GraphActions(TargetGraph); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h index 516524ee..58224dc2 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ChooseMenu.h @@ -20,7 +20,7 @@ class UWing_GraphNode_ChooseMenu : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; UPROPERTY(EditAnywhere, meta=(Description="Menu item as shown by GraphNode_ShowMenu")) FString Item; @@ -36,7 +36,7 @@ private: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraphNode* NodeObj = F.Walk(Node).Cast(); + UEdGraphNode* NodeObj = F.Walk(NodePath).Cast(); if (!NodeObj) return; FToolMenuContext Context; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h index 04bc40ce..b0d7d9e8 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Dump.h @@ -19,7 +19,7 @@ class UWing_GraphNode_Dump : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; UPROPERTY(EditAnywhere, meta=(Description="True to show minor node properties")) bool Details = false; @@ -33,7 +33,7 @@ private: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraphNode* NodeObj = F.Walk(Node).Cast(); + UEdGraphNode* NodeObj = F.Walk(NodePath).Cast(); if (!NodeObj) return; WingGraphExport Exporter(NodeObj, false, Details); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h index c9921c8e..18e18c26 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_GetComment.h @@ -20,7 +20,7 @@ class UWing_GraphNode_GetComment : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; virtual void Register() override { @@ -30,7 +30,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraphNode* FoundNode = F.Walk(Node).Cast(); + UEdGraphNode* FoundNode = F.Walk(NodePath).Cast(); if (!FoundNode) return; WingOut::Stdout.Printf(TEXT("Node: %s\n"), *WingUtils::FormatName(FoundNode)); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h index 7b1d9208..91e78481 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Remove.h @@ -24,7 +24,7 @@ class UWing_GraphNode_Remove : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Node to delete")) - FString Node; + FString NodePath; virtual void Register() override { @@ -35,7 +35,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraphNode* FoundNode = F.Walk(Node).Cast(); + UEdGraphNode* FoundNode = F.Walk(NodePath).Cast(); if (!FoundNode) return; UEdGraph* Graph = FoundNode->GetGraph(); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h index b34f1c83..6ed112b8 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Rename.h @@ -20,7 +20,7 @@ class UWing_GraphNode_Rename : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; UPROPERTY(EditAnywhere, meta=(Description="New name for the node")) FString Name; @@ -34,7 +34,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraphNode* FoundNode = F.Walk(Node).Cast(); + UEdGraphNode* FoundNode = F.Walk(NodePath).Cast(); if (!FoundNode) return; if (!WingUtils::CheckCanRename(FoundNode, Name, WingOut::Stdout)) return; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h index 7d67b818..568df86d 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SearchTypes.h @@ -20,7 +20,7 @@ class UWing_GraphNode_SearchTypes : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target graph")) - FString Graph; + FString GraphPath; UPROPERTY(EditAnywhere, meta=(Description="Maximum number of results per query")) int32 MaxResults = 50; @@ -37,7 +37,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraph* TargetGraph = F.Walk(Graph).Cast(); + UEdGraph* TargetGraph = F.Walk(GraphPath).Cast(); if (!TargetGraph) return; FWingGraphActions GraphActions(TargetGraph); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h index ca2bd6ff..7c3e25fb 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetComment.h @@ -20,7 +20,7 @@ class UWing_GraphNode_SetComment : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; UPROPERTY(EditAnywhere, meta=(Description="Comment text to set")) FString Comment; @@ -34,7 +34,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraphNode* FoundNode = F.Walk(Node).Cast(); + UEdGraphNode* FoundNode = F.Walk(NodePath).Cast(); if (!FoundNode) return; FoundNode->NodeComment = Comment; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefault.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefault.h index ee659127..5a02a22a 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefault.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefault.h @@ -17,11 +17,8 @@ class UWing_GraphNode_SetDefault : public UWingHandler GENERATED_BODY() public: - UPROPERTY(EditAnywhere, meta=(Description="Target graph")) - FString Graph; - UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; UPROPERTY(EditAnywhere, meta=(Description="Pin or property name")) FString Name; @@ -38,16 +35,11 @@ public: // K2 graphs: set pin default values. // ----------------------------------------------------------------------- - void HandleK2(UEdGraph* GraphObj, const UEdGraphSchema_K2* K2Schema) + void HandleK2(UEdGraphNode* FoundNode, const UEdGraphSchema_K2* K2Schema) { - WingFetcher F(GraphObj, WingOut::Stdout); - UWingGraphPinRef* PinRef = F.Node(Node).Pin(Name).Cast(); - if (!PinRef) return; - UEdGraphPin* Pin = WingUtils::CheckGetPin(PinRef->Node, PinRef->PinName, WingOut::Stdout); + UEdGraphPin* Pin = WingUtils::CheckGetPin(FoundNode, FName(*Name), WingOut::Stdout); if (!Pin) return; - UEdGraphNode* FoundNode = Pin->GetOwningNode(); - if (Pin->Direction != EGPD_Input) { WingOut::Stdout.Printf(TEXT("error: %s is an output pin\n"), *WingUtils::FormatName(Pin)); @@ -72,12 +64,8 @@ public: // Material graphs: set material expression properties. // ----------------------------------------------------------------------- - void HandleMaterial(UEdGraph* GraphObj) + void HandleMaterial(UEdGraphNode* FoundNode) { - WingFetcher F(GraphObj, WingOut::Stdout); - UEdGraphNode* FoundNode = F.Node(Node).Cast(); - if (!FoundNode) return; - TArray All = FWingProperty::GetDetails(FoundNode, true); FWingProperty *P = WingUtils::FindOneWithExternalID(Name, All, TEXT("Property"), WingOut::Stdout); if (!P) return; @@ -92,12 +80,11 @@ public: virtual void Handle() override { - // Fetch the graph once. - WingFetcher GraphFetcher(WingOut::Stdout); - UEdGraph* GraphObj = GraphFetcher.Walk(Graph).Cast(); - if (!GraphObj) return; + WingFetcher F(WingOut::Stdout); + UEdGraphNode* FoundNode = F.Walk(NodePath).Cast(); + if (!FoundNode) return; - const UEdGraphSchema* Schema = GraphObj->GetSchema(); + const UEdGraphSchema* Schema = FoundNode->GetGraph()->GetSchema(); const UEdGraphSchema_K2* K2Schema = Cast(Schema); const UMaterialGraphSchema* MGSchema = Cast(Schema); @@ -107,8 +94,8 @@ public: return; } - if (K2Schema) HandleK2(GraphObj, K2Schema); - else if (MGSchema) HandleMaterial(GraphObj); + if (K2Schema) HandleK2(FoundNode, K2Schema); + else if (MGSchema) HandleMaterial(FoundNode); WingOut::Stdout.Printf(TEXT("Done.\n")); } diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPosition.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPosition.h index f7c91712..404c04f7 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPosition.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetPosition.h @@ -15,11 +15,8 @@ class UWing_GraphNode_SetPosition : public UWingHandler GENERATED_BODY() public: - UPROPERTY(EditAnywhere, meta=(Description="Target graph")) - FString Graph; - UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; UPROPERTY(EditAnywhere, meta=(Description="New X position")) int32 X = 0; @@ -35,11 +32,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraph* TargetGraph = F.Walk(Graph).Cast(); - if (!TargetGraph) return; - - WingFetcher FN(TargetGraph, WingOut::Stdout); - UEdGraphNode* FoundNode = FN.Node(Node).Cast(); + UEdGraphNode* FoundNode = F.Walk(NodePath).Cast(); if (!FoundNode) return; FoundNode->NodePosX = X; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h index e17c4544..d128d190 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_ShowMenu.h @@ -21,7 +21,7 @@ class UWing_GraphNode_ShowMenu : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target node")) - FString Node; + FString NodePath; virtual void Register() override { @@ -32,7 +32,7 @@ private: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraphNode* NodeObj = F.Walk(Node).Cast(); + UEdGraphNode* NodeObj = F.Walk(NodePath).Cast(); if (!NodeObj) return; if (Cast(NodeObj)) diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h index 1fcde977..1c3d1176 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h @@ -18,7 +18,7 @@ class UWing_GraphPin_Connect : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target graph")) - FString Graph; + FString GraphPath; UPROPERTY(EditAnywhere, meta=(Description="Alternating source pin / target pin strings")) FWingRestOfArgv SourcePin_TargetPin; @@ -33,7 +33,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraph* G = F.Walk(Graph).Cast(); + UEdGraph* G = F.Walk(GraphPath).Cast(); if (!G) return; if ((SourcePin_TargetPin.Argv.Num() % 2) != 0) diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h index b45a8707..a1680838 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h @@ -21,7 +21,7 @@ class UWing_GraphPin_Disconnect : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Target graph")) - FString Graph; + FString GraphPath; UPROPERTY(EditAnywhere, meta=(Description="Pin ID strings")) FWingRestOfArgv Pins; @@ -36,7 +36,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraph* G = F.Walk(Graph).Cast(); + UEdGraph* G = F.Walk(GraphPath).Cast(); if (!G) return; int32 SuccessCount = 0; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h index 3e454334..7b0957e2 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Graph_Dump.h @@ -20,7 +20,7 @@ class UWing_Graph_Dump : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to graph")) - FString Graph; + FString GraphPath; UPROPERTY(EditAnywhere, meta=(Description="True to show minor node properties")) bool Details = false; @@ -33,7 +33,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UEdGraph *G = F.Walk(Graph).Cast(); + UEdGraph *G = F.Walk(GraphPath).Cast(); if (!G) return; WingGraphExport Exporter(G, true, Details); diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Test_TMaps.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Test_TMaps.h deleted file mode 100644 index 459a6b33..00000000 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Test_TMaps.h +++ /dev/null @@ -1,59 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "WingServer.h" -#include "WingBasics.h" -#include "Containers/BitArray.h" -#include "Containers/SparseArray.h" -#include "Test_TMaps.generated.h" - - -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- - -UCLASS() -class UWing_Test_TMaps : public UWingHandler -{ - GENERATED_BODY() - -public: - virtual void Register() override - { - UWingServer::AddHandler(this, - TEXT("Constructs a small TMap, TBitArray, and TSparseArray so that " - "a developer can set a breakpoint and inspect them with the " - "lldb data formatters.")); - } - - virtual void Handle() override - { - TMap Map; - Map.Add(1, TEXT("one")); - Map.Add(2, TEXT("two")); - Map.Add(3, TEXT("three")); - Map.Add(42, TEXT("forty-two")); - - TBitArray<> Bits; - Bits.Add(true); - Bits.Add(false); - Bits.Add(true); - Bits.Add(true); - Bits.Add(false); - - // Add a few entries, then remove a middle one so the live set is - // non-contiguous. Exercises the sparse-array formatter against a hole. - TSparseArray Sparse; - Sparse.Add(TEXT("alpha")); - int32 BetaIdx = Sparse.Add(TEXT("beta")); - Sparse.Add(TEXT("gamma")); - Sparse.Add(TEXT("delta")); - Sparse.RemoveAt(BetaIdx); - - TTuple Tuple(1, TEXT("hello"), 3.14f, true, FName("world")); - - // Set a breakpoint on the following line to inspect Map, Bits, and Sparse. - WingOut::Stdout.Printf(TEXT("Test_TMaps: Map has %d entries, Bits has %d bits, Sparse has %d entries.\n"), - Map.Num(), Bits.Num(), Sparse.Num()); - } -}; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h index 8dcf7b8c..a622818a 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Add.h @@ -19,7 +19,7 @@ class UWing_Variables_Add : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to a blueprint, graph, or custom event node")) - FString Object; + FString ObjectPath; UPROPERTY(EditAnywhere, meta=(Description="Variable descriptions")) FWingRestOfArgv Variables; @@ -35,7 +35,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Obj = F.Walk(Object).Cast(); + UObject* Obj = F.Walk(ObjectPath).Cast(); if (!Obj) return; WingVariables Vars; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h index 35d07aa0..d6136f79 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Dump.h @@ -19,7 +19,7 @@ class UWing_Variables_Dump : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to a blueprint, graph, or custom event node")) - FString Object; + FString ObjectPath; virtual void Register() override { @@ -30,7 +30,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Obj = F.Walk(Object).Cast(); + UObject* Obj = F.Walk(ObjectPath).Cast(); if (!Obj) return; WingVariables Vars; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h index 47231041..ed895252 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Modify.h @@ -19,7 +19,7 @@ class UWing_Variables_Modify : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to a blueprint, graph, or custom event node")) - FString Object; + FString ObjectPath; UPROPERTY(EditAnywhere, meta=(Description="Variable descriptions")) FWingRestOfArgv Variables; @@ -35,7 +35,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Obj = F.Walk(Object).Cast(); + UObject* Obj = F.Walk(ObjectPath).Cast(); if (!Obj) return; WingVariables Vars; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h index 6d5ab658..6e4b9447 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Variables_Remove.h @@ -19,7 +19,7 @@ class UWing_Variables_Remove : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to a blueprint, graph, or custom event node")) - FString Object; + FString ObjectPath; UPROPERTY(EditAnywhere, meta=(Description="Variable descriptions")) FWingRestOfArgv Variables; @@ -34,7 +34,7 @@ public: virtual void Handle() override { WingFetcher F(WingOut::Stdout); - UObject* Obj = F.Walk(Object).Cast(); + UObject* Obj = F.Walk(ObjectPath).Cast(); if (!Obj) return; WingVariables Vars; diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h index 7c4eb8ea..7612165d 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Add.h @@ -25,7 +25,7 @@ class UWing_Widget_Add : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Widget blueprint to add the widget to")) - FString Blueprint; + FString BlueprintPath; UPROPERTY(EditAnywhere, meta=(Description="Widget type, from Widget_SearchTypes")) FString Type; @@ -49,7 +49,7 @@ public: { // Fetch the widget blueprint. WingFetcher F(WingOut::Stdout); - UWidgetBlueprint* BP = F.Walk(Blueprint).Cast(); + UWidgetBlueprint* BP = F.Walk(BlueprintPath).Cast(); if (!BP) return; // Resolve the widget type. diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h index a6d57abb..6c65f145 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Remove.h @@ -23,7 +23,7 @@ class UWing_Widget_Remove : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to the widget, eg /Game/Widgets/WB_Test,widget:MyButton")) - FString Widget; + FString WidgetPath; virtual void Register() override { @@ -35,7 +35,7 @@ public: { // Walk to the widget. WingFetcher F(WingOut::Stdout); - UWidget* TargetWidget = F.Walk(Widget).Cast(); + UWidget* TargetWidget = F.Walk(WidgetPath).Cast(); if (!TargetWidget) return; // Get the widget blueprint and tree from the widget's outer chain. diff --git a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h index dbfc32bb..60c92abb 100644 --- a/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h +++ b/Plugins/UEWingman/Source/UEWingman/Handlers/Widget_Reparent.h @@ -23,7 +23,7 @@ class UWing_Widget_Reparent : public UWingHandler public: UPROPERTY(EditAnywhere, meta=(Description="Path to the widget, eg /Game/Widgets/WB_Test,widget:MyButton")) - FString Widget; + FString WidgetPath; UPROPERTY(EditAnywhere, meta=(Description="Name of the new parent widget. Must be a panel.")) FString Parent; @@ -37,7 +37,7 @@ public: { // Walk to the widget. WingFetcher F(WingOut::Stdout); - UWidget* TargetWidget = F.Walk(Widget).Cast(); + UWidget* TargetWidget = F.Walk(WidgetPath).Cast(); if (!TargetWidget) return; // Get the widget blueprint from the widget's outer chain.