Fix for Engine update (4.17)

ncsoft · Aug 25, 2017 · 7917d95093f36d2731b9660344802ae796b4aa18 · 7917d95
1 parent 3b0e52c
commit 7917d95093f36d2731b9660344802ae796b4aa18
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@
 **/DerivedDataCache
 **/Intermediate
 **/ThirdParty/v8/lib
-**/Examples/**/node_modules/
+**/Examples/**/node_modules/
+**/*.vs/**
diff --git a/Examples/Content/Scripts/aliases.js b/Examples/Content/Scripts/aliases.js
diff --git a/Examples/Content/Scripts/helloCharacter.js b/Examples/Content/Scripts/helloCharacter.js
@@ -48,8 +48,8 @@ function main() {
     function randomPoint() {
         /// UE4 4.13 version not support 'GetRandomPoint'
         /// Replace 'GetRandomPoint' to 'GetRandomReachablePointInRadius'
-        const Origin = Vector.C({X:0,Y:0,Z:0}), Radius = 1500
-        return GWorld.GetRandomReachablePointInRadius(Origin, Radius)
+        const Origin = Vector.C({X:0,Y:0,Z:0}), RandomPos = Vector.C({X:0, Y:0, Z:0}), Radius = 1500
+        return GWorld.K2_GetRandomReachablePointInRadius(Origin, RandomPos, Radius).RandomLocation;
     }
 
     function createCharacter() {
@@ -78,6 +78,7 @@ function main() {
         return character
     }
 
+
     // spawn 20 characters
     let characters = _.range(0,20).map(()=>{
         while (true) {

diff --git a/Examples/Content/Scripts/typings/_part_0_ue.d.ts b/Examples/Content/Scripts/typings/_part_0_ue.d.ts
diff --git a/Examples/Content/Scripts/typings/_part_1_ue.d.ts b/Examples/Content/Scripts/typings/_part_1_ue.d.ts
diff --git a/Examples/Content/Scripts/typings/ue.d.ts b/Examples/Content/Scripts/typings/ue.d.ts
diff --git a/Examples/JavascriptPlayground.uproject b/Examples/JavascriptPlayground.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.13",
+	"EngineAssociation": "4.17",
 	"Category": "",
 	"Description": "",
 	"Modules": [

diff --git a/Examples/Source/JavascriptPlayground.Target.cs b/Examples/Source/JavascriptPlayground.Target.cs
@@ -5,21 +5,9 @@
 
 public class JavascriptPlaygroundTarget : TargetRules
 {
-	public JavascriptPlaygroundTarget(TargetInfo Target)
+	public JavascriptPlaygroundTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
-	}
-
-	//
-	// TargetRules interface.
-	//
-
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.AddRange( new string[] { "JavascriptPlayground" } );
+		ExtraModuleNames.Add("JavascriptPlayground");
 	}
 }
diff --git a/Examples/Source/JavascriptPlayground/JavascriptPlayground.Build.cs b/Examples/Source/JavascriptPlayground/JavascriptPlayground.Build.cs
@@ -4,9 +4,11 @@
 
 public class JavascriptPlayground : ModuleRules
 {
-	public JavascriptPlayground(TargetInfo Target)
-	{
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });
+	public JavascriptPlayground(ReadOnlyTargetRules Target) : base(Target)
+    {
+        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+
+        PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });
 
 		PrivateDependencyModuleNames.AddRange(new string[] {  });
 

diff --git a/Examples/Source/JavascriptPlayground/JavascriptPlayground.h b/Examples/Source/JavascriptPlayground/JavascriptPlayground.h
@@ -2,5 +2,4 @@
 
 #pragma once
 
-#include "Engine.h"
-
+#include "CoreMinimal.h"
diff --git a/Examples/Source/JavascriptPlayground/MyClass.cpp b/Examples/Source/JavascriptPlayground/MyClass.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
-#include "JavascriptPlayground.h"
 #include "MyClass.h"
+#include "JavascriptPlayground.h"
 
 MyClass::MyClass()
 {

diff --git a/Examples/Source/JavascriptPlaygroundEditor.Target.cs b/Examples/Source/JavascriptPlaygroundEditor.Target.cs
@@ -5,21 +5,9 @@
 
 public class JavascriptPlaygroundEditorTarget : TargetRules
 {
-	public JavascriptPlaygroundEditorTarget(TargetInfo Target)
+	public JavascriptPlaygroundEditorTarget(TargetInfo Target)  : base(Target)
 	{
 		Type = TargetType.Editor;
-	}
-
-	//
-	// TargetRules interface.
-	//
-
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.AddRange( new string[] { "JavascriptPlayground" } );
+		ExtraModuleNames.Add("JavascriptPlayground");
 	}
 }