Renaming to Wing, part 2.

This commit is contained in:
2026-03-18 10:25:21 -04:00
parent d910f9f14a
commit c55c5d8953
27 changed files with 46 additions and 46 deletions

View File

@@ -6,7 +6,7 @@
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingJson.h" #include "WingJson.h"
#include "WingProperty.h" #include "WingProperty.h"
#include "BPVarEditor.h" #include "WingBlueprintVar.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "WingTypes.h" #include "WingTypes.h"
#include "Engine/Blueprint.h" #include "Engine/Blueprint.h"
@@ -63,7 +63,7 @@ public:
} }
// Find the newly created variable description // Find the newly created variable description
FBPVarEditor Editor(BP, Name); FBlueprintVar Editor(BP, Name);
if (Editor.NotFound()) return; if (Editor.NotFound()) return;
// Apply config if provided // Apply config if provided

View File

@@ -5,7 +5,7 @@
#include "WingHandler.h" #include "WingHandler.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "BPVarEditor.h" #include "WingBlueprintVar.h"
#include "Engine/Blueprint.h" #include "Engine/Blueprint.h"
#include "Kismet2/BlueprintEditorUtils.h" #include "Kismet2/BlueprintEditorUtils.h"
#include "BlueprintVariable_Delete.generated.h" #include "BlueprintVariable_Delete.generated.h"
@@ -38,7 +38,7 @@ public:
UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>(); UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
if (!BP) return; if (!BP) return;
FBPVarEditor Editor(BP, Variable); FBlueprintVar Editor(BP, Variable);
if (Editor.NotFound()) return; if (Editor.NotFound()) return;
FBlueprintEditorUtils::RemoveMemberVariable(BP, Editor.Desc->VarName); FBlueprintEditorUtils::RemoveMemberVariable(BP, Editor.Desc->VarName);

View File

@@ -5,7 +5,7 @@
#include "WingHandler.h" #include "WingHandler.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "BPVarEditor.h" #include "WingBlueprintVar.h"
#include "Engine/Blueprint.h" #include "Engine/Blueprint.h"
#include "Kismet2/BlueprintEditorUtils.h" #include "Kismet2/BlueprintEditorUtils.h"
#include "BlueprintVariable_Dump.generated.h" #include "BlueprintVariable_Dump.generated.h"
@@ -38,7 +38,7 @@ public:
UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>(); UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
if (!BP) return; if (!BP) return;
FBPVarEditor Editor(BP, Variable); FBlueprintVar Editor(BP, Variable);
if (Editor.NotFound()) return; if (Editor.NotFound()) return;
UWingServer::Printf(TEXT("Variable %s in %s:\n"), *Variable, *WingUtils::FormatName(BP)); UWingServer::Printf(TEXT("Variable %s in %s:\n"), *Variable, *WingUtils::FormatName(BP));

View File

@@ -6,7 +6,7 @@
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingJson.h" #include "WingJson.h"
#include "WingProperty.h" #include "WingProperty.h"
#include "BPVarEditor.h" #include "WingBlueprintVar.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "WingTypes.h" #include "WingTypes.h"
#include "Engine/Blueprint.h" #include "Engine/Blueprint.h"
@@ -44,7 +44,7 @@ public:
UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>(); UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
if (!BP) return; if (!BP) return;
FBPVarEditor Editor(BP, Variable); FBlueprintVar Editor(BP, Variable);
if (Editor.NotFound()) return; if (Editor.NotFound()) return;
if (!Properties.Json || Properties.Json->Values.Num() == 0) if (!Properties.Json || Properties.Json->Values.Num() == 0)

View File

@@ -4,7 +4,7 @@
#include "WingHandler.h" #include "WingHandler.h"
#include "WingServer.h" #include "WingServer.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "GraphExport.h" #include "WingGraphExport.h"
#include "GraphNode_Dump.generated.h" #include "GraphNode_Dump.generated.h"

View File

@@ -5,7 +5,7 @@
#include "WingServer.h" #include "WingServer.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "FunctionArgs.h" #include "WingFunctionArgs.h"
#include "GraphNode_SetArgs.generated.h" #include "GraphNode_SetArgs.generated.h"
UCLASS() UCLASS()

View File

@@ -5,7 +5,7 @@
#include "WingServer.h" #include "WingServer.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "GraphExport.h" #include "WingGraphExport.h"
#include "Engine/Blueprint.h" #include "Engine/Blueprint.h"
#include "EdGraph/EdGraph.h" #include "EdGraph/EdGraph.h"
#include "Materials/Material.h" #include "Materials/Material.h"

View File

@@ -5,7 +5,7 @@
#include "WingHandler.h" #include "WingHandler.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "MaterialParameter.h" #include "WingMaterialParameter.h"
#include "Materials/MaterialInstanceConstant.h" #include "Materials/MaterialInstanceConstant.h"
#include "MaterialTypes.h" #include "MaterialTypes.h"
#include "MaterialInstance_ClearParameter.generated.h" #include "MaterialInstance_ClearParameter.generated.h"

View File

@@ -5,7 +5,7 @@
#include "WingHandler.h" #include "WingHandler.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "MaterialParameter.h" #include "WingMaterialParameter.h"
#include "Materials/MaterialInstanceConstant.h" #include "Materials/MaterialInstanceConstant.h"
#include "MaterialTypes.h" #include "MaterialTypes.h"
#include "MaterialInstance_DumpParameters.generated.h" #include "MaterialInstance_DumpParameters.generated.h"

View File

@@ -5,7 +5,7 @@
#include "WingHandler.h" #include "WingHandler.h"
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "MaterialParameter.h" #include "WingMaterialParameter.h"
#include "Materials/MaterialInstanceConstant.h" #include "Materials/MaterialInstanceConstant.h"
#include "MaterialTypes.h" #include "MaterialTypes.h"
#include "Misc/DefaultValueHelper.h" #include "Misc/DefaultValueHelper.h"

View File

@@ -5,7 +5,7 @@
#include "WingFetcher.h" #include "WingFetcher.h"
#include "WingServer.h" #include "WingServer.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "MaterialParameter.h" #include "WingMaterialParameter.h"
#include "MaterialTypes.h" #include "MaterialTypes.h"
#include "Material_DumpParameters.generated.h" #include "Material_DumpParameters.generated.h"

View File

@@ -1,4 +1,4 @@
#include "BPVarEditor.h" #include "WingBlueprintVar.h"
#include "WingJson.h" #include "WingJson.h"
#include "WingServer.h" #include "WingServer.h"
#include "WingTypes.h" #include "WingTypes.h"
@@ -6,7 +6,7 @@
#include "EdGraphSchema_K2.h" #include "EdGraphSchema_K2.h"
#include "Kismet2/BlueprintEditorUtils.h" #include "Kismet2/BlueprintEditorUtils.h"
FBPVarEditor::FBPVarEditor(UBlueprint* BP, const FString& VarName) FBlueprintVar::FBlueprintVar(UBlueprint* BP, const FString& VarName)
{ {
FName VarFName(*VarName); FName VarFName(*VarName);
int32 VarIndex = FBlueprintEditorUtils::FindNewVariableIndex(BP, VarFName); int32 VarIndex = FBlueprintEditorUtils::FindNewVariableIndex(BP, VarFName);
@@ -27,7 +27,7 @@ FBPVarEditor::FBPVarEditor(UBlueprint* BP, const FString& VarName)
} }
} }
void FBPVarEditor::Dump() void FBlueprintVar::Dump()
{ {
LoadFlags(); LoadFlags();
LoadDefault(); LoadDefault();
@@ -41,7 +41,7 @@ void FBPVarEditor::Dump()
} }
} }
bool FBPVarEditor::ApplyJson(const FJsonObject* Json) bool FBlueprintVar::ApplyJson(const FJsonObject* Json)
{ {
bool bHasDefault = Json->HasField(TEXT("DefaultValue")); bool bHasDefault = Json->HasField(TEXT("DefaultValue"));
bool bHasType = Json->HasField(TEXT("VarType")); bool bHasType = Json->HasField(TEXT("VarType"));
@@ -66,7 +66,7 @@ bool FBPVarEditor::ApplyJson(const FJsonObject* Json)
return true; return true;
} }
void FBPVarEditor::LoadFlags() void FBlueprintVar::LoadFlags()
{ {
InstanceEditable = !(Desc->PropertyFlags & CPF_DisableEditOnInstance); InstanceEditable = !(Desc->PropertyFlags & CPF_DisableEditOnInstance);
BlueprintReadOnly = (Desc->PropertyFlags & CPF_BlueprintReadOnly) != 0; BlueprintReadOnly = (Desc->PropertyFlags & CPF_BlueprintReadOnly) != 0;
@@ -80,7 +80,7 @@ void FBPVarEditor::LoadFlags()
Description.Empty(); Description.Empty();
} }
void FBPVarEditor::LoadDefault() void FBlueprintVar::LoadDefault()
{ {
if (DefaultValueProp) if (DefaultValueProp)
DefaultValue = DefaultValueProp.GetText(); DefaultValue = DefaultValueProp.GetText();
@@ -88,7 +88,7 @@ void FBPVarEditor::LoadDefault()
DefaultValue.Empty(); DefaultValue.Empty();
} }
void FBPVarEditor::SaveFlags() void FBlueprintVar::SaveFlags()
{ {
// CPF flags // CPF flags
if (InstanceEditable) if (InstanceEditable)
@@ -124,14 +124,14 @@ void FBPVarEditor::SaveFlags()
Desc->RemoveMetaData(TEXT("tooltip")); Desc->RemoveMetaData(TEXT("tooltip"));
} }
bool FBPVarEditor::SaveDefault() bool FBlueprintVar::SaveDefault()
{ {
if (DefaultValueProp) if (DefaultValueProp)
return DefaultValueProp.SetText(DefaultValue); return DefaultValueProp.SetText(DefaultValue);
return true; return true;
} }
TArray<WingProperty> FBPVarEditor::MergedProperties() TArray<WingProperty> FBlueprintVar::MergedProperties()
{ {
TArray<WingProperty> Props = WingProperty::GetAll( TArray<WingProperty> Props = WingProperty::GetAll(
FBPVariableDescription::StaticStruct(), Desc, CPF_Edit); FBPVariableDescription::StaticStruct(), Desc, CPF_Edit);
@@ -143,7 +143,7 @@ TArray<WingProperty> FBPVarEditor::MergedProperties()
WingProperty::Remove(Props, TEXT("DefaultValue")); WingProperty::Remove(Props, TEXT("DefaultValue"));
Props.Append(WingProperty::GetAll( Props.Append(WingProperty::GetAll(
FBPVarEditor::StaticStruct(), this, (EPropertyFlags)0)); FBlueprintVar::StaticStruct(), this, (EPropertyFlags)0));
// Remove DefaultValue if we don't have a CDO property to back it. // Remove DefaultValue if we don't have a CDO property to back it.
if (!DefaultValueProp) if (!DefaultValueProp)

View File

@@ -1,8 +1,8 @@
#include "WingmanCommandlet.h" #include "WingCommandlet.h"
#include "WingServer.h" #include "WingServer.h"
#include "Containers/Ticker.h" #include "Containers/Ticker.h"
UWingmanCommandlet::UWingmanCommandlet() UWingCommandlet::UWingCommandlet()
{ {
IsClient = false; IsClient = false;
IsEditor = true; IsEditor = true;
@@ -10,7 +10,7 @@ UWingmanCommandlet::UWingmanCommandlet()
LogToConsole = true; LogToConsole = true;
} }
int32 UWingmanCommandlet::Main(const FString& Params) int32 UWingCommandlet::Main(const FString& Params)
{ {
// The UWingServer editor subsystem starts the server automatically. // The UWingServer editor subsystem starts the server automatically.
// We just need to tick it, since FTickableEditorObject doesn't tick in commandlet mode. // We just need to tick it, since FTickableEditorObject doesn't tick in commandlet mode.

View File

@@ -1,4 +1,4 @@
#include "FunctionArgs.h" #include "WingFunctionArgs.h"
#include "K2Node_EditablePinBase.h" #include "K2Node_EditablePinBase.h"
#include "K2Node_FunctionResult.h" #include "K2Node_FunctionResult.h"
#include "K2Node_Tunnel.h" #include "K2Node_Tunnel.h"

View File

@@ -1,4 +1,4 @@
#include "GraphExport.h" #include "WingGraphExport.h"
#include "WingTypes.h" #include "WingTypes.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "Engine/Blueprint.h" #include "Engine/Blueprint.h"
@@ -11,7 +11,7 @@
#include "K2Node_VariableGet.h" #include "K2Node_VariableGet.h"
#include "K2Node_CallFunction.h" #include "K2Node_CallFunction.h"
#include "K2Node_FunctionEntry.h" #include "K2Node_FunctionEntry.h"
#include "FunctionArgs.h" #include "WingFunctionArgs.h"
#include "MaterialGraph/MaterialGraphNode.h" #include "MaterialGraph/MaterialGraphNode.h"
WingGraphExport::WingGraphExport(UEdGraph* InGraph) WingGraphExport::WingGraphExport(UEdGraph* InGraph)

View File

@@ -1,4 +1,4 @@
#include "MaterialParameter.h" #include "WingMaterialParameter.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "WingServer.h" #include "WingServer.h"

View File

@@ -0,0 +1,4 @@
#include "WingModule.h"
#include "Modules/ModuleManager.h"
IMPLEMENT_MODULE(FWingModule, BlueprintMCP);

View File

@@ -3,7 +3,7 @@
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "Modules/ModuleInterface.h" #include "Modules/ModuleInterface.h"
class FWingmanModule : public IModuleInterface class FWingModule : public IModuleInterface
{ {
public: public:
virtual void StartupModule() override {} virtual void StartupModule() override {}

View File

@@ -1,7 +1,7 @@
#include "WingServer.h" #include "WingServer.h"
#include "WingHandler.h" #include "WingHandler.h"
#include "WingJson.h" #include "WingJson.h"
#include "LogCapture.h" #include "WingLogCapture.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "UObject/StrongObjectPtr.h" #include "UObject/StrongObjectPtr.h"
#include "Materials/MaterialExpression.h" #include "Materials/MaterialExpression.h"

View File

@@ -1,4 +0,0 @@
#include "WingmanModule.h"
#include "Modules/ModuleManager.h"
IMPLEMENT_MODULE(FWingmanModule, BlueprintMCP);

View File

@@ -3,22 +3,22 @@
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "WingProperty.h" #include "WingProperty.h"
#include "Engine/Blueprint.h" #include "Engine/Blueprint.h"
#include "BPVarEditor.generated.h" #include "WingBlueprintVar.generated.h"
// Editor-friendly view of a blueprint variable's properties. // Editor-friendly view of a blueprint variable's properties.
// Wraps an FBPVariableDescription, exposing commonly-used flags // Wraps an FBPVariableDescription, exposing commonly-used flags
// and metadata as simple UPROPERTYs that the property system can // and metadata as simple UPROPERTYs that the property system can
// populate from JSON. // populate from JSON.
USTRUCT() USTRUCT()
struct FBPVarEditor struct FBlueprintVar
{ {
GENERATED_BODY() GENERATED_BODY()
FBPVariableDescription* Desc = nullptr; FBPVariableDescription* Desc = nullptr;
WingProperty DefaultValueProp; WingProperty DefaultValueProp;
FBPVarEditor() = default; FBlueprintVar() = default;
FBPVarEditor(UBlueprint* BP, const FString& VarName); FBlueprintVar(UBlueprint* BP, const FString& VarName);
bool NotFound() const { return Desc == nullptr; } bool NotFound() const { return Desc == nullptr; }

View File

@@ -2,7 +2,7 @@
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "Commandlets/Commandlet.h" #include "Commandlets/Commandlet.h"
#include "WingmanCommandlet.generated.h" #include "WingCommandlet.generated.h"
/** /**
* Commandlet that keeps the engine alive so the BlueprintMCP editor subsystem * Commandlet that keeps the engine alive so the BlueprintMCP editor subsystem
@@ -11,11 +11,11 @@
* Usage: UnrealEditor-Cmd.exe Project.uproject -run=BlueprintMCP * Usage: UnrealEditor-Cmd.exe Project.uproject -run=BlueprintMCP
*/ */
UCLASS() UCLASS()
class UWingmanCommandlet : public UCommandlet class UWingCommandlet : public UCommandlet
{ {
GENERATED_BODY() GENERATED_BODY()
public: public:
UWingmanCommandlet(); UWingCommandlet();
virtual int32 Main(const FString& Params) override; virtual int32 Main(const FString& Params) override;
}; };

View File

@@ -8,7 +8,7 @@
#include "Dom/JsonObject.h" #include "Dom/JsonObject.h"
#include "WingUtils.h" #include "WingUtils.h"
#include "WingNotifier.h" #include "WingNotifier.h"
#include "LogCapture.h" #include "WingLogCapture.h"
#include "WingServer.generated.h" #include "WingServer.generated.h"
class FSocket; class FSocket;