JavascriptSettings(config) added

Author: nakosung

Plugins/UnrealJS/Source/JavascriptEditor/JavascriptEditor.cpp

@@ -6,9 +6,14 @@
 #include "IV8.h"
 #include "ScopedTransaction.h"
 #if WITH_EDITOR
+// Settings
+#include "JavascriptSettings.h"
+#include "ISettingsModule.h"
 #include "Settings/EditorLoadingSavingSettings.h"
 #endif
 
+#define LOCTEXT_NAMESPACE "UnrealJSEditor"
+
 class FJavascriptEditorModule : public IJavascriptEditorModule
 {
 	// Begin IModuleInterface
@@ -29,6 +34,25 @@ class FJavascriptEditorModule : public IJavascriptEditorModule
 	bool bRegistered{ false };
 
 	void Unregister();
+
+	void RegisterSettings()
+	{
+		if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
+		{
+			SettingsModule->RegisterSettings("Project", "Plugins", "UnrealJS",
+				LOCTEXT("RuntimeSettingsName", "UnrealJS"),
+				LOCTEXT("RuntimeSettingsDescription", "Configure the UnrealJS plugin"),
+				GetMutableDefault<UJavascriptSettings>());
+		}
+	}
+
+	void UnregisterSettings()
+	{
+		if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
+		{
+			SettingsModule->UnregisterSettings("Project", "Plugins", "UnrealJS");
+		}
+	}
 #endif
 };
 
@@ -86,6 +110,8 @@ static void PatchReimportRule()
 void FJavascriptEditorModule::StartupModule()
 {
 #if WITH_EDITOR	
+	RegisterSettings();
+
 	PatchReimportRule();
 
 	auto Isolate = NewObject<UJavascriptIsolate>();
@@ -117,6 +143,11 @@ void FJavascriptEditorModule::ShutdownModule()
 {
 #if WITH_EDITOR	
 	Unregister();
+
+	if (UObjectInitialized())
+	{
+		UnregisterSettings();
+	}
 #endif
 }
 

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

@@ -3,6 +3,7 @@
 #include "JavascriptContext.h"
 #include "IV8.h"
 #include "JavascriptStats.h"
+#include "JavascriptSettings.h"
 
 DEFINE_STAT(STAT_JavascriptDelegate);
 DEFINE_STAT(STAT_JavascriptProxy);
@@ -22,6 +23,13 @@ DEFINE_STAT(STAT_CodeSpace);
 DEFINE_STAT(STAT_MapSpace);
 DEFINE_STAT(STAT_LoSpace);
 
+UJavascriptSettings::UJavascriptSettings(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-debug-as=v8debug --expose-gc --harmony_destructuring --harmony_simd --harmony_default_parameters");
+	// --prof --prof_cpp --log-timer-events
+}
+
 using namespace v8;
 
 class V8Module : public IV8
@@ -40,13 +48,13 @@ class V8Module : public IV8
 		Paths.Add(GetPluginScriptsDirectory3());
 		Paths.Add(GetPakPluginScriptsDirectory());
 
+		const UJavascriptSettings& Settings = *GetDefault<UJavascriptSettings>();
+		V8::SetFlagsFromString(TCHAR_TO_ANSI(*Settings.V8Flags), strlen(TCHAR_TO_ANSI(*Settings.V8Flags)));
+
 		V8::InitializeICU();
 		platform_ = platform::CreateDefaultPlatform();
 		V8::InitializePlatform(platform_);
 		V8::Initialize();
-
-		auto v8flags = "--harmony --harmony-shipping --es-staging --expose-debug-as=v8debug --expose-gc --harmony_destructuring --harmony_simd --harmony_default_parameters ";
-		V8::SetFlagsFromString(v8flags, strlen(v8flags));
 	}
 
 	virtual void ShutdownModule() override

Plugins/UnrealJS/Source/V8/Public/JavascriptSettings.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "JavascriptSettings.generated.h"
+
+
+UCLASS(config = Engine, defaultconfig)
+class V8_API UJavascriptSettings
+	: public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+public:	
+	UPROPERTY(EditAnywhere, config, Category = Javascript, meta = (
+		ConsoleVariable = "unrealjs.v8flags", DisplayName = "V8 Flags",
+		ToolTip = "V8 Flags. Please refer to V8 documentation"))
+	FString V8Flags;	
+};