Renaming to Wing, part 2.
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
#include "WingFetcher.h"
|
||||
#include "WingJson.h"
|
||||
#include "WingProperty.h"
|
||||
#include "BPVarEditor.h"
|
||||
#include "WingBlueprintVar.h"
|
||||
#include "WingUtils.h"
|
||||
#include "WingTypes.h"
|
||||
#include "Engine/Blueprint.h"
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
}
|
||||
|
||||
// Find the newly created variable description
|
||||
FBPVarEditor Editor(BP, Name);
|
||||
FBlueprintVar Editor(BP, Name);
|
||||
if (Editor.NotFound()) return;
|
||||
|
||||
// Apply config if provided
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingHandler.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "WingUtils.h"
|
||||
#include "BPVarEditor.h"
|
||||
#include "WingBlueprintVar.h"
|
||||
#include "Engine/Blueprint.h"
|
||||
#include "Kismet2/BlueprintEditorUtils.h"
|
||||
#include "BlueprintVariable_Delete.generated.h"
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
|
||||
if (!BP) return;
|
||||
|
||||
FBPVarEditor Editor(BP, Variable);
|
||||
FBlueprintVar Editor(BP, Variable);
|
||||
if (Editor.NotFound()) return;
|
||||
|
||||
FBlueprintEditorUtils::RemoveMemberVariable(BP, Editor.Desc->VarName);
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingHandler.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "WingUtils.h"
|
||||
#include "BPVarEditor.h"
|
||||
#include "WingBlueprintVar.h"
|
||||
#include "Engine/Blueprint.h"
|
||||
#include "Kismet2/BlueprintEditorUtils.h"
|
||||
#include "BlueprintVariable_Dump.generated.h"
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
|
||||
if (!BP) return;
|
||||
|
||||
FBPVarEditor Editor(BP, Variable);
|
||||
FBlueprintVar Editor(BP, Variable);
|
||||
if (Editor.NotFound()) return;
|
||||
|
||||
UWingServer::Printf(TEXT("Variable %s in %s:\n"), *Variable, *WingUtils::FormatName(BP));
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "WingFetcher.h"
|
||||
#include "WingJson.h"
|
||||
#include "WingProperty.h"
|
||||
#include "BPVarEditor.h"
|
||||
#include "WingBlueprintVar.h"
|
||||
#include "WingUtils.h"
|
||||
#include "WingTypes.h"
|
||||
#include "Engine/Blueprint.h"
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
|
||||
if (!BP) return;
|
||||
|
||||
FBPVarEditor Editor(BP, Variable);
|
||||
FBlueprintVar Editor(BP, Variable);
|
||||
if (Editor.NotFound()) return;
|
||||
|
||||
if (!Properties.Json || Properties.Json->Values.Num() == 0)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "WingHandler.h"
|
||||
#include "WingServer.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "GraphExport.h"
|
||||
#include "WingGraphExport.h"
|
||||
#include "GraphNode_Dump.generated.h"
|
||||
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingServer.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "WingUtils.h"
|
||||
#include "FunctionArgs.h"
|
||||
#include "WingFunctionArgs.h"
|
||||
#include "GraphNode_SetArgs.generated.h"
|
||||
|
||||
UCLASS()
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingServer.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "WingUtils.h"
|
||||
#include "GraphExport.h"
|
||||
#include "WingGraphExport.h"
|
||||
#include "Engine/Blueprint.h"
|
||||
#include "EdGraph/EdGraph.h"
|
||||
#include "Materials/Material.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingHandler.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "WingUtils.h"
|
||||
#include "MaterialParameter.h"
|
||||
#include "WingMaterialParameter.h"
|
||||
#include "Materials/MaterialInstanceConstant.h"
|
||||
#include "MaterialTypes.h"
|
||||
#include "MaterialInstance_ClearParameter.generated.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingHandler.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "WingUtils.h"
|
||||
#include "MaterialParameter.h"
|
||||
#include "WingMaterialParameter.h"
|
||||
#include "Materials/MaterialInstanceConstant.h"
|
||||
#include "MaterialTypes.h"
|
||||
#include "MaterialInstance_DumpParameters.generated.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingHandler.h"
|
||||
#include "WingFetcher.h"
|
||||
#include "WingUtils.h"
|
||||
#include "MaterialParameter.h"
|
||||
#include "WingMaterialParameter.h"
|
||||
#include "Materials/MaterialInstanceConstant.h"
|
||||
#include "MaterialTypes.h"
|
||||
#include "Misc/DefaultValueHelper.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "WingFetcher.h"
|
||||
#include "WingServer.h"
|
||||
#include "WingUtils.h"
|
||||
#include "MaterialParameter.h"
|
||||
#include "WingMaterialParameter.h"
|
||||
#include "MaterialTypes.h"
|
||||
#include "Material_DumpParameters.generated.h"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "BPVarEditor.h"
|
||||
#include "WingBlueprintVar.h"
|
||||
#include "WingJson.h"
|
||||
#include "WingServer.h"
|
||||
#include "WingTypes.h"
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "EdGraphSchema_K2.h"
|
||||
#include "Kismet2/BlueprintEditorUtils.h"
|
||||
|
||||
FBPVarEditor::FBPVarEditor(UBlueprint* BP, const FString& VarName)
|
||||
FBlueprintVar::FBlueprintVar(UBlueprint* BP, const FString& VarName)
|
||||
{
|
||||
FName VarFName(*VarName);
|
||||
int32 VarIndex = FBlueprintEditorUtils::FindNewVariableIndex(BP, VarFName);
|
||||
@@ -27,7 +27,7 @@ FBPVarEditor::FBPVarEditor(UBlueprint* BP, const FString& VarName)
|
||||
}
|
||||
}
|
||||
|
||||
void FBPVarEditor::Dump()
|
||||
void FBlueprintVar::Dump()
|
||||
{
|
||||
LoadFlags();
|
||||
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 bHasType = Json->HasField(TEXT("VarType"));
|
||||
@@ -66,7 +66,7 @@ bool FBPVarEditor::ApplyJson(const FJsonObject* Json)
|
||||
return true;
|
||||
}
|
||||
|
||||
void FBPVarEditor::LoadFlags()
|
||||
void FBlueprintVar::LoadFlags()
|
||||
{
|
||||
InstanceEditable = !(Desc->PropertyFlags & CPF_DisableEditOnInstance);
|
||||
BlueprintReadOnly = (Desc->PropertyFlags & CPF_BlueprintReadOnly) != 0;
|
||||
@@ -80,7 +80,7 @@ void FBPVarEditor::LoadFlags()
|
||||
Description.Empty();
|
||||
}
|
||||
|
||||
void FBPVarEditor::LoadDefault()
|
||||
void FBlueprintVar::LoadDefault()
|
||||
{
|
||||
if (DefaultValueProp)
|
||||
DefaultValue = DefaultValueProp.GetText();
|
||||
@@ -88,7 +88,7 @@ void FBPVarEditor::LoadDefault()
|
||||
DefaultValue.Empty();
|
||||
}
|
||||
|
||||
void FBPVarEditor::SaveFlags()
|
||||
void FBlueprintVar::SaveFlags()
|
||||
{
|
||||
// CPF flags
|
||||
if (InstanceEditable)
|
||||
@@ -124,14 +124,14 @@ void FBPVarEditor::SaveFlags()
|
||||
Desc->RemoveMetaData(TEXT("tooltip"));
|
||||
}
|
||||
|
||||
bool FBPVarEditor::SaveDefault()
|
||||
bool FBlueprintVar::SaveDefault()
|
||||
{
|
||||
if (DefaultValueProp)
|
||||
return DefaultValueProp.SetText(DefaultValue);
|
||||
return true;
|
||||
}
|
||||
|
||||
TArray<WingProperty> FBPVarEditor::MergedProperties()
|
||||
TArray<WingProperty> FBlueprintVar::MergedProperties()
|
||||
{
|
||||
TArray<WingProperty> Props = WingProperty::GetAll(
|
||||
FBPVariableDescription::StaticStruct(), Desc, CPF_Edit);
|
||||
@@ -143,7 +143,7 @@ TArray<WingProperty> FBPVarEditor::MergedProperties()
|
||||
WingProperty::Remove(Props, TEXT("DefaultValue"));
|
||||
|
||||
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.
|
||||
if (!DefaultValueProp)
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "WingmanCommandlet.h"
|
||||
#include "WingCommandlet.h"
|
||||
#include "WingServer.h"
|
||||
#include "Containers/Ticker.h"
|
||||
|
||||
UWingmanCommandlet::UWingmanCommandlet()
|
||||
UWingCommandlet::UWingCommandlet()
|
||||
{
|
||||
IsClient = false;
|
||||
IsEditor = true;
|
||||
@@ -10,7 +10,7 @@ UWingmanCommandlet::UWingmanCommandlet()
|
||||
LogToConsole = true;
|
||||
}
|
||||
|
||||
int32 UWingmanCommandlet::Main(const FString& Params)
|
||||
int32 UWingCommandlet::Main(const FString& Params)
|
||||
{
|
||||
// The UWingServer editor subsystem starts the server automatically.
|
||||
// We just need to tick it, since FTickableEditorObject doesn't tick in commandlet mode.
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "FunctionArgs.h"
|
||||
#include "WingFunctionArgs.h"
|
||||
#include "K2Node_EditablePinBase.h"
|
||||
#include "K2Node_FunctionResult.h"
|
||||
#include "K2Node_Tunnel.h"
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "GraphExport.h"
|
||||
#include "WingGraphExport.h"
|
||||
#include "WingTypes.h"
|
||||
#include "WingUtils.h"
|
||||
#include "Engine/Blueprint.h"
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "K2Node_VariableGet.h"
|
||||
#include "K2Node_CallFunction.h"
|
||||
#include "K2Node_FunctionEntry.h"
|
||||
#include "FunctionArgs.h"
|
||||
#include "WingFunctionArgs.h"
|
||||
#include "MaterialGraph/MaterialGraphNode.h"
|
||||
|
||||
WingGraphExport::WingGraphExport(UEdGraph* InGraph)
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "MaterialParameter.h"
|
||||
#include "WingMaterialParameter.h"
|
||||
#include "WingUtils.h"
|
||||
#include "WingServer.h"
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
#include "WingModule.h"
|
||||
#include "Modules/ModuleManager.h"
|
||||
|
||||
IMPLEMENT_MODULE(FWingModule, BlueprintMCP);
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "CoreMinimal.h"
|
||||
#include "Modules/ModuleInterface.h"
|
||||
|
||||
class FWingmanModule : public IModuleInterface
|
||||
class FWingModule : public IModuleInterface
|
||||
{
|
||||
public:
|
||||
virtual void StartupModule() override {}
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "WingServer.h"
|
||||
#include "WingHandler.h"
|
||||
#include "WingJson.h"
|
||||
#include "LogCapture.h"
|
||||
#include "WingLogCapture.h"
|
||||
#include "WingUtils.h"
|
||||
#include "UObject/StrongObjectPtr.h"
|
||||
#include "Materials/MaterialExpression.h"
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
#include "WingmanModule.h"
|
||||
#include "Modules/ModuleManager.h"
|
||||
|
||||
IMPLEMENT_MODULE(FWingmanModule, BlueprintMCP);
|
||||
@@ -3,22 +3,22 @@
|
||||
#include "CoreMinimal.h"
|
||||
#include "WingProperty.h"
|
||||
#include "Engine/Blueprint.h"
|
||||
#include "BPVarEditor.generated.h"
|
||||
#include "WingBlueprintVar.generated.h"
|
||||
|
||||
// Editor-friendly view of a blueprint variable's properties.
|
||||
// Wraps an FBPVariableDescription, exposing commonly-used flags
|
||||
// and metadata as simple UPROPERTYs that the property system can
|
||||
// populate from JSON.
|
||||
USTRUCT()
|
||||
struct FBPVarEditor
|
||||
struct FBlueprintVar
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
FBPVariableDescription* Desc = nullptr;
|
||||
WingProperty DefaultValueProp;
|
||||
|
||||
FBPVarEditor() = default;
|
||||
FBPVarEditor(UBlueprint* BP, const FString& VarName);
|
||||
FBlueprintVar() = default;
|
||||
FBlueprintVar(UBlueprint* BP, const FString& VarName);
|
||||
|
||||
bool NotFound() const { return Desc == nullptr; }
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "CoreMinimal.h"
|
||||
#include "Commandlets/Commandlet.h"
|
||||
#include "WingmanCommandlet.generated.h"
|
||||
#include "WingCommandlet.generated.h"
|
||||
|
||||
/**
|
||||
* Commandlet that keeps the engine alive so the BlueprintMCP editor subsystem
|
||||
@@ -11,11 +11,11 @@
|
||||
* Usage: UnrealEditor-Cmd.exe Project.uproject -run=BlueprintMCP
|
||||
*/
|
||||
UCLASS()
|
||||
class UWingmanCommandlet : public UCommandlet
|
||||
class UWingCommandlet : public UCommandlet
|
||||
{
|
||||
GENERATED_BODY()
|
||||
|
||||
public:
|
||||
UWingmanCommandlet();
|
||||
UWingCommandlet();
|
||||
virtual int32 Main(const FString& Params) override;
|
||||
};
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "Dom/JsonObject.h"
|
||||
#include "WingUtils.h"
|
||||
#include "WingNotifier.h"
|
||||
#include "LogCapture.h"
|
||||
#include "WingLogCapture.h"
|
||||
#include "WingServer.generated.h"
|
||||
|
||||
class FSocket;
|
||||
|
||||
Reference in New Issue
Block a user