Finish v1.1-r29.2

ufna · Apr 8, 2020 · f90debf · f90debf
2 parents 3ac2d5b + ad7c6fa
commit f90debf
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/Source/VaRest/Private/VaRestSubsystem.cpp b/Source/VaRest/Private/VaRestSubsystem.cpp
@@ -9,6 +9,7 @@
 #include "Developer/Settings/Public/ISettingsModule.h"
 #include "Misc/FileHelper.h"
 #include "Misc/Paths.h"
+#include "Subsystems/SubsystemBlueprintLibrary.h"
 
 UVaRestSubsystem::UVaRestSubsystem()
 	: UEngineSubsystem()
@@ -30,9 +31,6 @@ void UVaRestSubsystem::Deinitialize()
 
 void UVaRestSubsystem::CallURL(const FString& URL, EVaRestRequestVerb Verb, EVaRestRequestContentType ContentType, UVaRestJsonObject* VaRestJson, const FVaRestCallDelegate& Callback)
 {
-	UWorld* World = GetWorld();
-	check(World);
-
 	// Check we have valid data json
 	if (VaRestJson == nullptr)
 	{
@@ -94,6 +92,12 @@ UVaRestJsonObject* UVaRestSubsystem::ConstructVaRestJsonObject()
 	return NewObject<UVaRestJsonObject>(this);
 }
 
+UVaRestJsonObject* UVaRestSubsystem::StaticConstructVaRestJsonObject()
+{
+	auto SelfSystem = CastChecked<UVaRestSubsystem>(USubsystemBlueprintLibrary::GetEngineSubsystem(UVaRestSubsystem::StaticClass()), ECastCheckedType::NullChecked);
+	return SelfSystem->ConstructVaRestJsonObject();
+}
+
 UVaRestJsonValue* UVaRestSubsystem::ConstructJsonValueNumber(float Number)
 {
 	TSharedPtr<FJsonValue> NewVal = MakeShareable(new FJsonValueNumber(Number));

diff --git a/Source/VaRest/Public/VaRestSubsystem.h b/Source/VaRest/Public/VaRestSubsystem.h
@@ -77,6 +77,10 @@ class VAREST_API UVaRestSubsystem : public UEngineSubsystem
 	UFUNCTION(BlueprintCallable, meta = (DisplayName = "Construct Json Object"), Category = "VaRest|Subsystem")
 	UVaRestJsonObject* ConstructVaRestJsonObject();
 
+	/** Create new Json object (static one for MakeJson node, hack for #293) */
+	UFUNCTION()
+	static UVaRestJsonObject* StaticConstructVaRestJsonObject();
+
 	/** Create new Json Number value
 	 * Attn.!! float used instead of double to make the function blueprintable! */
 	UFUNCTION(BlueprintPure, meta = (DisplayName = "Construct Json Number Value"), Category = "VaRest|Subsystem")

diff --git a/Source/VaRestEditor/Private/VaRest_BreakJson.cpp b/Source/VaRestEditor/Private/VaRest_BreakJson.cpp
@@ -254,7 +254,7 @@ FText UVaRest_BreakJson::GetMenuCategory() const
 	if (CachedCategory.IsOutOfDate(this))
 	{
 		// FText::Format() is slow, so we cache this to save on performance
-		CachedCategory.SetCachedText(FEditorCategoryUtils::BuildCategoryString(FCommonEditorCategory::Utilities, LOCTEXT("ActionMenuCategory", "Va Rest")), this);
+		CachedCategory.SetCachedText(FEditorCategoryUtils::BuildCategoryString(FCommonEditorCategory::Utilities, LOCTEXT("ActionMenuCategory", "VaRest")), this);
 	}
 	return CachedCategory;
 }
@@ -273,7 +273,6 @@ void UVaRest_BreakJson::CreateProjectionPins(UEdGraphPin* Source)
 #endif
 
 		UObject* Subtype = nullptr;
-		FString FieldName = (*it).Name.ToString();
 
 		switch ((*it).Type)
 		{
@@ -297,7 +296,7 @@ void UVaRest_BreakJson::CreateProjectionPins(UEdGraphPin* Source)
 
 		UEdGraphNode::FCreatePinParams OutputPinParams;
 		OutputPinParams.ContainerType = (*it).bIsArray ? EPinContainerType::Array : EPinContainerType::None;
-		UEdGraphPin* OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, FName((*(*it).Name.ToString())), OutputPinParams);
+		UEdGraphPin* OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, (*it).Name, OutputPinParams);
 	}
 }
 
@@ -340,7 +339,7 @@ class FKCHandler_MakeJson : public FNodeHandlingFunctor
 		{
 			UClass* SubsystemClass = Cast<UClass>(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRest.VaRestSubsystem'")));
 
-			FName FunctionName = TEXT("ConstructVaRestJsonObject");
+			FName FunctionName = TEXT("StaticConstructVaRestJsonObject");
 			UFunction* FunctionPtr = SubsystemClass->FindFunctionByName(FunctionName);
 			FBlueprintCompiledStatement& Statement = Context.AppendStatementForNode(Node);
 			Statement.Type = KCST_CallFunction;
@@ -360,7 +359,6 @@ class FKCHandler_MakeJson : public FNodeHandlingFunctor
 			UEdGraphPin* Pin = Node->Pins[PinIndex];
 			if (Pin && (EGPD_Input == Pin->Direction))
 			{
-
 				FBPTerminal** Source = Context.NetMap.Find(FEdGraphUtilities::GetNetFromPin(Pin));
 
 #if ENGINE_MINOR_VERSION >= 19
@@ -548,7 +546,7 @@ FText UVaRest_MakeJson::GetMenuCategory() const
 	if (CachedCategory.IsOutOfDate(this))
 	{
 		// FText::Format() is slow, so we cache this to save on performance
-		CachedCategory.SetCachedText(FEditorCategoryUtils::BuildCategoryString(FCommonEditorCategory::Utilities, LOCTEXT("ActionMenuCategory", "Va Rest")), this);
+		CachedCategory.SetCachedText(FEditorCategoryUtils::BuildCategoryString(FCommonEditorCategory::Utilities, LOCTEXT("ActionMenuCategory", "VaRest")), this);
 	}
 	return CachedCategory;
 }
@@ -562,7 +560,6 @@ void UVaRest_MakeJson::CreateProjectionPins(UEdGraphPin* Source)
 	{
 		FName Type;
 		UObject* Subtype = nullptr;
-		FString FieldName = (*it).Name.ToString();
 
 		switch ((*it).Type)
 		{
@@ -586,7 +583,7 @@ void UVaRest_MakeJson::CreateProjectionPins(UEdGraphPin* Source)
 
 		UEdGraphNode::FCreatePinParams InputPinParams;
 		InputPinParams.ContainerType = (*it).bIsArray ? EPinContainerType::Array : EPinContainerType::None;
-		UEdGraphPin* InputPin = CreatePin(EGPD_Input, Type, TEXT(""), Subtype, FName((*(*it).Name.ToString())), InputPinParams);
+		UEdGraphPin* InputPin = CreatePin(EGPD_Input, Type, TEXT(""), Subtype, (*it).Name, InputPinParams);
 
 #if ENGINE_MINOR_VERSION >= 20
 		InputPin->SetSavePinIfOrphaned(false);

diff --git a/Source/VaRestEditor/Public/VaRest_BreakJson.h b/Source/VaRestEditor/Public/VaRest_BreakJson.h
@@ -27,10 +27,10 @@ enum class EVaRest_JsonType : uint8
 USTRUCT(BlueprintType)
 struct FVaRest_NamedType
 {
-	GENERATED_USTRUCT_BODY();
+	GENERATED_USTRUCT_BODY()
 
 	UPROPERTY(EditAnywhere, Category = NamedType)
-	FText Name;
+	FName Name;
 
 	UPROPERTY(EditAnywhere, Category = NamedType)
 	EVaRest_JsonType Type;

diff --git a/VaRest.uplugin b/VaRest.uplugin
@@ -3,7 +3,7 @@
 
 	"FriendlyName" : "VaRest",
 	"Version" : 29,
-	"VersionName" : "1.1-r29",
+	"VersionName" : "1.1-r29.2",
 	"CreatedBy" : "Vladimir Alyamkin",
 	"CreatedByURL" : "https://alyamkin.com",
 	"EngineVersion" : "4.24.0",