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

nakosung · nakosung · commit 8723d1dfe8a1 · 2016-02-18T22:28:26.000+09:00
diff --git a/Plugins/UnrealJS/Source/JavascriptEditor/JavascriptEditorGlobalDelegates.cpp b/Plugins/UnrealJS/Source/JavascriptEditor/JavascriptEditorGlobalDelegates.cpp
@@ -1,5 +1,6 @@
 #include "JavascriptEditor.h"
 #include "AssetRegistryModule.h"
+#include "EditorSupportDelegates.h"
 #include "JavascriptEditorGlobalDelegates.h"
 
 void UJavascriptEditorGlobalDelegates::BeginDestroy()
@@ -70,7 +71,12 @@ OP_REFLECT_EDITORENGINE(OnBlueprintPreCompile)\
 OP_REFLECT_EDITORENGINE(OnBlueprintCompiled)\
 OP_REFLECT_EDITORENGINE(OnBlueprintReinstanced)\
 OP_REFLECT_EDITORENGINE(OnClassPackageLoadedOrUnloaded)\
-OP_REFLECT_EDITORENGINE(OnObjectReimported);
+OP_REFLECT_EDITORENGINE(OnObjectReimported)
+
+#define DO_REFLECT_SUPPORT() \
+OP_REFLECT_SUPPORT(RedrawAllViewports)\
+OP_REFLECT_SUPPORT(CleanseEditor)\
+OP_REFLECT_SUPPORT(WorldChange)
 
 #if WITH_EDITOR
 FJavascriptAssetData::FJavascriptAssetData(const FAssetData& Source)
@@ -88,10 +94,13 @@ void UJavascriptEditorGlobalDelegates::Bind(FString Key)
 #define OP_REFLECT(x) else if (Key == #x) { Handle = FEditorDelegates::x.AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
 #define OP_REFLECT_ASSETREGISTRY(x) else if (Key == #x) { Handle = AssetRegistry.x().AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
 #define OP_REFLECT_EDITORENGINE(x) else if (Key == #x) { Handle = Cast<UEditorEngine>(GEngine)->x().AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
+#define OP_REFLECT_SUPPORT(x) else if (Key == #x) { Handle = FEditorSupportDelegates::x.AddUObject(this, &UJavascriptEditorGlobalDelegates::x); }
 	if (false) {}
-	DO_REFLECT()
-	DO_REFLECT_ASSETREGISTRY()
-	DO_REFLECT_EDITORENGINE()
+		DO_REFLECT()
+		DO_REFLECT_ASSETREGISTRY()
+		DO_REFLECT_EDITORENGINE()
+		DO_REFLECT_SUPPORT()
+		;
 #endif
 
 	if (Handle.IsValid())
@@ -117,10 +126,13 @@ void UJavascriptEditorGlobalDelegates::Unbind(FString Key)
 #define OP_REFLECT(x) else if (Key == #x) { FEditorDelegates::x.Remove(Handle); }
 #define OP_REFLECT_ASSETREGISTRY(x) else if (Key == #x) { AssetRegistry.x().Remove(Handle); }
 #define OP_REFLECT_EDITORENGINE(x) else if (Key == #x) { Cast<UEditorEngine>(GEngine)->x().Remove(Handle); }
+#define OP_REFLECT_SUPPORT(x) else if (Key == #x) { FEditorSupportDelegates::x.Remove(Handle); }
 	if (false) {}
-	DO_REFLECT()	
-	DO_REFLECT_ASSETREGISTRY()
-	DO_REFLECT_EDITORENGINE()
+		DO_REFLECT()
+		DO_REFLECT_ASSETREGISTRY()
+		DO_REFLECT_EDITORENGINE()
+		DO_REFLECT_SUPPORT()
+		;
 #endif
 
 	Handles.Remove(Key);
diff --git a/Plugins/UnrealJS/Source/JavascriptEditor/JavascriptEditorGlobalDelegates.h b/Plugins/UnrealJS/Source/JavascriptEditor/JavascriptEditorGlobalDelegates.h
@@ -267,6 +267,17 @@ class JAVASCRIPTEDITOR_API UJavascriptEditorGlobalDelegates : public UObject
 	void OnObjectReimported(UObject* Object);
 
 		//GetActorRecordingState
+
+	// FEditorSupportDelegates
+
+	UFUNCTION(BlueprintImplementableEvent, Category = "Scripting | Javascript")
+	void RedrawAllViewports();
+	
+	UFUNCTION(BlueprintImplementableEvent, Category = "Scripting | Javascript")
+	void CleanseEditor();
+	
+	UFUNCTION(BlueprintImplementableEvent, Category = "Scripting | Javascript")
+	void WorldChange();
 	
 #endif
 
diff --git a/Plugins/UnrealJS/Source/JavascriptUMG/JavascriptRichTextBlockHyperlinkDecorator.cpp b/Plugins/UnrealJS/Source/JavascriptUMG/JavascriptRichTextBlockHyperlinkDecorator.cpp
@@ -0,0 +1,25 @@
+#include "JavascriptUMG.h"
+#include "JavascriptRichTextBlockHyperlinkDecorator.h"
+
+TSharedRef<ITextDecorator> UJavascriptRichTextBlockHyperlinkDecorator::CreateDecorator(const FSlateFontInfo& DefaultFont, const FLinearColor& DefaultColor)
+{
+	return SRichTextBlock::HyperlinkDecorator(HyperlinkId, FSlateHyperlinkRun::FOnClick::CreateLambda([this](const FSlateHyperlinkRun::FMetadata& metadata) {
+		Current = &metadata;
+		this->OnClick.Broadcast(this);
+		Current = nullptr;
+	}));
+}
+
+FString UJavascriptRichTextBlockHyperlinkDecorator::GetMetadata(const FString& Key)
+{
+	if (Current)
+	{
+		auto Value = Current->Find(Key);
+		if (Value)
+		{
+			return *Value;
+		}
+	}
+	
+	return TEXT("");
+}
diff --git a/Plugins/UnrealJS/Source/JavascriptUMG/JavascriptRichTextBlockHyperlinkDecorator.h b/Plugins/UnrealJS/Source/JavascriptUMG/JavascriptRichTextBlockHyperlinkDecorator.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "RichTextBlockDecorator.h"
+#include "JavascriptRichTextBlockHyperlinkDecorator.generated.h"
+
+class UJavascriptContext;
+
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FJavascriptHyperlinkSignature, UJavascriptRichTextBlockHyperlinkDecorator*, Self);
+
+/**
+* Allows thousands of items to be displayed in a Tile.  Generates widgets dynamically for each item.
+*/
+UCLASS(Experimental)
+class JAVASCRIPTUMG_API UJavascriptRichTextBlockHyperlinkDecorator : public URichTextBlockDecorator
+{
+	GENERATED_BODY()
+
+public:	
+	UPROPERTY(EditAnywhere, Category = "Scripting | Javascript")	
+	FString HyperlinkId;
+
+	UPROPERTY(BlueprintAssignable, Category = "Scripting | Javascript")
+	FJavascriptHyperlinkSignature OnClick;
+
+	virtual TSharedRef<ITextDecorator> CreateDecorator(const FSlateFontInfo& DefaultFont, const FLinearColor& DefaultColor) override;
+
+	void HandleClick(const FSlateHyperlinkRun::FMetadata& Metadata);
+
+	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
+	FString GetMetadata(const FString& Key);
+
+	const FSlateHyperlinkRun::FMetadata* Current{ nullptr };
+};
diff --git a/Plugins/UnrealJS/Source/JavascriptWebSocket/JSWebSocketServer.cpp b/Plugins/UnrealJS/Source/JavascriptWebSocket/JSWebSocketServer.cpp
@@ -42,7 +42,7 @@ static int unreal_networking_server(
 );
 
 #if !UE_BUILD_SHIPPING
-	void libwebsocket_debugLog(int level, const char *line)
+	void libwebsocket_debugLog_JS(int level, const char *line)
 	{ 
 		UE_LOG(LogWebsocket, Log, TEXT("websocket server: %s"), ANSI_TO_TCHAR(line));
 	}
@@ -54,7 +54,7 @@ bool FJavascriptWebSocketServer::Init(uint32 Port, FJavascriptWebSocketClientCon
 #if !PLATFORM_HTML5
 	// setup log level.
 #if !UE_BUILD_SHIPPING
-	lws_set_log_level(LLL_ERR | LLL_WARN | LLL_NOTICE | LLL_DEBUG | LLL_INFO, libwebsocket_debugLog);
+	lws_set_log_level(LLL_ERR | LLL_WARN | LLL_NOTICE | LLL_DEBUG | LLL_INFO, libwebsocket_debugLog_JS);
 #endif 
 
 	Protocols = new libwebsocket_protocols[3];
diff --git a/Plugins/UnrealJS/Source/V8/Private/Exception.h b/Plugins/UnrealJS/Source/V8/Private/Exception.h
@@ -16,20 +16,23 @@ struct FV8Exception
 		}
 		else
 		{
-			auto filename = StringFromV8(message->GetScriptResourceName());
-			auto linenum = message->GetLineNumber();
-			auto line = StringFromV8(message->GetSourceLine());			
+			if (!exception.IsEmpty())
+			{
+				auto filename = StringFromV8(message->GetScriptResourceName());
+				auto linenum = message->GetLineNumber();
+				auto line = StringFromV8(message->GetSourceLine());
 
-			UE_LOG(Javascript, Error, TEXT("%s:%d: %s"), *filename, linenum, *exception);
+				UE_LOG(Javascript, Error, TEXT("%s:%d: %s"), *filename, linenum, *exception);
 
-			auto stack_trace = StringFromV8(try_catch.StackTrace());
-			if (stack_trace.Len() > 0)
-			{
-				TArray<FString> Lines;
-				stack_trace.ParseIntoArrayLines(Lines);
-				for (const auto& line : Lines)
+				auto stack_trace = StringFromV8(try_catch.StackTrace());
+				if (stack_trace.Len() > 0)
 				{
-					UE_LOG(Javascript, Error, TEXT("%s"), *line);
+					TArray<FString> Lines;
+					stack_trace.ParseIntoArrayLines(Lines);
+					for (const auto& line : Lines)
+					{
+						UE_LOG(Javascript, Error, TEXT("%s"), *line);
+					}
 				}
 			}
 		}
diff --git a/Plugins/UnrealJS/Source/V8/Private/JavascriptContext_Private.cpp b/Plugins/UnrealJS/Source/V8/Private/JavascriptContext_Private.cpp
@@ -1201,11 +1201,11 @@ class FJavascriptContextImplementation : public FJavascriptContext
 				FString Text;
 				if (FFileHelper::LoadFileToString(Text, *script_path))
 				{
-					Text = FString::Printf(TEXT("(function (__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n%s\n;return module.exports;}('%s'));"), *Text, *script_path);					
+					Text = FString::Printf(TEXT("(function (global,__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n(function () { \n%s\n })()\n;return module.exports;}(this,'%s'));"), *Text, *script_path);					
 #if PLATFORM_WINDOWS
 					full_path = full_path.Replace(TEXT("/"), TEXT("\\"));
 #endif
-					auto exports = Self->RunScript(full_path, Text, 2);
+					auto exports = Self->RunScript(full_path, Text, 3);
 					if (exports.IsEmpty())
 					{
 						UE_LOG(Javascript, Log, TEXT("Invalid script for require"));
@@ -1399,7 +1399,11 @@ class FJavascriptContextImplementation : public FJavascriptContext
 
 		auto Script = ReadScriptFile(Filename);
 
-		return RunScript(GetScriptFileFullPath(Filename), Script);
+		auto ScriptPath = GetScriptFileFullPath(Filename);
+
+		auto Text = FString::Printf(TEXT("(function (global,__dirname) {\n%s\n;}(this,'%s'));"), *Script, *ScriptPath);
+
+		return RunScript(ScriptPath, Text, 1);
 	}
 
 	void Public_RunFile(const FString& Filename)
@@ -1435,7 +1439,7 @@ class FJavascriptContextImplementation : public FJavascriptContext
 		auto Path = Filename;
 #if PLATFORM_WINDOWS
 		// HACK for Visual Studio Code
-		if (Path[1] == ':')
+		if (Path.Len() && Path[1] == ':')
 		{
 			Path = Path.Mid(0, 1).ToLower() + Path.Mid(1);
 		}
@@ -1715,6 +1719,7 @@ inline void FJavascriptContextImplementation::AddReferencedObjects(UObject * InT
 	// All objects
 	for (auto It = ObjectToObjectMap.CreateIterator(); It; ++It)
 	{
+//		UE_LOG(Javascript, Log, TEXT("JavascriptContext referencing %s %s"), *(It.Key()->GetClass()->GetName()), *(It.Key()->GetName()));
 		Collector.AddReferencedObject(It.Key(), InThis);
 	}
 
diff --git a/Plugins/UnrealJS/Source/V8/Private/JavascriptIsolate_Private.cpp b/Plugins/UnrealJS/Source/V8/Private/JavascriptIsolate_Private.cpp
@@ -408,7 +408,9 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 		// All classes
 		for (auto It = ClassToFunctionTemplateMap.CreateIterator(); It; ++It)
 		{
-			Collector.AddReferencedObject(It.Key(), InThis);
+			UClass* Class = It.Key();
+			//UE_LOG(Javascript, Log, TEXT("JavascriptIsolate referencing %s / %s %s (gen by %s %s)"), *(Class->GetOuter()->GetName()), *(Class->GetClass()->GetName()), *(Class->GetName()), Class->ClassGeneratedBy ? *(Class->ClassGeneratedBy->GetClass()->GetName()) : TEXT("none"), Class->ClassGeneratedBy ? *(Class->ClassGeneratedBy->GetName()) : TEXT("none"));
+			Collector.AddReferencedObject(Class, InThis);
 		}
 
 		// All structs
@@ -1960,7 +1962,13 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
 			}
 			else
 			{
-				auto v8_class = ExportClass(Object->GetClass());
+				auto Class = Object->GetClass();
+				if (Class->ClassGeneratedBy && Cast<ULevel>(Class->ClassGeneratedBy->GetOuter()))
+				{
+					return Undefined(isolate_);
+				}
+
+				auto v8_class = ExportClass(Class);
 				auto arg = I.External(Object);
 				Handle<Value> args[] = { arg };
 

Original file line number	Diff line number	Diff line change
`@@ -16,20 +16,23 @@ struct FV8Exception`
`16`	`16`	`}`
`17`	`17`	`else`
`18`	`18`	`{`
`19`		`- auto filename = StringFromV8(message->GetScriptResourceName());`
`20`		`- auto linenum = message->GetLineNumber();`
`21`		`- auto line = StringFromV8(message->GetSourceLine());`
	`19`	`+ if (!exception.IsEmpty())`
	`20`	`+ {`
	`21`	`+ auto filename = StringFromV8(message->GetScriptResourceName());`
	`22`	`+ auto linenum = message->GetLineNumber();`
	`23`	`+ auto line = StringFromV8(message->GetSourceLine());`
`22`	`24`
`23`		`- UE_LOG(Javascript, Error, TEXT("%s:%d: %s"), filename, linenum, exception);`
	`25`	`+ UE_LOG(Javascript, Error, TEXT("%s:%d: %s"), filename, linenum, exception);`
`24`	`26`
`25`		`- auto stack_trace = StringFromV8(try_catch.StackTrace());`
`26`		`- if (stack_trace.Len() > 0)`
`27`		`- {`
`28`		`- TArray<FString> Lines;`
`29`		`- stack_trace.ParseIntoArrayLines(Lines);`
`30`		`- for (const auto& line : Lines)`
	`27`	`+ auto stack_trace = StringFromV8(try_catch.StackTrace());`
	`28`	`+ if (stack_trace.Len() > 0)`
`31`	`29`	`{`
`32`		`- UE_LOG(Javascript, Error, TEXT("%s"), *line);`
	`30`	`+ TArray<FString> Lines;`
	`31`	`+ stack_trace.ParseIntoArrayLines(Lines);`
	`32`	`+ for (const auto& line : Lines)`
	`33`	`+ {`
	`34`	`+ UE_LOG(Javascript, Error, TEXT("%s"), *line);`
	`35`	`+ }`
`33`	`36`	`}`
`34`	`37`	`}`
`35`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1201,11 +1201,11 @@ class FJavascriptContextImplementation : public FJavascriptContext`
`1201`	`1201`	`FString Text;`
`1202`	`1202`	`if (FFileHelper::LoadFileToString(Text, *script_path))`
`1203`	`1203`	`{`
`1204`		`- Text = FString::Printf(TEXT("(function (__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n%s\n;return module.exports;}('%s'));"), Text, script_path);`
	`1204`	`+ Text = FString::Printf(TEXT("(function (global,__dirname) {\nvar module = { exports : {}, filename : __dirname }, exports = module.exports;\n(function () { \n%s\n })()\n;return module.exports;}(this,'%s'));"), Text, script_path);`
`1205`	`1205`	`#if PLATFORM_WINDOWS`
`1206`	`1206`	`full_path = full_path.Replace(TEXT("/"), TEXT("\\"));`
`1207`	`1207`	`#endif`
`1208`		`- auto exports = Self->RunScript(full_path, Text, 2);`
	`1208`	`+ auto exports = Self->RunScript(full_path, Text, 3);`
`1209`	`1209`	`if (exports.IsEmpty())`
`1210`	`1210`	`{`
`1211`	`1211`	`UE_LOG(Javascript, Log, TEXT("Invalid script for require"));`
`@@ -1399,7 +1399,11 @@ class FJavascriptContextImplementation : public FJavascriptContext`
`1399`	`1399`
`1400`	`1400`	`auto Script = ReadScriptFile(Filename);`
`1401`	`1401`
`1402`		`- return RunScript(GetScriptFileFullPath(Filename), Script);`
	`1402`	`+ auto ScriptPath = GetScriptFileFullPath(Filename);`
	`1403`	`+`
	`1404`	`+ auto Text = FString::Printf(TEXT("(function (global,__dirname) {\n%s\n;}(this,'%s'));"), Script, ScriptPath);`
	`1405`	`+`
	`1406`	`+ return RunScript(ScriptPath, Text, 1);`
`1403`	`1407`	`}`
`1404`	`1408`
`1405`	`1409`	`void Public_RunFile(const FString& Filename)`
`@@ -1435,7 +1439,7 @@ class FJavascriptContextImplementation : public FJavascriptContext`
`1435`	`1439`	`auto Path = Filename;`
`1436`	`1440`	`#if PLATFORM_WINDOWS`
`1437`	`1441`	`// HACK for Visual Studio Code`
`1438`		`- if (Path[1] == ':')`
	`1442`	`+ if (Path.Len() && Path[1] == ':')`
`1439`	`1443`	`{`
`1440`	`1444`	`Path = Path.Mid(0, 1).ToLower() + Path.Mid(1);`
`1441`	`1445`	`}`
`@@ -1715,6 +1719,7 @@ inline void FJavascriptContextImplementation::AddReferencedObjects(UObject * InT`
`1715`	`1719`	`// All objects`
`1716`	`1720`	`for (auto It = ObjectToObjectMap.CreateIterator(); It; ++It)`
`1717`	`1721`	`{`
	`1722`	`+// UE_LOG(Javascript, Log, TEXT("JavascriptContext referencing %s %s"), (It.Key()->GetClass()->GetName()), (It.Key()->GetName()));`
`1718`	`1723`	`Collector.AddReferencedObject(It.Key(), InThis);`
`1719`	`1724`	`}`
`1720`	`1725`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,9 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate`
`408`	`408`	`// All classes`
`409`	`409`	`for (auto It = ClassToFunctionTemplateMap.CreateIterator(); It; ++It)`
`410`	`410`	`{`
`411`		`- Collector.AddReferencedObject(It.Key(), InThis);`
	`411`	`+ UClass* Class = It.Key();`
	`412`	`+ //UE_LOG(Javascript, Log, TEXT("JavascriptIsolate referencing %s / %s %s (gen by %s %s)"), (Class->GetOuter()->GetName()), (Class->GetClass()->GetName()), (Class->GetName()), Class->ClassGeneratedBy ? (Class->ClassGeneratedBy->GetClass()->GetName()) : TEXT("none"), Class->ClassGeneratedBy ? *(Class->ClassGeneratedBy->GetName()) : TEXT("none"));`
	`413`	`+ Collector.AddReferencedObject(Class, InThis);`
`412`	`414`	`}`
`413`	`415`
`414`	`416`	`// All structs`
`@@ -1960,7 +1962,13 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate`
`1960`	`1962`	`}`
`1961`	`1963`	`else`
`1962`	`1964`	`{`
`1963`		`- auto v8_class = ExportClass(Object->GetClass());`
	`1965`	`+ auto Class = Object->GetClass();`
	`1966`	`+ if (Class->ClassGeneratedBy && Cast<ULevel>(Class->ClassGeneratedBy->GetOuter()))`
	`1967`	`+ {`
	`1968`	`+ return Undefined(isolate_);`
	`1969`	`+ }`
	`1970`	`+`
	`1971`	`+ auto v8_class = ExportClass(Class);`
`1964`	`1972`	`auto arg = I.External(Object);`
`1965`	`1973`	`Handle<Value> args[] = { arg };`
`1966`	`1974`