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

Back in business

Browse Source
This commit is contained in:
jyelon
2026-04-04 02:21:04 -04:00
parent e9fff6599a
commit 7c884e84cb
5 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Plugins/UEWingman/Source/UEWingman/Handlers/GraphNode_Create.h
View File

@@ -23,7 +23,7 @@ struct FSpawnNodeEntry
GENERATED_BODY()
UPROPERTY()
FString ActionName;
FString Type;
UPROPERTY()
int32 PosX = 0;
@@ -70,8 +70,8 @@ public:
for (const TSharedPtr<FJsonValue>& Elt : Nodes.Array)
{
if (!FWingProperty::PopulateFromJson(Props, *Elt, false, WingOut::Stdout)) return;
TArray<FWingGraphAction*> Results = GraphActions.Search(Entry.ActionName, 2, true);
if (!WingUtils::CheckExactlyOneNamed(Results.Num(), TEXT("node type"), Entry.ActionName, WingOut::Stdout)) return;
TArray<FWingGraphAction*> Results = GraphActions.Search(Entry.Type, 2, true);
if (!WingUtils::CheckExactlyOneNamed(Results.Num(), TEXT("node type"), Entry.Type, WingOut::Stdout)) return;
Entry.Action = Results[0];
Entries.Add(Entry);
}
@@ -82,11 +82,11 @@ public:
UEdGraphNode* NewNode = Entry.Action->Execute(FVector2D(Entry.PosX, Entry.PosY));
if (NewNode)
{
WingOut::Stdout.Printf(TEXT("Spawned: %s %s\n"), *Entry.ActionName, *WingUtils::FormatName(NewNode));
WingOut::Stdout.Printf(TEXT("Spawned: %s %s\n"), *Entry.Type, *WingUtils::FormatName(NewNode));
}
else
{
WingOut::Stdout.Printf(TEXT("FAILED: %s\n"), *Entry.ActionName);
WingOut::Stdout.Printf(TEXT("FAILED: %s\n"), *Entry.Type);
continue;
}
}

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

@@ -347,11 +347,10 @@ FString FWingProperty::GetCategory() const
void FWingProperty::GetAll(FWingStructAndUStruct Obj, EPropertyFlags Flags, TArray<FWingProperty> &Props)
{
TArray<FWingProperty> Result;
for (TFieldIterator<FProperty> It(Obj.UStructPtr); It; ++It)
{
if (Flags != 0 && !It->HasAnyPropertyFlags(Flags)) continue;
Result.Add(FWingProperty(*It, Obj.StructPtr));
Props.Add(FWingProperty(*It, Obj.StructPtr));
}
}
@@ -444,24 +443,16 @@ TArray<FWingProperty> FWingProperty::GetDetails(UObject* Obj, EPropertyFlags Fla
}
bool FWingProperty::PopulateFromJson(TArray<FWingProperty>& Props, const FJsonValue& Json, bool AllOptional, WingOut Errors)
bool FWingProperty::PopulateFromJson(TArray<FWingProperty>& Props, const FJsonObject& Json, bool AllOptional, WingOut Errors)
{
bool Ok = true;
// Make sure they passed in a JSON object.
TSharedPtr<FJsonObject> Obj = Json.AsObject();
if (Obj == nullptr)
{
Errors.Printf(TEXT("property data should be stored in a json object\n"));
return false;
}
// Build a set of known property names for the unknown-field check.
TSet<FName> KnownKeys;
for (const FWingProperty& P : Props) KnownKeys.Add(P->GetFName());
// Check for unknown fields in the JSON
for (const auto& KV : Obj->Values)
for (const auto& KV : Json.Values)
{
FName Name = WingUtils::CheckInternalizeID(KV.Key, Errors);
if (!KnownKeys.Contains(Name))
@@ -475,7 +466,7 @@ bool FWingProperty::PopulateFromJson(TArray<FWingProperty>& Props, const FJsonVa
for (FWingProperty& P : Props)
{
FString JsonKey = WingUtils::FormatName(P.Prop);
TSharedPtr<FJsonValue> Value = Obj->TryGetField(JsonKey);
TSharedPtr<FJsonValue> Value = Json.TryGetField(JsonKey);
if (!Value)
{
bool Optional = AllOptional || P.Prop->HasMetaData(TEXT("Optional"));
@@ -491,6 +482,18 @@ bool FWingProperty::PopulateFromJson(TArray<FWingProperty>& Props, const FJsonVa
return Ok;
}
bool FWingProperty::PopulateFromJson(TArray<FWingProperty>& Props, const FJsonValue& Json, bool AllOptional, WingOut Errors)
{
// Make sure they passed in a JSON object.
TSharedPtr<FJsonObject> Obj = Json.AsObject();
if (Obj == nullptr)
{
Errors.Printf(TEXT("property data should be stored in a json object\n"));
return false;
}
return PopulateFromJson(Props, *Obj, AllOptional, Errors);
}
bool FWingProperty::IsPinTypeProperty(FProperty* Prop)
{

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

@@ -1,6 +1,6 @@
#include "WingServer.h"
#include "WingHandler.h"
#include "WingPropHandle.h"
#include "WingProperty.h"
#include "WingManual.h"
#include "WingLogCapture.h"
#include "WingUtils.h"
@@ -328,9 +328,8 @@ void UWingServer::TryCallHandler(const FString &Line)
Handler->ConfigurationObject = Found->Config.Get();
// Populate the handler object with the request parameters.
WingPropHandle Props;
WingPropHandle::Handles Handles = Props.AllProperties(HandlerObj.Get(), true);
if (!WingPropHandle::PopulateFromJson(Handles, *Request, false, WingOut::Stdout))
TArray<FWingProperty> Props = FWingProperty::GetAll(Handler, CPF_Edit);
if (!FWingProperty::PopulateFromJson(Props, *Request, false, WingOut::Stdout))
{
UWingServer::SuggestManual(WingManual::Section::HandlerHelp);
return;

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

@@ -103,6 +103,8 @@ struct FWingProperty
// Functions to populate properties from a JSON object.
//
static bool PopulateFromJson(TArray<FWingProperty>& Props, const FJsonObject& Json,
bool AllOptional, WingOut Errors);
static bool PopulateFromJson(TArray<FWingProperty>& Props, const FJsonValue& Json,
bool AllOptional, WingOut Errors);