talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: talezero:f4286faeb12d1c087856f2b8707a9d965f3fab2b
Branches Tags
talezero:main
...
compare: talezero:5001be6c909d8744c484eea90961eb916af6ad4d
Branches Tags
talezero:main

4 Commits
f4286faeb1 ... 5001be6c90

Author SHA1 Message Date
jyelon
5001be6c90 More tstrong 2026-04-08 06:08:48 -04:00
jyelon
69b249f7ca Fix three bugs in WingVariables 2026-04-08 05:54:00 -04:00
jyelon
50790280bb Minor cleanups 2026-04-08 03:47:28 -04:00
jyelon
73f84c1681 Renaming 2026-04-08 03:40:59 -04:00
19 changed files with 85 additions and 87 deletions
Expand all files Collapse all files

4
Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Add.h
View File

@@ -65,8 +65,8 @@ public:
if (!UWingComponent::CheckValidComponentClass(ComponentClass, WingOut::Stdout)) return; if (!UWingComponent::CheckValidComponentClass(ComponentClass, WingOut::Stdout)) return;
// Find the specified parent component // Find the specified parent component
TArray<TStrongObjectPtr<UWingComponentReference>> AllComponents = UWingComponent::GetAll(BP); TArray<TStrongObjectPtr<UWingComponentRef>> AllComponents = UWingComponent::GetAll(BP);
TStrongObjectPtr<UWingComponentReference> ParentComp = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout); TStrongObjectPtr<UWingComponentRef> ParentComp = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout);
if (!ParentComp) return; if (!ParentComp) return;
// Create the SCS node // Create the SCS node

2
Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Remove.h
View File

@@ -29,7 +29,7 @@ public:
virtual void Handle() override virtual void Handle() override
{ {
WingFetcher F(WingOut::Stdout); WingFetcher F(WingOut::Stdout);
UWingComponentReference* CompRef = F.Walk(Component).Cast<UWingComponentReference>(); UWingComponentRef* CompRef = F.Walk(Component).Cast<UWingComponentRef>();
if (!CompRef) return; if (!CompRef) return;
if (!UWingComponent::DeleteComponent(CompRef, WingOut::Stdout)) return; if (!UWingComponent::DeleteComponent(CompRef, WingOut::Stdout)) return;

6
Plugins/UEWingman/Source/UEWingman/Handlers/ActorComponent_Reparent.h
View File

@@ -34,13 +34,13 @@ public:
virtual void Handle() override virtual void Handle() override
{ {
WingFetcher F(WingOut::Stdout); WingFetcher F(WingOut::Stdout);
UWingComponentReference* CompRef = F.Walk(Component).Cast<UWingComponentReference>(); UWingComponentRef* CompRef = F.Walk(Component).Cast<UWingComponentRef>();
if (!CompRef) return; if (!CompRef) return;
// Find the new parent among all components (if specified) // Find the new parent among all components (if specified)
UBlueprint *BP = CompRef->BP; UBlueprint *BP = CompRef->BP;
TArray<TStrongObjectPtr<UWingComponentReference>> AllComponents = UWingComponent::GetAll(BP); TArray<TStrongObjectPtr<UWingComponentRef>> AllComponents = UWingComponent::GetAll(BP);
TStrongObjectPtr<UWingComponentReference> NewParent = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout); TStrongObjectPtr<UWingComponentRef> NewParent = WingUtils::FindOneWithExternalID(Parent, AllComponents, TEXT("Component"), WingOut::Stdout);
if (!NewParent) return; if (!NewParent) return;
if (!UWingComponent::ReparentComponent(CompRef, NewParent.Get(), WingOut::Stdout)) return; if (!UWingComponent::ReparentComponent(CompRef, NewParent.Get(), WingOut::Stdout)) return;

2
Plugins/UEWingman/Source/UEWingman/Handlers/Blueprint_Dump.h
View File

@@ -69,7 +69,7 @@ public:
BlueprintVars.Print(WingOut::StdoutBuffer); BlueprintVars.Print(WingOut::StdoutBuffer);
// Components // Components
TArray<TStrongObjectPtr<UWingComponentReference>> Components = UWingComponent::GetAll(BP); TArray<TStrongObjectPtr<UWingComponentRef>> Components = UWingComponent::GetAll(BP);
if (!Components.IsEmpty()) WingOut::Stdout.Print(TEXT("\nComponents:\n")); if (!Components.IsEmpty()) WingOut::Stdout.Print(TEXT("\nComponents:\n"));
UWingComponent::PrintAll(BP, WingOut::Stdout); UWingComponent::PrintAll(BP, WingOut::Stdout);

2
Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_SetDefaults.h
View File

@@ -56,7 +56,7 @@ public:
void HandleK2Entry(const FSetNodeDefaultEntry& Entry, UEdGraph* GraphObj, const UEdGraphSchema_K2* K2Schema) void HandleK2Entry(const FSetNodeDefaultEntry& Entry, UEdGraph* GraphObj, const UEdGraphSchema_K2* K2Schema)
{ {
WingFetcher F(GraphObj, WingOut::Stdout); WingFetcher F(GraphObj, WingOut::Stdout);
UWingPinReference* PinRef = F.Node(Entry.Node).Pin(Entry.Name).Cast<UWingPinReference>(); UWingGraphPinRef* PinRef = F.Node(Entry.Node).Pin(Entry.Name).Cast<UWingGraphPinRef>();
if (!PinRef) return; if (!PinRef) return;
UEdGraphPin* Pin = WingUtils::CheckGetPin(PinRef->Node, PinRef->PinName, WingOut::Stdout); UEdGraphPin* Pin = WingUtils::CheckGetPin(PinRef->Node, PinRef->PinName, WingOut::Stdout);
if (!Pin) return; if (!Pin) return;

4
Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Connect.h
View File

@@ -63,13 +63,13 @@ public:
continue; continue;
WingFetcher FS(G, WingOut::Stdout); WingFetcher FS(G, WingOut::Stdout);
UWingPinReference* SourcePinRef = FS.Walk(Entry.SourcePin).Cast<UWingPinReference>(); UWingGraphPinRef* SourcePinRef = FS.Walk(Entry.SourcePin).Cast<UWingGraphPinRef>();
if (!SourcePinRef) continue; if (!SourcePinRef) continue;
UEdGraphPin* SourcePin = WingUtils::CheckGetPin(SourcePinRef->Node, SourcePinRef->PinName, WingOut::Stdout); UEdGraphPin* SourcePin = WingUtils::CheckGetPin(SourcePinRef->Node, SourcePinRef->PinName, WingOut::Stdout);
if (!SourcePin) continue; if (!SourcePin) continue;
WingFetcher FT(G, WingOut::Stdout); WingFetcher FT(G, WingOut::Stdout);
UWingPinReference* TargetPinRef = FT.Walk(Entry.TargetPin).Cast<UWingPinReference>(); UWingGraphPinRef* TargetPinRef = FT.Walk(Entry.TargetPin).Cast<UWingGraphPinRef>();
if (!TargetPinRef) continue; if (!TargetPinRef) continue;
UEdGraphPin* TargetPin = WingUtils::CheckGetPin(TargetPinRef->Node, TargetPinRef->PinName, WingOut::Stdout); UEdGraphPin* TargetPin = WingUtils::CheckGetPin(TargetPinRef->Node, TargetPinRef->PinName, WingOut::Stdout);
if (!TargetPin) continue; if (!TargetPin) continue;

4
Plugins/UEWingman/Source/UEWingman/Handlers/GraphPin_Disconnect.h
View File

@@ -62,7 +62,7 @@ public:
if (!FWingProperty::PopulateFromJson(EntryProps, *DiscVal, false, WingOut::Stdout)) continue; if (!FWingProperty::PopulateFromJson(EntryProps, *DiscVal, false, WingOut::Stdout)) continue;
WingFetcher FP(G, WingOut::Stdout); WingFetcher FP(G, WingOut::Stdout);
UWingPinReference* PinRef = FP.Walk(Entry.Pin).Cast<UWingPinReference>(); UWingGraphPinRef* PinRef = FP.Walk(Entry.Pin).Cast<UWingGraphPinRef>();
if (!PinRef) continue; if (!PinRef) continue;
UEdGraphPin* Pin = WingUtils::CheckGetPin(PinRef->Node, PinRef->PinName, WingOut::Stdout); UEdGraphPin* Pin = WingUtils::CheckGetPin(PinRef->Node, PinRef->PinName, WingOut::Stdout);
if (!Pin) continue; if (!Pin) continue;
@@ -72,7 +72,7 @@ public:
if (!Entry.TargetPin.IsEmpty()) if (!Entry.TargetPin.IsEmpty())
{ {
WingFetcher FT(G, WingOut::Stdout); WingFetcher FT(G, WingOut::Stdout);
UWingPinReference* TargetRef = FT.Walk(Entry.TargetPin).Cast<UWingPinReference>(); UWingGraphPinRef* TargetRef = FT.Walk(Entry.TargetPin).Cast<UWingGraphPinRef>();
if (!TargetRef) continue; if (!TargetRef) continue;
UEdGraphPin* Target = WingUtils::CheckGetPin(TargetRef->Node, TargetRef->PinName, WingOut::Stdout); UEdGraphPin* Target = WingUtils::CheckGetPin(TargetRef->Node, TargetRef->PinName, WingOut::Stdout);
if (!Target) continue; if (!Target) continue;

18
Plugins/UEWingman/Source/UEWingman/Private/WingComponent.cpp
View File

@@ -136,7 +136,7 @@ void UWingComponent::AddChildNode(UBlueprint *BP, USCS_Node *NewNode, FoundCompo
} }
} }
bool UWingComponent::AddComponent(UBlueprint *BP, UClass *Class, UWingComponentReference *Parent, FName Name, WingOut Errors) bool UWingComponent::AddComponent(UBlueprint *BP, UClass *Class, UWingComponentRef *Parent, FName Name, WingOut Errors)
{ {
TSet<FName> Names; TSet<FName> Names;
FBlueprintEditorUtils::GetClassVariableList(BP, Names); FBlueprintEditorUtils::GetClassVariableList(BP, Names);
@@ -164,7 +164,7 @@ bool UWingComponent::AddComponent(UBlueprint *BP, UClass *Class, UWingComponentR
return true; return true;
} }
bool UWingComponent::ReparentComponent(UWingComponentReference *Ref, UWingComponentReference *Parent, WingOut Errors) bool UWingComponent::ReparentComponent(UWingComponentRef *Ref, UWingComponentRef *Parent, WingOut Errors)
{ {
FoundComponent ParentComponent = FindComponent(Ref->BP, Parent->VariableName); FoundComponent ParentComponent = FindComponent(Ref->BP, Parent->VariableName);
if (!CheckValidParent(ParentComponent, Errors)) return false; if (!CheckValidParent(ParentComponent, Errors)) return false;
@@ -184,7 +184,7 @@ bool UWingComponent::ReparentComponent(UWingComponentReference *Ref, UWingCompon
return true; return true;
} }
bool UWingComponent::DeleteComponent(UWingComponentReference *Ref, WingOut Errors) bool UWingComponent::DeleteComponent(UWingComponentRef *Ref, WingOut Errors)
{ {
FoundComponent ThisComponent = FindComponent(Ref->BP, Ref->VariableName); FoundComponent ThisComponent = FindComponent(Ref->BP, Ref->VariableName);
if (!CheckExists(ThisComponent, Errors)) return false; if (!CheckExists(ThisComponent, Errors)) return false;
@@ -211,7 +211,7 @@ TMap<FName, FName> UWingComponent::CalculateParentNames(USimpleConstructionScrip
return ParentNames; return ParentNames;
} }
UActorComponent* UWingComponent::GetImmutableTemplate(const UWingComponentReference *Ref) UActorComponent* UWingComponent::GetImmutableTemplate(const UWingComponentRef *Ref)
{ {
FoundComponent FC = FindComponent(Ref->BP, Ref->VariableName); FoundComponent FC = FindComponent(Ref->BP, Ref->VariableName);
if (FC.Native) return FC.Native; if (FC.Native) return FC.Native;
@@ -229,7 +229,7 @@ UActorComponent* UWingComponent::GetImmutableTemplate(const UWingComponentRefere
return nullptr; return nullptr;
} }
UActorComponent* UWingComponent::GetMutableTemplate(const UWingComponentReference *Ref) UActorComponent* UWingComponent::GetMutableTemplate(const UWingComponentRef *Ref)
{ {
FoundComponent FC = FindComponent(Ref->BP, Ref->VariableName); FoundComponent FC = FindComponent(Ref->BP, Ref->VariableName);
if (FC.Native) return FC.Native; if (FC.Native) return FC.Native;
@@ -244,9 +244,9 @@ UActorComponent* UWingComponent::GetMutableTemplate(const UWingComponentReferenc
return Override; return Override;
} }
TArray<TStrongObjectPtr<UWingComponentReference>> UWingComponent::GetAll(UBlueprint* BP) TArray<TStrongObjectPtr<UWingComponentRef>> UWingComponent::GetAll(UBlueprint* BP)
{ {
TArray<TStrongObjectPtr<UWingComponentReference>> Result; TArray<TStrongObjectPtr<UWingComponentRef>> Result;
if (!BP) return Result; if (!BP) return Result;
// Find the native ancestor class // Find the native ancestor class
@@ -261,7 +261,7 @@ TArray<TStrongObjectPtr<UWingComponentReference>> UWingComponent::GetAll(UBluepr
CDO->GetComponents(NativeComponents); CDO->GetComponents(NativeComponents);
for (UActorComponent* Comp : NativeComponents) for (UActorComponent* Comp : NativeComponents)
{ {
UWingComponentReference* Ref = NewObject<UWingComponentReference>(); UWingComponentRef* Ref = NewObject<UWingComponentRef>();
Ref->BP = BP; Ref->BP = BP;
Ref->VariableName = Comp->GetFName(); Ref->VariableName = Comp->GetFName();
Result.Emplace(Ref); Result.Emplace(Ref);
@@ -275,7 +275,7 @@ TArray<TStrongObjectPtr<UWingComponentReference>> UWingComponent::GetAll(UBluepr
if (WalkBP->SimpleConstructionScript == nullptr) continue; if (WalkBP->SimpleConstructionScript == nullptr) continue;
for (USCS_Node* Node : WalkBP->SimpleConstructionScript->GetAllNodes()) for (USCS_Node* Node : WalkBP->SimpleConstructionScript->GetAllNodes())
{ {
UWingComponentReference* Ref = NewObject<UWingComponentReference>(); UWingComponentRef* Ref = NewObject<UWingComponentRef>();
Ref->BP = BP; Ref->BP = BP;
Ref->VariableName = Node->GetVariableName(); Ref->VariableName = Node->GetVariableName();
Result.Emplace(Ref); Result.Emplace(Ref);

14
Plugins/UEWingman/Source/UEWingman/Private/WingFetcher.cpp
View File

@@ -266,7 +266,7 @@ WingFetcher& WingFetcher::Pin(const FString& Value)
} }
return SetError(); return SetError();
} }
UWingPinReference* Ref = NewObject<UWingPinReference>(); UWingGraphPinRef* Ref = NewObject<UWingGraphPinRef>();
Ref->Node = N; Ref->Node = N;
Ref->PinName = Found->GetFName(); Ref->PinName = Found->GetFName();
SetObj(Ref); SetObj(Ref);
@@ -284,12 +284,12 @@ WingFetcher& WingFetcher::Component(const FString& Value)
return SetError(); return SetError();
} }
TArray<TStrongObjectPtr<UWingComponentReference>> AllComponents = UWingComponent::GetAll(BP); TArray<TStrongObjectPtr<UWingComponentRef>> AllComponents = UWingComponent::GetAll(BP);
TStrongObjectPtr<UWingComponentReference> Found = WingUtils::FindOneWithExternalID(Value, AllComponents, TEXT("component"), Errors); TStrongObjectPtr<UWingComponentRef> Found = WingUtils::FindOneWithExternalID(Value, AllComponents, TEXT("component"), Errors);
if (!Found) if (!Found)
{ {
Errors.Printf(TEXT("Components that exist in the blueprint:\n")); Errors.Printf(TEXT("Components that exist in the blueprint:\n"));
for (const TStrongObjectPtr<UWingComponentReference>& C : AllComponents) for (const TStrongObjectPtr<UWingComponentRef>& C : AllComponents)
{ {
Errors.Printf(TEXT(" %s\n"), *WingUtils::FormatName(C.Get())); Errors.Printf(TEXT(" %s\n"), *WingUtils::FormatName(C.Get()));
} }
@@ -376,9 +376,9 @@ WingFetcher& WingFetcher::StructProp(const FString& Value)
UStruct *HostType = Obj.Get()->GetClass(); UStruct *HostType = Obj.Get()->GetClass();
bool HostEditable = true; bool HostEditable = true;
// If we are *already* inside a UWingStructPointer, update the host // If we are *already* inside a UWingStructRef, update the host
// fields, to make it possible to navigate even further inside. // fields, to make it possible to navigate even further inside.
if (UWingStructPointer *SPtr = ::Cast<UWingStructPointer>(Obj.Get())) if (UWingStructRef *SPtr = ::Cast<UWingStructRef>(Obj.Get()))
{ {
HostObject = SPtr->Object; HostObject = SPtr->Object;
HostBase = SPtr->StructBase; HostBase = SPtr->StructBase;
@@ -393,7 +393,7 @@ WingFetcher& WingFetcher::StructProp(const FString& Value)
return SetError(); return SetError();
} }
UWingStructPointer* Ptr = NewObject<UWingStructPointer>(); UWingStructRef* Ptr = NewObject<UWingStructRef>();
Ptr->Object = HostObject; Ptr->Object = HostObject;
Ptr->StructType = StructProp->Struct; Ptr->StructType = StructProp->Struct;
Ptr->StructBase = StructProp->ContainerPtrToValuePtr<void>(HostBase); Ptr->StructBase = StructProp->ContainerPtrToValuePtr<void>(HostBase);

6
Plugins/UEWingman/Source/UEWingman/Private/WingProperty.cpp
View File

@@ -427,9 +427,9 @@ TArray<FWingProperty> FWingProperty::GetDetails(UObject* Obj, bool Mutable)
{ {
if (!Obj) return {}; if (!Obj) return {};
// If it's a UWingStructPointer, return the properties // If it's a UWingStructRef, return the properties
// of the struct instead. Propagate editability of the host. // of the struct instead. Propagate editability of the host.
if (UWingStructPointer *SP = Cast<UWingStructPointer>(Obj)) if (UWingStructRef *SP = Cast<UWingStructRef>(Obj))
{ {
TArray<FWingProperty> Result = TArray<FWingProperty> Result =
GetVisible(FWingStructAndUStruct(SP->StructBase, SP->StructType)); GetVisible(FWingStructAndUStruct(SP->StructBase, SP->StructType));
@@ -450,7 +450,7 @@ TArray<FWingProperty> FWingProperty::GetDetails(UObject* Obj, bool Mutable)
} }
// Component references: get the proper template. // Component references: get the proper template.
if (UWingComponentReference* Ref = ::Cast<UWingComponentReference>(Obj)) if (UWingComponentRef* Ref = ::Cast<UWingComponentRef>(Obj))
{ {
Obj = Mutable ? UWingComponent::GetMutableTemplate(Ref) : UWingComponent::GetImmutableTemplate(Ref); Obj = Mutable ? UWingComponent::GetMutableTemplate(Ref) : UWingComponent::GetImmutableTemplate(Ref);
if (!Obj) if (!Obj)

5
Plugins/UEWingman/Source/UEWingman/Private/WingServer.cpp
View File

@@ -4,6 +4,7 @@
#include "UObject/StrongObjectPtr.h" #include "UObject/StrongObjectPtr.h"
#include "AssetRegistry/AssetRegistryModule.h" #include "AssetRegistry/AssetRegistryModule.h"
#include "AssetRegistry/IAssetRegistry.h" #include "AssetRegistry/IAssetRegistry.h"
#include "Misc/OutputDeviceRedirector.h"
#include "Serialization/JsonReader.h" #include "Serialization/JsonReader.h"
#include "Serialization/JsonSerializer.h" #include "Serialization/JsonSerializer.h"
#include "SocketSubsystem.h" #include "SocketSubsystem.h"
@@ -57,7 +58,7 @@ void UWingServer::Initialize(FSubsystemCollectionBase& Collection)
BuildWingHandlerRegistry(); BuildWingHandlerRegistry();
ModulesChangedHandle = FModuleManager::Get().OnModulesChanged().AddUObject(this, &UWingServer::OnModulesChanged); ModulesChangedHandle = FModuleManager::Get().OnModulesChanged().AddUObject(this, &UWingServer::OnModulesChanged);
LogCapture.bEnabled = false; LogCapture.bEnabled = false;
LogCapture.Install(); GLog->AddOutputDevice(&LogCapture);
bRunning = true; bRunning = true;
UE_LOG(LogTemp, Display, TEXT("UEWingman: MCP server listening on tcp://localhost:%d"), Port); UE_LOG(LogTemp, Display, TEXT("UEWingman: MCP server listening on tcp://localhost:%d"), Port);
} }
@@ -113,7 +114,7 @@ void UWingServer::Deinitialize()
ListenSocket = nullptr; ListenSocket = nullptr;
} }
LogCapture.Uninstall(); GLog->RemoveOutputDevice(&LogCapture);
bRunning = false; bRunning = false;
bShuttingDown = false; bShuttingDown = false;
GWingServer = nullptr; GWingServer = nullptr;

2
Plugins/UEWingman/Source/UEWingman/Private/WingUtils.cpp
View File

@@ -245,7 +245,7 @@ FString WingUtils::FormatName(const FBPInterfaceDescription &IFace)
return FormatName(IFace.Interface); return FormatName(IFace.Interface);
} }
FString WingUtils::FormatName(const UWingComponentReference *Ref) FString WingUtils::FormatName(const UWingComponentRef *Ref)
{ {
return ExternalizeID(Ref->VariableName); return ExternalizeID(Ref->VariableName);
} }

56
Plugins/UEWingman/Source/UEWingman/Private/WingVariables.cpp
View File

@@ -257,15 +257,15 @@ void WingVariables::Print(WingOut Out)
void WingVariables::Load(WingOut Errors) void WingVariables::Load(WingOut Errors)
{ {
Empty(); Empty();
if (Blueprint != nullptr) return LoadBlueprint(); if (Blueprint) return LoadBlueprint();
if (Graph != nullptr) return LoadGraph(); if (Graph) return LoadGraph();
if (CustomEvent != nullptr) return LoadCustomEvent(); if (CustomEvent) return LoadCustomEvent();
ErrorNoBackingStore(Errors); ErrorNoBackingStore(Errors);
} }
void WingVariables::LoadBlueprint() void WingVariables::LoadBlueprint()
{ {
UObject *CDO = WingUtils::GetGeneratedCDO(Blueprint); UObject *CDO = WingUtils::GetGeneratedCDO(Blueprint.Get());
for (FBPVariableDescription& Desc : Blueprint->NewVariables) for (FBPVariableDescription& Desc : Blueprint->NewVariables)
{ {
@@ -281,7 +281,7 @@ void WingVariables::LoadGraph()
{ {
TWeakObjectPtr<UK2Node_EditablePinBase> EntryNode; TWeakObjectPtr<UK2Node_EditablePinBase> EntryNode;
TWeakObjectPtr<UK2Node_EditablePinBase> ResultNode; TWeakObjectPtr<UK2Node_EditablePinBase> ResultNode;
FBlueprintEditorUtils::GetEntryAndResultNodes(Graph, EntryNode, ResultNode); FBlueprintEditorUtils::GetEntryAndResultNodes(Graph.Get(), EntryNode, ResultNode);
if (EntryNode.IsValid()) LoadEditablePinBase(EntryNode.Get(), InputVariables); if (EntryNode.IsValid()) LoadEditablePinBase(EntryNode.Get(), InputVariables);
if (ResultNode.IsValid()) LoadEditablePinBase(ResultNode.Get(), OutputVariables); if (ResultNode.IsValid()) LoadEditablePinBase(ResultNode.Get(), OutputVariables);
LoadLocalVariables(EntryNode.Get()); LoadLocalVariables(EntryNode.Get());
@@ -359,7 +359,7 @@ void WingVariables::LoadEditablePinBase(UK2Node_EditablePinBase* Node, WingVaria
void WingVariables::LoadCustomEvent() void WingVariables::LoadCustomEvent()
{ {
LoadEditablePinBase(CustomEvent, InputVariables); LoadEditablePinBase(CustomEvent.Get(), InputVariables);
} }
bool WingVariables::Check(WingOut Errors) bool WingVariables::Check(WingOut Errors)
@@ -382,7 +382,7 @@ bool WingVariables::CheckBlueprint(WingOut Errors)
bool WingVariables::CheckGraph(WingOut Errors) bool WingVariables::CheckGraph(WingOut Errors)
{ {
EGraphType T = Graph->GetSchema()->GetGraphType(Graph); EGraphType T = Graph->GetSchema()->GetGraphType(Graph.Get());
bool AllowLocal = (T == EGraphType::GT_Function); bool AllowLocal = (T == EGraphType::GT_Function);
bool AllowInput = (T == EGraphType::GT_Function) || (T == EGraphType::GT_Macro); bool AllowInput = (T == EGraphType::GT_Function) || (T == EGraphType::GT_Macro);
bool AllowOutput = (T == EGraphType::GT_Function) || (T == EGraphType::GT_Macro); bool AllowOutput = (T == EGraphType::GT_Function) || (T == EGraphType::GT_Macro);
@@ -421,7 +421,7 @@ bool WingVariables::Modify(WingOut Errors)
bool WingVariables::ModifyBlueprint(WingOut Errors) bool WingVariables::ModifyBlueprint(WingOut Errors)
{ {
if (!CheckBlueprint(Errors)) return false; if (!CheckBlueprint(Errors)) return false;
if (LinkBlueprintVariables(Errors)) return false; if (!LinkBlueprintVariables(Errors)) return false;
for (Var &V : BlueprintVariables.Variables) for (Var &V : BlueprintVariables.Variables)
{ {
V.BPVar->VarType = V.Type; V.BPVar->VarType = V.Type;
@@ -481,8 +481,8 @@ bool WingVariables::ModifyBlueprintDefaults(WingOut Errors)
if (Input.DefaultSpecified) AnySpecified = true; if (Input.DefaultSpecified) AnySpecified = true;
if (!AnySpecified) return true; if (!AnySpecified) return true;
FKismetEditorUtilities::CompileBlueprint(Blueprint); FKismetEditorUtilities::CompileBlueprint(Blueprint.Get());
UObject *CDO = WingUtils::GetGeneratedCDO(Blueprint); UObject *CDO = WingUtils::GetGeneratedCDO(Blueprint.Get());
if (!CDO) if (!CDO)
{ {
Errors.Printf(TEXT("Blueprint didn't compile, cannot store default values")); Errors.Printf(TEXT("Blueprint didn't compile, cannot store default values"));
@@ -535,7 +535,7 @@ bool WingVariables::ModifyCustomEvent(WingOut Errors)
{ {
if (!CheckCustomEvent(Errors)) return false; if (!CheckCustomEvent(Errors)) return false;
ClearLinks(); ClearLinks();
if (!ModifyEditablePinBase(InputVariables, CustomEvent, Errors)) return false; if (!ModifyEditablePinBase(InputVariables, CustomEvent.Get(), Errors)) return false;
CustomEvent->ReconstructNode(); CustomEvent->ReconstructNode();
return true; return true;
} }
@@ -567,7 +567,7 @@ bool WingVariables::GetGraphNodes(
LocalNode = nullptr; LocalNode = nullptr;
TWeakObjectPtr<UK2Node_EditablePinBase> Inputs, Outputs; TWeakObjectPtr<UK2Node_EditablePinBase> Inputs, Outputs;
FBlueprintEditorUtils::GetEntryAndResultNodes(Graph, Inputs, Outputs); FBlueprintEditorUtils::GetEntryAndResultNodes(Graph.Get(), Inputs, Outputs);
if (!Inputs.IsValid()) if (!Inputs.IsValid())
{ {
Errors.Printf(TEXT("ERROR: no function entry node for graph.")); Errors.Printf(TEXT("ERROR: no function entry node for graph."));
@@ -609,13 +609,13 @@ bool WingVariables::CreateBlueprint(WingOut Errors)
// Check for name collisions against existing variables, components, and the like. // Check for name collisions against existing variables, components, and the like.
TSet<FName> Names; TSet<FName> Names;
FBlueprintEditorUtils::GetClassVariableList(Blueprint, Names); FBlueprintEditorUtils::GetClassVariableList(Blueprint.Get(), Names);
if (!WingUtils::FindNoDuplicateNames(Names, BlueprintVariables.Variables, TEXT("variable or component"), Errors)) return false; if (!WingUtils::FindNoDuplicateNames(Names, BlueprintVariables.Variables, TEXT("variable or component"), Errors)) return false;
// Create the variables. // Create the variables.
for (const WingVariables::Var& V : BlueprintVariables.Variables) for (const WingVariables::Var& V : BlueprintVariables.Variables)
{ {
if (!FBlueprintEditorUtils::AddMemberVariable(Blueprint, V.Name, V.Type)) if (!FBlueprintEditorUtils::AddMemberVariable(Blueprint.Get(), V.Name, V.Type))
{ {
Errors.Printf(TEXT("ERROR: Failed to add variable '%s'\n"), Errors.Printf(TEXT("ERROR: Failed to add variable '%s'\n"),
*WingUtils::ExternalizeID(V.Name)); *WingUtils::ExternalizeID(V.Name));
@@ -623,10 +623,10 @@ bool WingVariables::CreateBlueprint(WingOut Errors)
} }
} }
if (LinkBlueprintVariables(Errors)) return false; if (!LinkBlueprintVariables(Errors)) return false;
for (Var &V : BlueprintVariables.Variables) ModifyBlueprintVariableFlags(V); for (Var &V : BlueprintVariables.Variables) ModifyBlueprintVariableFlags(V);
if (!ModifyBlueprintDefaults(Errors)) return false; if (!ModifyBlueprintDefaults(Errors)) return false;
return false; return true;
} }
bool WingVariables::CreateGraph(WingOut Errors) bool WingVariables::CreateGraph(WingOut Errors)
@@ -663,10 +663,10 @@ bool WingVariables::CreateGraph(WingOut Errors)
AddUserPinInfo(V, EGPD_Input, OutputNode); AddUserPinInfo(V, EGPD_Input, OutputNode);
// Create local variables via the proper API. // Create local variables via the proper API.
UBlueprint* BP = FBlueprintEditorUtils::FindBlueprintForGraph(Graph); UBlueprint* BP = FBlueprintEditorUtils::FindBlueprintForGraph(Graph.Get());
for (const Var& V : LocalVariables.Variables) for (const Var& V : LocalVariables.Variables)
{ {
if (!FBlueprintEditorUtils::AddLocalVariable(BP, Graph, V.Name, V.Type, V.DefaultValue)) if (!FBlueprintEditorUtils::AddLocalVariable(BP, Graph.Get(), V.Name, V.Type, V.DefaultValue))
{ {
Errors.Printf(TEXT("ERROR: Failed to create local variable '%s'\n"), Errors.Printf(TEXT("ERROR: Failed to create local variable '%s'\n"),
*WingUtils::ExternalizeID(V.Name)); *WingUtils::ExternalizeID(V.Name));
@@ -692,7 +692,7 @@ bool WingVariables::CreateCustomEvent(WingOut Errors)
Names, InputVariables.Variables, TEXT("event parameter"), Errors)) return false; Names, InputVariables.Variables, TEXT("event parameter"), Errors)) return false;
for (const Var& V : InputVariables.Variables) for (const Var& V : InputVariables.Variables)
AddUserPinInfo(V, EGPD_Output, CustomEvent); AddUserPinInfo(V, EGPD_Output, CustomEvent.Get());
CustomEvent->ReconstructNode(); CustomEvent->ReconstructNode();
return true; return true;
@@ -729,7 +729,7 @@ bool WingVariables::RemoveBlueprint(WingOut Errors)
} }
// Remove them. // Remove them.
FBlueprintEditorUtils::BulkRemoveMemberVariables(Blueprint, Names); FBlueprintEditorUtils::BulkRemoveMemberVariables(Blueprint.Get(), Names);
return true; return true;
} }
@@ -766,12 +766,12 @@ bool WingVariables::RemoveGraph(WingOut Errors)
OutputNode->RemoveUserDefinedPinByName(V.Name); OutputNode->RemoveUserDefinedPinByName(V.Name);
// Remove local variables. // Remove local variables.
UBlueprint* BP = FBlueprintEditorUtils::FindBlueprintForGraph(Graph); UBlueprint* BP = FBlueprintEditorUtils::FindBlueprintForGraph(Graph.Get());
for (const Var& V : LocalVariables.Variables) for (const Var& V : LocalVariables.Variables)
{ {
LocalNode->LocalVariables.RemoveAll( LocalNode->LocalVariables.RemoveAll(
[&](const FBPVariableDescription& Desc) { return Desc.VarName == V.Name; }); [&](const FBPVariableDescription& Desc) { return Desc.VarName == V.Name; });
FBlueprintEditorUtils::RemoveVariableNodes(BP, V.Name, true, Graph); FBlueprintEditorUtils::RemoveVariableNodes(BP, V.Name, true, Graph.Get());
} }
if (InputNode) InputNode->ReconstructNode(); if (InputNode) InputNode->ReconstructNode();
@@ -798,22 +798,22 @@ bool WingVariables::RemoveCustomEvent(WingOut Errors)
bool WingVariables::SetBackingStore(UObject *Obj, WingOut Errors) bool WingVariables::SetBackingStore(UObject *Obj, WingOut Errors)
{ {
Blueprint = nullptr; Blueprint.Reset();
Graph = nullptr; Graph.Reset();
CustomEvent = nullptr; CustomEvent.Reset();
if (UBlueprint *BP = Cast<UBlueprint>(Obj)) if (UBlueprint *BP = Cast<UBlueprint>(Obj))
{ {
Blueprint = BP; Blueprint.Reset(BP);
return true; return true;
} }
if (UEdGraph *G = Cast<UEdGraph>(Obj)) if (UEdGraph *G = Cast<UEdGraph>(Obj))
{ {
Graph = G; Graph.Reset(G);
return true; return true;
} }
if (UK2Node_CustomEvent *E = Cast<UK2Node_CustomEvent>(Obj)) if (UK2Node_CustomEvent *E = Cast<UK2Node_CustomEvent>(Obj))
{ {
CustomEvent = E; CustomEvent.Reset(E);
return true; return true;
} }
Errors.Printf(TEXT( Errors.Printf(TEXT(

6
Plugins/UEWingman/Source/UEWingman/Public/WingBasics.h
View File

@@ -187,7 +187,7 @@ struct FWingStructAndUStruct
// Pin Ref: A pointer to a graph node, plus a pin name. // Pin Ref: A pointer to a graph node, plus a pin name.
UCLASS() UCLASS()
class UWingPinReference : public UObject class UWingGraphPinRef : public UObject
{ {
GENERATED_BODY() GENERATED_BODY()
@@ -202,7 +202,7 @@ public:
// name. The component can be an inherited component, as // name. The component can be an inherited component, as
// opposed to one that is defined in the blueprint itself. // opposed to one that is defined in the blueprint itself.
UCLASS() UCLASS()
class UWingComponentReference : public UObject class UWingComponentRef : public UObject
{ {
GENERATED_BODY() GENERATED_BODY()
public: public:
@@ -218,7 +218,7 @@ public:
// struct is marked CPF_Edit. If not, then the intent is // struct is marked CPF_Edit. If not, then the intent is
// that this struct is for viewing only. // that this struct is for viewing only.
UCLASS() UCLASS()
class UWingStructPointer : public UObject class UWingStructRef : public UObject
{ {
GENERATED_BODY() GENERATED_BODY()
public: public:

14
Plugins/UEWingman/Source/UEWingman/Public/WingComponent.h
View File

@@ -8,22 +8,22 @@ class USCS_Node;
class UActorComponent; class UActorComponent;
class USimpleConstructionScript; class USimpleConstructionScript;
class UClass; class UClass;
class UWingComponentReference; class UWingComponentRef;
class WingOut; class WingOut;
struct UWingComponent struct UWingComponent
{ {
public: public:
static UActorComponent* GetImmutableTemplate(const UWingComponentReference *Ref); static UActorComponent* GetImmutableTemplate(const UWingComponentRef *Ref);
static UActorComponent* GetMutableTemplate(const UWingComponentReference *Ref); static UActorComponent* GetMutableTemplate(const UWingComponentRef *Ref);
static bool ReparentComponent(UWingComponentReference *Ref, UWingComponentReference *Parent, WingOut Errors); static bool ReparentComponent(UWingComponentRef *Ref, UWingComponentRef *Parent, WingOut Errors);
static bool DeleteComponent(UWingComponentReference *Ref, WingOut Errors); static bool DeleteComponent(UWingComponentRef *Ref, WingOut Errors);
static bool AddComponent(UBlueprint *BP, UClass *Class, static bool AddComponent(UBlueprint *BP, UClass *Class,
UWingComponentReference *Parent, FName Name, WingOut Errors); UWingComponentRef *Parent, FName Name, WingOut Errors);
static TArray<TStrongObjectPtr<UWingComponentReference>> GetAll(UBlueprint* BP); static TArray<TStrongObjectPtr<UWingComponentRef>> GetAll(UBlueprint* BP);
static void PrintAll(UBlueprint* BP, WingOut Out); static void PrintAll(UBlueprint* BP, WingOut Out);
static bool CheckValidComponentClass(UClass *Class, WingOut Errors); static bool CheckValidComponentClass(UClass *Class, WingOut Errors);

7
Plugins/UEWingman/Source/UEWingman/Public/WingLogCapture.h
View File

@@ -1,16 +1,13 @@
#pragma once #pragma once
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "Misc/OutputDeviceRedirector.h" #include "Misc/OutputDevice.h"
class FLogCaptureOutputDevice : public FOutputDevice class FLogCaptureOutputDevice : public FOutputDevice
{ {
public: public:
TArray<FString> CapturedErrors; TArray<FString> CapturedErrors;
bool bEnabled = true; bool bEnabled = false;
void Install() { GLog->AddOutputDevice(this); }
void Uninstall() { GLog->RemoveOutputDevice(this); }
// If the device is marked 'CanBeUsedOnMultipleThreads,' // If the device is marked 'CanBeUsedOnMultipleThreads,'
// then UE_LOG will call Serialize from the current // then UE_LOG will call Serialize from the current

2
Plugins/UEWingman/Source/UEWingman/Public/WingServer.h
View File

@@ -18,7 +18,7 @@ class FSocket;
* *
* Clients connect via TCP and exchange null-delimited JSON messages. * Clients connect via TCP and exchange null-delimited JSON messages.
* Request format: {"command": "tool_name", "param1": "value1", ...} * Request format: {"command": "tool_name", "param1": "value1", ...}
* Response format: raw JSON result from the handler. * Response format: Text.
* *
* Each connected client gets its own thread for blocking I/O; * Each connected client gets its own thread for blocking I/O;
* tool calls are dispatched on the game thread. * tool calls are dispatched on the game thread.

6
Plugins/UEWingman/Source/UEWingman/Public/WingUtils.h
View File

@@ -63,8 +63,8 @@ public:
static FName GetFName(const FWingProperty &Prop); static FName GetFName(const FWingProperty &Prop);
static FName GetFName(const FUserPinInfo &Pin) { return Pin.PinName; } static FName GetFName(const FUserPinInfo &Pin) { return Pin.PinName; }
static FName GetFName(const TSharedPtr<FUserPinInfo> &Pin) { return Pin->PinName; } static FName GetFName(const TSharedPtr<FUserPinInfo> &Pin) { return Pin->PinName; }
static FName GetFName(const UWingComponentReference *Ref) { return Ref->VariableName; } static FName GetFName(const UWingComponentRef *Ref) { return Ref->VariableName; }
static FName GetFName(const TStrongObjectPtr<UWingComponentReference> &Ref) { return Ref->VariableName; } static FName GetFName(const TStrongObjectPtr<UWingComponentRef> &Ref) { return Ref->VariableName; }
static FName GetFName(const UWidget *Widget) { return Widget->GetFName(); } static FName GetFName(const UWidget *Widget) { return Widget->GetFName(); }
static FName GetFName(const WingVariables::Var &Var) { return Var.Name; } static FName GetFName(const WingVariables::Var &Var) { return Var.Name; }
@@ -190,7 +190,7 @@ public:
static FString FormatName(const TSharedPtr<IPropertyHandle> &Handle); static FString FormatName(const TSharedPtr<IPropertyHandle> &Handle);
static FString FormatName(const FUserPinInfo &Pin); static FString FormatName(const FUserPinInfo &Pin);
static FString FormatName(const FBPInterfaceDescription &IFace); static FString FormatName(const FBPInterfaceDescription &IFace);
static FString FormatName(const UWingComponentReference *Ref); static FString FormatName(const UWingComponentRef *Ref);
static FString FormatName(const UWidget *Widget); static FString FormatName(const UWidget *Widget);
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////

12
Plugins/UEWingman/Source/UEWingman/Public/WingVariables.h
View File

@@ -2,14 +2,14 @@
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "EdGraph/EdGraphPin.h" #include "EdGraph/EdGraphPin.h"
#include "Engine/Blueprint.h"
#include "K2Node_CustomEvent.h"
#include "UObject/StrongObjectPtr.h"
#include "WingBasics.h" #include "WingBasics.h"
struct FBPVariableDescription; struct FBPVariableDescription;
struct WingTokenizer; struct WingTokenizer;
class UObject; class UObject;
class UBlueprint;
class UEdGraph;
class UK2Node_CustomEvent;
class UK2Node_EditablePinBase; class UK2Node_EditablePinBase;
class UK2Node_FunctionEntry; class UK2Node_FunctionEntry;
struct FUserPinInfo; struct FUserPinInfo;
@@ -92,9 +92,9 @@ public:
// The backing store. Only one of these should be set. // The backing store. Only one of these should be set.
UBlueprint *Blueprint = nullptr; TStrongObjectPtr<UBlueprint> Blueprint;
UEdGraph *Graph = nullptr; TStrongObjectPtr<UEdGraph> Graph;
UK2Node_CustomEvent *CustomEvent = nullptr; TStrongObjectPtr<UK2Node_CustomEvent> CustomEvent;
// The Workspace. At any given time, these may or may not contain // The Workspace. At any given time, these may or may not contain
// the same data as the backing store. // the same data as the backing store.