Finish v1.1-r25

ufna · Nov 12, 2018 · 9d10e6a · 9d10e6a
2 parents 7bb2ccd + f96f8d1
commit 9d10e6a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Key features:
 
 Check the [Wiki](https://hiazma.atlassian.net/wiki/display/VAR) for plugin usage examples and installation notes.
 
-Current version: **1.1 R 24** (UE 4.20)
+Current version: **1.1 R 25** (UE 4.21)
 
 ![SCREENSHOT](SCREENSHOT.jpg)
 

diff --git a/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp b/Source/VaRestEditorPlugin/Private/VaRest_BreakJson.cpp
@@ -196,7 +196,7 @@ void UVaRest_BreakJson::AllocateDefaultPins()
 	const UEdGraphSchema_K2* K2Schema = GetDefault<UEdGraphSchema_K2>();
 
 	UClass *Class = Cast<UClass>(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'")));
-	UEdGraphPin* Pin = CreatePin(EGPD_Input, K2Schema->PC_Object, TEXT(""), Class, false, false, TEXT("Target"));
+	UEdGraphPin* Pin = CreatePin(EGPD_Input, K2Schema->PC_Object, TEXT(""), Class, TEXT("Target"));
 
 #if ENGINE_MINOR_VERSION >= 17
         K2Schema->SetPinAutogeneratedDefaultValueBasedOnType(Pin);
@@ -299,7 +299,9 @@ void UVaRest_BreakJson::CreateProjectionPins(UEdGraphPin *Source)
 				break;
 		}
 
-		UEdGraphPin *OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, (*it).bIsArray, false, (*it).Name);
+		UEdGraphNode::FCreatePinParams OutputPinParams;
+		OutputPinParams.ContainerType = (*it).bIsArray ? EPinContainerType::Array : EPinContainerType::None;
+		UEdGraphPin *OutputPin = CreatePin(EGPD_Output, Type, TEXT(""), Subtype, FName(*(*it).Name), OutputPinParams);
 	}
 }
 
@@ -488,7 +490,7 @@ void UVaRest_MakeJson::AllocateDefaultPins()
 	const UEdGraphSchema_K2* K2Schema = GetDefault<UEdGraphSchema_K2>();
 
 	UClass *Class = Cast<UClass>(StaticLoadObject(UClass::StaticClass(), NULL, TEXT("class'VaRestPlugin.VaRestJsonObject'")));
-	UEdGraphPin* Pin = CreatePin(EGPD_Output, K2Schema->PC_Object, TEXT(""), Class, false, false, TEXT("Target"));
+	UEdGraphPin* Pin = CreatePin(EGPD_Output, K2Schema->PC_Object, TEXT(""), Class, TEXT("Target"));
 
 #if ENGINE_MINOR_VERSION >= 17
         K2Schema->SetPinAutogeneratedDefaultValueBasedOnType(Pin);
@@ -586,7 +588,9 @@ void UVaRest_MakeJson::CreateProjectionPins(UEdGraphPin *Source)
 				break;
 		}
 
-		UEdGraphPin *InputPin = CreatePin(EGPD_Input, Type, TEXT(""), Subtype, (*it).bIsArray, false, (*it).Name);
+		UEdGraphNode::FCreatePinParams InputPinParams;
+		InputPinParams.ContainerType = (*it).bIsArray ? EPinContainerType::Array : EPinContainerType::None;
+		UEdGraphPin *InputPin = CreatePin(EGPD_Input, Type, TEXT(""), Subtype, FName(*(*it).Name), InputPinParams);
 		InputPin->SetSavePinIfOrphaned(false);
 	}
 }

diff --git a/Source/VaRestPlugin/Private/VaRestRequestJSON.cpp b/Source/VaRestPlugin/Private/VaRestRequestJSON.cpp
@@ -462,7 +462,7 @@ void UVaRestRequestJSON::OnProcessRequestComplete(FHttpRequestPtr Request, FHttp
 		return;
 	}
 
-#if !(PLATFORM_IOS || PLATFORM_ANDROID)
+#if PLATFORM_DESKTOP
 	// Log response state
 	UE_LOG(LogVaRest, Log, TEXT("Response (%d): %sJSON(%s%s%s)JSON"), ResponseCode, LINE_TERMINATOR, LINE_TERMINATOR, *Response->GetContentAsString(), LINE_TERMINATOR);
 #endif
@@ -504,17 +504,20 @@ void UVaRestRequestJSON::OnProcessRequestComplete(FHttpRequestPtr Request, FHttp
 		}
 	}
 
-	// Broadcast the result event
-	OnRequestComplete.Broadcast(this);
-	OnStaticRequestComplete.Broadcast(this);
+	// Broadcast the result events on next tick
+	AsyncTask(ENamedThreads::GameThread, [this]()
+	{
+		OnRequestComplete.Broadcast(this);
+		OnStaticRequestComplete.Broadcast(this);
+	});
 
 	// Finish the latent action
 	if (ContinueAction)
 	{
-          FVaRestLatentAction<UVaRestJsonObject*> *K = ContinueAction;
-          ContinueAction = nullptr;
+		FVaRestLatentAction<UVaRestJsonObject*> *K = ContinueAction;
+		ContinueAction = nullptr;
 
-          K->Call(ResponseJsonObj);
+		K->Call(ResponseJsonObj);
 	}
 }
 

diff --git a/Source/VaRestPlugin/VaRestPlugin.Build.cs b/Source/VaRestPlugin/VaRestPlugin.Build.cs
@@ -1,4 +1,4 @@
-// Copyright 2014 Vladimir Alyamkin. All Rights Reserved.
+// Copyright 2014-2018 Vladimir Alyamkin. All Rights Reserved.
 
 using System.IO;
 
@@ -8,9 +8,9 @@ public class VaRestPlugin : ModuleRules
 	{
 		public VaRestPlugin(ReadOnlyTargetRules Target) : base(Target)
 		{
-            PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+			PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 
-            PrivateIncludePaths.AddRange(
+			PrivateIncludePaths.AddRange(
 				new string[] {
 					"VaRestPlugin/Private",
 					// ... add other private include paths required here ...
@@ -22,10 +22,10 @@ public VaRestPlugin(ReadOnlyTargetRules Target) : base(Target)
 					"Core",
 					"CoreUObject",
 					"Engine",
-                    "HTTP",
-                    "Json"
+					"HTTP",
+					"Json"
 					// ... add other public dependencies that you statically link with here ...
 				});
 		}
 	}
-}
+}
diff --git a/VaRestPlugin.uplugin b/VaRestPlugin.uplugin
@@ -2,11 +2,11 @@
 	"FileVersion" : 3,
 
 	"FriendlyName" : "VaRest",
-	"Version" : 24,
-	"VersionName" : "1.1-r24",
+	"Version" : 25,
+	"VersionName" : "1.1-r25",
 	"CreatedBy" : "Vladimir Alyamkin",
 	"CreatedByURL" : "http://alyamkin.com",
-	"EngineVersion" : "4.20.0",
+	"EngineVersion" : "4.21.0",
 	"Description" : "Plugin that makes REST (JSON) server communication easy to use",
 	"Category" : "Network",
 	"MarketplaceURL" : "com.epicgames.launcher://ue/marketplace/content/e47be161e7a24e928560290abd5dcc4f",