diff --git a/Source/JavascriptConsole/Private/JavascriptCommandExecutor.cpp b/Source/JavascriptConsole/Private/JavascriptCommandExecutor.cpp index b361aa7f..2e18fd39 100644 --- a/Source/JavascriptConsole/Private/JavascriptCommandExecutor.cpp +++ b/Source/JavascriptConsole/Private/JavascriptCommandExecutor.cpp @@ -112,7 +112,10 @@ bool FJavascriptCommandExecutor::CacheJavascriptContext() { // Use Editor context only const auto JavascriptContext = IJavascriptEditorModule::Get().GetJavascriptContext(); - TargetContext = JavascriptContext->ContextId; + if (JavascriptContext) + { + TargetContext = JavascriptContext->ContextId; + } } if (TargetContext.IsValid()) diff --git a/Source/JavascriptEditor/JavascriptEditorViewport.cpp b/Source/JavascriptEditor/JavascriptEditorViewport.cpp index c501ec7c..9cebe1fa 100644 --- a/Source/JavascriptEditor/JavascriptEditorViewport.cpp +++ b/Source/JavascriptEditor/JavascriptEditorViewport.cpp @@ -6,7 +6,7 @@ #include "Engine/Canvas.h" #include "Components/OverlaySlot.h" #include "AssetViewerSettings.h" -#include "Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" #include "Components/DirectionalLightComponent.h" #if ENGINE_MAJOR_VERSION > 4 #include "UnrealWidget.h" diff --git a/Source/JavascriptEditor/JavascriptUICommands.cpp b/Source/JavascriptEditor/JavascriptUICommands.cpp index aa89380d..bfa4d219 100644 --- a/Source/JavascriptEditor/JavascriptUICommands.cpp +++ b/Source/JavascriptEditor/JavascriptUICommands.cpp @@ -1,7 +1,7 @@ #include "JavascriptUICommands.h" #include "JavascriptMenuLibrary.h" #include "Framework/Commands/Commands.h" -#include "Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" //PRAGMA_DISABLE_OPTIMIZATION diff --git a/Source/JavascriptHttp/JavascriptHttpRequest.h b/Source/JavascriptHttp/JavascriptHttpRequest.h index e8182cc7..5dda2f96 100644 --- a/Source/JavascriptHttp/JavascriptHttpRequest.h +++ b/Source/JavascriptHttp/JavascriptHttpRequest.h @@ -7,7 +7,7 @@ #include "Interfaces/IHttpRequest.h" #include "Interfaces/IHttpResponse.h" #include "HttpModule.h" -#include "Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" #include "JavascriptHttpRequest.generated.h" diff --git a/Source/JavascriptUMG/JavascriptGameViewport.cpp b/Source/JavascriptUMG/JavascriptGameViewport.cpp index 08f80164..3e5f4e6b 100644 --- a/Source/JavascriptUMG/JavascriptGameViewport.cpp +++ b/Source/JavascriptUMG/JavascriptGameViewport.cpp @@ -8,7 +8,7 @@ #include "SceneView.h" #include "CanvasTypes.h" #include "Widgets/SViewport.h" -#include "Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" #define LOCTEXT_NAMESPACE "UMG" diff --git a/Source/JavascriptUMG/JavascriptWindow.cpp b/Source/JavascriptUMG/JavascriptWindow.cpp index 170f7511..8e704f90 100644 --- a/Source/JavascriptUMG/JavascriptWindow.cpp +++ b/Source/JavascriptUMG/JavascriptWindow.cpp @@ -1,6 +1,6 @@ #include "JavascriptWindow.h" #include "Widgets/SWindow.h" -#include "Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" UJavascriptWindow::UJavascriptWindow(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) diff --git a/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs b/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs index d8671e50..3a8f55b4 100644 --- a/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs +++ b/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs @@ -46,10 +46,10 @@ private void HackWebSocketIncludeDir(String WebsocketPath, ReadOnlyTargetRules T bHasZlib = true; } - else if (Target.Platform == UnrealTargetPlatform.Linux) - { - PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture); - } + // else if (Target.Platform == UnrealTargetPlatform.Linux) + // { + // PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture); + // } PrivateDependencyModuleNames.Add("libWebSockets"); diff --git a/Source/V8/Private/Inspector.cpp b/Source/V8/Private/Inspector.cpp index 7f9ee4a3..9f7a76f8 100644 --- a/Source/V8/Private/Inspector.cpp +++ b/Source/V8/Private/Inspector.cpp @@ -473,6 +473,13 @@ class FInspector : public IJavascriptInspector, public FTickableAnyObject, publi { static FName NAME_Javascript("Javascript"); + /* + * Crash at if (!maybe_console.IsEmpty()) + * when inspector is enabled! + */ + return; + + if (Category != NAME_Javascript) { HandleScope handle_scope(isolate_); diff --git a/Source/V8/Private/JavascriptContext_Private.cpp b/Source/V8/Private/JavascriptContext_Private.cpp index 6912005b..59dc6b74 100644 --- a/Source/V8/Private/JavascriptContext_Private.cpp +++ b/Source/V8/Private/JavascriptContext_Private.cpp @@ -31,6 +31,7 @@ #include "../../Launch/Resources/Version.h" + using namespace v8; static const int kContextEmbedderDataIndex = 0; @@ -1947,8 +1948,11 @@ class FJavascriptContextImplementation : public FJavascriptContext auto Function = *FuncIt; // Parse all function parameters. - uint8* Parms = (uint8*)FMemory_Alloca(Function->ParmsSize); - FMemory::Memzero(Parms, Function->ParmsSize); + TArray Parms = TArray();// = (uint8*)FMemory_Alloca(Function->ParmsSize); + //FMemory::Memzero(Parms, Function->ParmsSize); + Parms.SetNumUninitialized(Function->ParmsSize); + FMemory::Memzero(Parms.GetData(), Parms.Num()); + bool bHasDefault = false; TArray Parameters, ParametersWithDefaults; @@ -1963,7 +1967,7 @@ class FJavascriptContextImplementation : public FJavascriptContext if (!MetadataCppDefaultValue.IsEmpty()) { const uint32 ExportFlags = PPF_None; - auto Buffer = It->ContainerPtrToValuePtr(Parms); + auto Buffer = It->ContainerPtrToValuePtr(Parms.GetData()); #if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 1 const TCHAR* Result = It->ImportText_Direct(*MetadataCppDefaultValue, Buffer, nullptr, ExportFlags); @@ -1974,7 +1978,7 @@ class FJavascriptContextImplementation : public FJavascriptContext if (Result) { bHasDefault = true; - auto DefaultValue = Environment->ReadProperty(isolate(), Property, Parms, FNoPropertyOwner()); + auto DefaultValue = Environment->ReadProperty(isolate(), Property, Parms.GetData(), FNoPropertyOwner()); { auto ctx = context(); Context::Scope context_scope(ctx); @@ -1989,7 +1993,7 @@ class FJavascriptContextImplementation : public FJavascriptContext } } - It->DestroyValue_InContainer(Parms); + //It->DestroyValue_InContainer(Parms); } } Parameters.Add(Parameter); diff --git a/Source/V8/Private/JavascriptIsolate_Private.cpp b/Source/V8/Private/JavascriptIsolate_Private.cpp index 42b6a626..f577d28a 100644 --- a/Source/V8/Private/JavascriptIsolate_Private.cpp +++ b/Source/V8/Private/JavascriptIsolate_Private.cpp @@ -1788,7 +1788,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate auto Function = reinterpret_cast((Local::Cast(info.Data()))->Value()); // Determine 'this' - auto Object = (Function->FunctionFlags & FUNC_Static) ? Function->GetOwnerClass()->ClassDefaultObject : UObjectFromV8(isolate->GetCurrentContext(), self); + auto Object = (Function->FunctionFlags & FUNC_Static) ? Function->GetOwnerClass()->ClassDefaultObject.Get() : UObjectFromV8(isolate->GetCurrentContext(), self); // Check 'this' is valid if (!IsValid(Object)) diff --git a/Source/V8/Private/JavascriptLibrary.cpp b/Source/V8/Private/JavascriptLibrary.cpp index d9813155..91677be3 100644 --- a/Source/V8/Private/JavascriptLibrary.cpp +++ b/Source/V8/Private/JavascriptLibrary.cpp @@ -6,7 +6,7 @@ #include "Sockets.h" #include "NavigationSystem.h" #include "HAL/PlatformApplicationMisc.h" -#include "Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" #include "Misc/FileHelper.h" #include "Misc/Paths.h" #include "UObject/MetaData.h" diff --git a/Source/V8/Private/Translator.cpp b/Source/V8/Private/Translator.cpp index 704e31ee..c701d649 100644 --- a/Source/V8/Private/Translator.cpp +++ b/Source/V8/Private/Translator.cpp @@ -1,6 +1,6 @@ #include "Translator.h" #include "Engine/UserDefinedStruct.h" -#include "Launch/Resources/Version.h" +#include "Runtime/Launch/Resources/Version.h" namespace v8 { diff --git a/Source/V8/V8.Build.cs b/Source/V8/V8.Build.cs index d7396264..abe53bbd 100644 --- a/Source/V8/V8.Build.cs +++ b/Source/V8/V8.Build.cs @@ -83,10 +83,10 @@ private void HackWebSocketIncludeDir(String WebsocketPath, ReadOnlyTargetRules T bHasZlib = true; } - else if (Target.Platform == UnrealTargetPlatform.Linux) - { - PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture); - } + // else if (Target.Platform == UnrealTargetPlatform.Linux) + // { + // PlatformSubdir = Path.Combine(PlatformSubdir, Target.Architecture); + // } PrivateDependencyModuleNames.Add("libWebSockets"); diff --git a/UnrealJS.uplugin b/UnrealJS.uplugin index eff3a885..01ae0d9b 100644 --- a/UnrealJS.uplugin +++ b/UnrealJS.uplugin @@ -4,7 +4,6 @@ "Version": 2, "VersionName": "0.6.4", "FriendlyVersion": "0.6.4", - "EngineVersion": "5.1.0", "Description": "Javascript powered UnrealEngine", "Category": "Programming", "CreatedBy": "NCSOFT Corporation",