Merge branch 'master' of https://github.com/ncsoft/Unreal.js

Author: Nako Sung

Examples/Content/Scripts/helloCharacter.js

@@ -7,12 +7,27 @@
     function GetPC() {
         return PlayerController.C(GWorld.GetAllActorsOfClass(PlayerController).OutActors[0])
     }
+    
+    function compile(source) {
+        return require('uclass')()(global,source)
+    }
 
     function main() {
         let PC = GetPC()
+        
+        // For movement component replacement demonstration 
+        class MyCMC extends CharacterMovementComponent {
+            properties() {
+                this.Dummy/*EditAnywhere+Vector*/;
+            }
+        }
+        let MyCMC_C = compile(MyCMC)
 
         // declare a new character class
         class MyCharacter extends Character {
+            prector() {
+                MyCMC_C.SetDefaultSubobjectClass("CharMoveComp")
+            }
             // strange? ctor, not constructor...
             ctor() {
                 let movement = this.GetMovementComponent()
@@ -29,7 +44,7 @@
             }
         }
 
-        let MyCharacter_C = require('uclass')()(global,MyCharacter)
+        let MyCharacter_C = compile(MyCharacter)
 
         function randomPoint() {
             return GWorld.GetRandomPoint(GWorld.NavigationSystem.MainNavData)

Plugins/UnrealJS/Source/V8/Private/JavascriptContext_Private.cpp

@@ -770,8 +770,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
 
 			auto ClassConstructor = [](const FObjectInitializer& ObjectInitializer){
 				auto Class = static_cast<UBlueprintGeneratedClass*>(ObjectInitializer.GetClass());
-				Class->GetSuperClass()->ClassConstructor(ObjectInitializer);
-
+				
 				FJavascriptContextImplementation* Context = nullptr;
 
 				if (auto Klass = Cast<UJavascriptGeneratedClass_Native>(Class)) 
@@ -789,7 +788,6 @@ class FJavascriptContextImplementation : public FJavascriptContext
 					}
 				}
 
-
 				if (Context)
 				{
 					auto isolate = Context->isolate();
@@ -810,21 +808,39 @@ class FJavascriptContextImplementation : public FJavascriptContext
 						I.Throw(TEXT("Invalid proxy : construct class"));
 						return;
 					}
-					auto func = proxy->ToObject()->Get(I.Keyword("ctor"));					
-
+					
 					Context->ObjectInitializer = &ObjectInitializer;
 
 					auto This = Context->ExportObject(Object);
 
 					auto context = Context->context();
 
-					if (func->IsFunction())
 					{
-						CallJavascriptFunction(context, This, nullptr, Local<Function>::Cast(func), nullptr);
+						auto func = proxy->ToObject()->Get(I.Keyword("prector"));
+
+						if (func->IsFunction())
+						{
+							CallJavascriptFunction(context, This, nullptr, Local<Function>::Cast(func), nullptr);
+						}
+					}
+
+					Class->GetSuperClass()->ClassConstructor(ObjectInitializer);
+
+					{
+						auto func = proxy->ToObject()->Get(I.Keyword("ctor"));
+
+						if (func->IsFunction())
+						{
+							CallJavascriptFunction(context, This, nullptr, Local<Function>::Cast(func), nullptr);
+						}
 					}
 
 					Context->ObjectInitializer = nullptr;
 				}
+				else
+				{
+					Class->GetSuperClass()->ClassConstructor(ObjectInitializer);
+				}
 			};
 
 			Class->ClassConstructor = ClassConstructor;
@@ -1040,7 +1056,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
 
 					if (!Function->IsFunction()) continue;
 
-					if (UName != TEXT("ctor") && UName != TEXT("constructor"))
+					if (UName != TEXT("prector") && UName != TEXT("ctor") && UName != TEXT("constructor"))
 					{
 						if (!AddFunction(*UName, Function))
 						{						

Plugins/UnrealJS/Source/V8/Private/JavascriptIsolate_Private.cpp

@@ -32,6 +32,19 @@ DECLARE_MEMORY_STAT(TEXT("LoSpace"), STAT_LoSpace, STATGROUP_Javascript);
 
 using namespace v8;
 
+// HACK FOR ACCESS PRIVATE MEMBERS
+class hack_private_key {};
+static UClass* PlaceholderUClass;
+
+template<>
+FObjectInitializer const& FObjectInitializer::SetDefaultSubobjectClass<hack_private_key>(TCHAR const*SubobjectName) const
+{
+	AssertIfSubobjectSetupIsNotAllowed(SubobjectName);
+	ComponentOverrides.Add(SubobjectName, PlaceholderUClass, *this);
+	return *this;
+}
+// END OF HACKING
+
 template <typename CppType>
 struct TStructReader
 {	
@@ -1215,6 +1228,49 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 		Template->Set(I.Keyword("GetClassObject"), I.FunctionTemplate(fn, ClassToExport));
 	}	
 
+	void AddMemberFunction_Class_SetDefaultSubobjectClass(Local<FunctionTemplate> Template, UStruct* ClassToExport)
+	{
+		FIsolateHelper I(isolate_);
+
+		auto fn = [](const FunctionCallbackInfo<Value>& info) {
+			auto isolate = info.GetIsolate();
+			HandleScope scope(isolate);
+
+			FIsolateHelper I(isolate);
+
+			auto ClassToExport = reinterpret_cast<UClass*>((Local<External>::Cast(info.Data()))->Value());
+
+			auto ObjectInitializer = GetSelf(isolate)->GetContext()->GetObjectInitializer();
+
+			if (!ObjectInitializer)
+			{
+				I.Throw(TEXT("SetDefaultSubobjectClass must be called within ctor"));
+				return;
+			}
+
+			if (info.Length() < 1)
+			{
+				I.Throw(TEXT("Missing arg"));
+				return;
+			}
+
+			auto Class = static_cast<UJavascriptGeneratedClass*>(ObjectInitializer->GetClass());
+			if (!Class->JavascriptContext.IsValid())
+			{
+				I.Throw(TEXT("Fatal"));
+				return;
+			}
+
+			auto Context = Class->JavascriptContext.Pin();
+			auto Name = StringFromV8(info[0]);			
+			PlaceholderUClass = ClassToExport;
+			ObjectInitializer->SetDefaultSubobjectClass<hack_private_key>(*Name);
+			PlaceholderUClass = nullptr;
+		};
+
+		Template->Set(I.Keyword("SetDefaultSubobjectClass"), I.FunctionTemplate(fn, ClassToExport));
+	}
+
 	void AddMemberFunction_Class_CreateDefaultSubobject(Local<FunctionTemplate> Template, UStruct* ClassToExport)
 	{
 		FIsolateHelper I(isolate_);
@@ -1602,6 +1658,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 
 		AddMemberFunction_Class_GetClassObject(Template, ClassToExport);
 		AddMemberFunction_Class_CreateDefaultSubobject(Template, ClassToExport);
+		AddMemberFunction_Class_SetDefaultSubobjectClass(Template, ClassToExport);
 
 		AddMemberFunction_Class_GetDefaultObject(Template, ClassToExport);
 		AddMemberFunction_Class_GetDefaultSubobjectByName(Template, ClassToExport);

Plugins/UnrealJS/Source/V8/Private/TypingGenerator.h

@@ -422,7 +422,7 @@ struct TypingGenerator : TypingGeneratorBase
 			w.push(";\n");
 
 			w.push("\tstatic GetDefaultSubobjectByName(Name: string): UObject;\n");
-
+			w.push("\tstatic SetDefaultSubobjectClass(Name: string): void;\n");
 			w.push("\tstatic CreateDefaultSubobject(Name: string, Transient?: boolean, Required?: boolean, Abstract?: boolean): ");
 			w.push(name);
 			w.push(";\n");

README.md

@@ -24,7 +24,7 @@ Unreal.js is a plug-in which brings V8-powered Javascript into UnrealEngine4.
 - https://github.com/ncsoft/Unreal.js/wiki
 
 ### Install and play
-- Make sure you have [UnrealEngine 4.10 canonical build](https://www.unrealengine.com/dashboard).
+- Make sure you have [UnrealEngine 4.10.2 canonical build](https://www.unrealengine.com/dashboard).
 - Install git-lfs first to download *.umap, *.uasset properly. (https://git-lfs.github.com/)
 - After installing `git-lfs`, `git clone https://github.com/ncsoft/Unreal.js`
 - Download [prebuilt UnrealJS plugin](https://github.com/ncsoft/Unreal.js/releases) and unzip into `Examples/Plugins/UnrealJS`.