diff --git a/Source/JavascriptEditor/JavascriptEdMode.cpp b/Source/JavascriptEditor/JavascriptEdMode.cpp index 55dfa4ed..290ea73b 100644 --- a/Source/JavascriptEditor/JavascriptEdMode.cpp +++ b/Source/JavascriptEditor/JavascriptEdMode.cpp @@ -388,7 +388,7 @@ class FJavascriptEdModeFactory : public IEditorModeFactory, public FGCObject return MakeShareable(new FJavascriptEdModeInstance(Parent)); } -#if ENGINE_MINOR_VERSION < 26 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26 virtual UEdMode* CreateScriptableMode() const override { return nullptr; diff --git a/Source/JavascriptEditor/JavascriptEditor.Build.cs b/Source/JavascriptEditor/JavascriptEditor.Build.cs index cd717887..421b4b14 100644 --- a/Source/JavascriptEditor/JavascriptEditor.Build.cs +++ b/Source/JavascriptEditor/JavascriptEditor.Build.cs @@ -1,8 +1,9 @@ -using UnrealBuildTool; +using System; +using UnrealBuildTool; public class JavascriptEditor : ModuleRules { - public static bool IsVREditorNeeded() + public static Int32[] ParseEditorVersions() { string[] VersionHeader = Utils.ReadAllText("../Source/Runtime/Launch/Resources/Version.h").Replace("\r\n", "\n").Replace("\t", " ").Split('\n'); string EngineVersionMajor = "4"; @@ -18,7 +19,7 @@ public static bool IsVREditorNeeded() EngineVersionMinor = Line.Split(' ')[2]; } } - return System.Int32.Parse(EngineVersionMajor) == 4 && System.Int32.Parse(EngineVersionMinor) >= 14; + return new Int32[] { System.Int32.Parse(EngineVersionMajor), System.Int32.Parse(EngineVersionMinor) }; } public JavascriptEditor(ReadOnlyTargetRules Target) : base(Target) @@ -54,7 +55,12 @@ public JavascriptEditor(ReadOnlyTargetRules Target) : base(Target) } ); - if (IsVREditorNeeded()) + var vers = ParseEditorVersions(); + var EngineMajorVer = vers[0]; + var EngineMinorVer = vers[1]; + + // Is VREditor Needed? + if (EngineMajorVer > 4 || EngineMinorVer >= 14) { PrivateDependencyModuleNames.AddRange(new string []{ "LevelEditor", "ViewportInteraction", "VREditor" }); } @@ -95,19 +101,24 @@ public JavascriptEditor(ReadOnlyTargetRules Target) : base(Target) "StaticMeshEditor" } ); + + if (EngineMajorVer > 4) + { + PrivateDependencyModuleNames.Add("EditorFramework"); + } } - // Uncomment if you are using Slate UI - // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); + // Uncomment if you are using Slate UI + // PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" }); - // Uncomment if you are using online features - // PrivateDependencyModuleNames.Add("OnlineSubsystem"); - // if ((Target.Platform == UnrealTargetPlatform.Win32) || (Target.Platform == UnrealTargetPlatform.Win64)) - // { - // if (UEBuildConfiguration.bCompileSteamOSS == true) - // { - // DynamicallyLoadedModuleNames.Add("OnlineSubsystemSteam"); - // } - // } - } + // Uncomment if you are using online features + // PrivateDependencyModuleNames.Add("OnlineSubsystem"); + // if (Target.IsInPlatformGroup(UnrealPlatformGroup.Windows)) + // { + // if (UEBuildConfiguration.bCompileSteamOSS == true) + // { + // DynamicallyLoadedModuleNames.Add("OnlineSubsystemSteam"); + // } + // } + } } diff --git a/Source/JavascriptEditor/JavascriptEditorLibrary.cpp b/Source/JavascriptEditor/JavascriptEditorLibrary.cpp index 42a3c30a..b3630826 100644 --- a/Source/JavascriptEditor/JavascriptEditorLibrary.cpp +++ b/Source/JavascriptEditor/JavascriptEditorLibrary.cpp @@ -60,7 +60,9 @@ #include "Engine/DataTable.h" #include "Engine/EngineTypes.h" -#include "Toolkits/AssetEditorManager.h" +#if ENGINE_MAJOR_VERSION == 4 + #include "Toolkits/AssetEditorManager.h" +#endif #include "Kismet2/KismetEditorUtilities.h" #if WITH_EDITOR @@ -202,18 +204,30 @@ void UJavascriptEditorLibrary::OpenPopupWindow(UWidget* Widget, const FVector2D& void UJavascriptEditorLibrary::GetAllTags(const FJavascriptAssetData& AssetData, TArray& OutArray) { +#if ENGINE_MAJOR_VERSION > 4 + AssetData.SourceAssetData.TagsAndValues.CopyMap().GetKeys(OutArray); +#else AssetData.SourceAssetData.TagsAndValues.GetKeys(OutArray); +#endif } bool UJavascriptEditorLibrary::GetTagValue(const FJavascriptAssetData& AssetData, const FName& Name, FString& OutValue) { +#if ENGINE_MAJOR_VERSION > 4 + auto Value = AssetData.SourceAssetData.TagsAndValues.FindTag(Name); + if (Value.IsSet()) + { + OutValue = Value.GetValue(); + return true; + } +#else auto Value = AssetData.SourceAssetData.TagsAndValues.GetMap().Find(Name); - if (Value) { OutValue = *Value; return true; } +#endif else { return false; @@ -496,7 +510,7 @@ void UJavascriptEditorLibrary::DrawPolygon(const FJavascriptPDI& PDI, const TArr } static auto TransparentPlaneMaterialXY = (UMaterial*)StaticLoadObject(UMaterial::StaticClass(), NULL, TEXT("/Engine/EditorMaterials/WidgetVertexColorMaterial.WidgetVertexColorMaterial"), NULL, LOAD_None, NULL); -#if ENGINE_MINOR_VERSION < 22 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22 MeshBuilder.Draw(PDI.PDI, FMatrix::Identity, TransparentPlaneMaterialXY->GetRenderProxy(false), DepthPriority, 0.f); #else MeshBuilder.Draw(PDI.PDI, FMatrix::Identity, TransparentPlaneMaterialXY->GetRenderProxy(), DepthPriority, 0.f); @@ -691,7 +705,11 @@ FJavascriptSlateWidget UJavascriptEditorLibrary::GetRootWindow() void UJavascriptEditorLibrary::CreatePropertyEditorToolkit(TArray ObjectsForPropertiesMenu) { FPropertyEditorModule& PropertyEditorModule = FModuleManager::LoadModuleChecked("PropertyEditor"); +#if ENGINE_MAJOR_VERSION > 4 + PropertyEditorModule.CreatePropertyEditorToolkit(TSharedPtr(), ObjectsForPropertiesMenu); +#else PropertyEditorModule.CreatePropertyEditorToolkit(EToolkitMode::Standalone, TSharedPtr(), ObjectsForPropertiesMenu); +#endif } static FName NAME_LevelEditor("LevelEditor"); @@ -1310,7 +1328,7 @@ bool UJavascriptEditorLibrary::LoadImageFromDiskAsync(const FString& ImagePath, { Texture->SRGB = true; Texture->UpdateResource(); -#if ENGINE_MINOR_VERSION < 22 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22 ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER( FWriteRawDataToTexture, FTexture2DDynamicResource*, TextureResource, static_cast(Texture->Resource), @@ -1432,7 +1450,7 @@ FString UJavascriptEditorLibrary::GetDataTableAsJSON(UDataTable* InDataTable, ui void UJavascriptEditorLibrary::AddRichCurve(UCurveTable* InCurveTable, const FName& Key, const FRichCurve& InCurve) { -#if ENGINE_MINOR_VERSION < 22 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22 FRichCurve* NewCurve = new FRichCurve(); NewCurve->SetKeys(InCurve.GetConstRefOfKeys()); NewCurve->PreInfinityExtrap = InCurve.PreInfinityExtrap; diff --git a/Source/JavascriptEditor/JavascriptEditorViewport.cpp b/Source/JavascriptEditor/JavascriptEditorViewport.cpp index 00bada0d..03fbeabb 100644 --- a/Source/JavascriptEditor/JavascriptEditorViewport.cpp +++ b/Source/JavascriptEditor/JavascriptEditorViewport.cpp @@ -8,11 +8,20 @@ #include "AssetViewerSettings.h" #include "Launch/Resources/Version.h" #include "Components/DirectionalLightComponent.h" +#if ENGINE_MAJOR_VERSION > 4 + #include "UnrealWidget.h" +#endif #define LOCTEXT_NAMESPACE "JavascriptEditor" PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS +#if ENGINE_MAJOR_VERSION > 4 + namespace WidgetAlias = UE::Widget; +#else + using WidgetAlias = FWidget; +#endif + class FJavascriptPreviewScene : public FAdvancedPreviewScene { public: @@ -38,7 +47,7 @@ class FJavascriptPreviewScene : public FAdvancedPreviewScene { return SkyComponent; } -#if ENGINE_MINOR_VERSION < 23 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23 class USphereReflectionCaptureComponent* GetDefaultSphereReflectionComponent() { return SphereReflectionComponent; @@ -208,11 +217,11 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient } } - virtual FWidget::EWidgetMode GetWidgetMode() const override + virtual WidgetAlias::EWidgetMode GetWidgetMode() const override { if (Widget.IsValid() && Widget->OnGetWidgetMode.IsBound()) { - return (FWidget::EWidgetMode)Widget->OnGetWidgetMode.Execute(Widget.Get()); + return (WidgetAlias::EWidgetMode)Widget->OnGetWidgetMode.Execute(Widget.Get()); } else { @@ -265,7 +274,7 @@ class FJavascriptEditorViewportClient : public FEditorViewportClient { for (FActorIterator It(PreviewScene->GetWorld()); It; ++It) { -#if ENGINE_MINOR_VERSION > 14 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 14) || ENGINE_MAJOR_VERSION > 4 It->DispatchBeginPlay(); #else if (It->HasActorBegunPlay() == false) @@ -447,13 +456,13 @@ class SAutoRefreshEditorViewport : public SEditorViewport void SetWidgetMode(EJavascriptWidgetMode WidgetMode) { - EditorViewportClient->SetWidgetMode(WidgetMode == EJavascriptWidgetMode::WM_None ? FWidget::WM_None : (FWidget::EWidgetMode)WidgetMode); + EditorViewportClient->SetWidgetMode(WidgetMode == EJavascriptWidgetMode::WM_None ? WidgetAlias::WM_None : (WidgetAlias::EWidgetMode)WidgetMode); } EJavascriptWidgetMode GetWidgetMode() { - FWidget::EWidgetMode WidgetMode = EditorViewportClient->GetWidgetMode(); - return FWidget::WM_None ? EJavascriptWidgetMode::WM_None : (EJavascriptWidgetMode)WidgetMode; + WidgetAlias::EWidgetMode WidgetMode = EditorViewportClient->GetWidgetMode(); + return WidgetAlias::WM_None ? EJavascriptWidgetMode::WM_None : (EJavascriptWidgetMode)WidgetMode; } FString GetEngineShowFlags() @@ -508,7 +517,7 @@ class SAutoRefreshEditorViewport : public SEditorViewport { return PreviewScene.GetDefaultSkySphereComponent(); } -#if ENGINE_MINOR_VERSION < 23 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23 class USphereReflectionCaptureComponent* GetDefaultSphereReflectionComponent() { return PreviewScene.GetDefaultSphereReflectionComponent(); @@ -534,7 +543,7 @@ class SAutoRefreshEditorViewport : public SEditorViewport UStaticMeshComponent* Component = *Itr; if (Component && Component->GetOwner() == nullptr) { -#if ENGINE_MINOR_VERSION >= 14 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14) || ENGINE_MAJOR_VERSION > 4 auto StaticMesh = Component->GetStaticMesh(); #else auto StaticMesh = Component->StaticMesh; @@ -838,7 +847,7 @@ void UJavascriptEditorViewport::DeprojectScreenToWorld(const FVector2D &ScreenPo FSceneViewFamilyContext ViewFamily(FSceneViewFamily::ConstructionValues( ViewportWidget->EditorViewportClient->Viewport, ViewportWidget->EditorViewportClient->GetScene(), ViewportWidget->EditorViewportClient->EngineShowFlags )); FSceneView* View = ViewportWidget->EditorViewportClient->CalcSceneView(&ViewFamily); -#if ENGINE_MINOR_VERSION >= 14 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14) || ENGINE_MAJOR_VERSION > 4 const auto& InvViewProjMatrix = View->ViewMatrices.GetInvViewProjectionMatrix(); #else const auto& InvViewProjMatrix = View->ViewMatrices.GetInvViewProjMatrix(); @@ -854,7 +863,7 @@ void UJavascriptEditorViewport::ProjectWorldToScreen(const FVector &WorldPositio FSceneViewFamilyContext ViewFamily(FSceneViewFamily::ConstructionValues( ViewportWidget->EditorViewportClient->Viewport, ViewportWidget->EditorViewportClient->GetScene(), ViewportWidget->EditorViewportClient->EngineShowFlags )); FSceneView* View = ViewportWidget->EditorViewportClient->CalcSceneView(&ViewFamily); -#if ENGINE_MINOR_VERSION >= 14 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14) || ENGINE_MAJOR_VERSION > 4 const auto& ViewProjMatrix = View->ViewMatrices.GetViewProjectionMatrix(); #else const auto& ViewProjMatrix = View->ViewMatrices.GetViewProjMatrix(); @@ -970,7 +979,7 @@ class UStaticMeshComponent* UJavascriptEditorViewport::GetDefaultSkySphereCompon class USphereReflectionCaptureComponent* UJavascriptEditorViewport::GetDefaultSphereReflectionComponent() { -#if ENGINE_MINOR_VERSION < 23 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23 if (ViewportWidget.IsValid()) { return ViewportWidget->GetDefaultSphereReflectionComponent(); diff --git a/Source/JavascriptEditor/JavascriptMenuLibrary.cpp b/Source/JavascriptEditor/JavascriptMenuLibrary.cpp index faab5d74..7307ce61 100644 --- a/Source/JavascriptEditor/JavascriptMenuLibrary.cpp +++ b/Source/JavascriptEditor/JavascriptMenuLibrary.cpp @@ -89,7 +89,11 @@ void UJavascriptMenuLibrary::AddSeparator(FJavascriptMenuBuilder& Builder) else if (Builder.ToolMenu) { FToolMenuSection& Section = Builder.ToolMenu->Sections.Num() > 0 ? Builder.ToolMenu->Sections.Top() : Builder.ToolMenu->AddSection(FName()); +#if ENGINE_MAJOR_VERSION > 4 Section.AddSeparator(FName()); +#else + Section.AddMenuSeparator(FName()); +#endif } } @@ -152,7 +156,7 @@ void UJavascriptMenuLibrary::AddMenuEntry(FJavascriptMenuBuilder& Builder, UJava DefaultAction.CanExecuteAction = FCanExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_CanExecute); DefaultAction.ExecuteAction = FExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_Execute); DefaultAction.GetActionCheckState = FGetActionCheckState::CreateUObject(Object, &UJavascriptMenuContext::Public_GetActionCheckState); -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 const EUserInterfaceActionType CommandType = EUserInterfaceActionType(Object->ActionType.GetValue()); #else const EUserInterfaceActionType::Type CommandType = EUserInterfaceActionType::Type(Object->ActionType.GetValue()); @@ -172,7 +176,7 @@ void UJavascriptMenuLibrary::AddMenuEntry(FJavascriptMenuBuilder& Builder, UJava DefaultAction.CanExecuteAction = FCanExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_CanExecute); DefaultAction.ExecuteAction = FExecuteAction::CreateUObject(Object, &UJavascriptMenuContext::Public_Execute); DefaultAction.GetActionCheckState = FGetActionCheckState::CreateUObject(Object, &UJavascriptMenuContext::Public_GetActionCheckState); -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 const EUserInterfaceActionType CommandType = EUserInterfaceActionType(Object->ActionType.GetValue()); #else const EUserInterfaceActionType::Type CommandType = EUserInterfaceActionType::Type(Object->ActionType.GetValue()); @@ -318,7 +322,7 @@ FJavascriptUICommandInfo UJavascriptMenuLibrary::UI_COMMAND_Function(FJavascript const FString DotOutCommandName = FString::Printf(TEXT(".%s"), *info.Id); const TCHAR* FriendlyName = *info.FriendlyName; const TCHAR* InDescription = *info.Description; -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 const EUserInterfaceActionType CommandType = EUserInterfaceActionType(info.ActionType.GetValue()); #else const EUserInterfaceActionType::Type CommandType = EUserInterfaceActionType::Type(info.ActionType.GetValue()); diff --git a/Source/JavascriptEditor/JavascriptUICommands.cpp b/Source/JavascriptEditor/JavascriptUICommands.cpp index 31a7078a..aa89380d 100644 --- a/Source/JavascriptEditor/JavascriptUICommands.cpp +++ b/Source/JavascriptEditor/JavascriptUICommands.cpp @@ -64,7 +64,7 @@ void UJavascriptUICommands::Uninitialize() void UJavascriptUICommands::BroadcastCommandsChanged(const FString& InContextName) { -#if ENGINE_MINOR_VERSION > 14 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 14) || ENGINE_MAJOR_VERSION > 4 TSharedPtr ExistingBindingContext = FInputBindingManager::Get().GetContextByName(*InContextName); if (ExistingBindingContext.IsValid()) { diff --git a/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.cpp b/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.cpp index 410d37ef..7b9ec0a0 100644 --- a/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.cpp +++ b/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.cpp @@ -76,7 +76,7 @@ void UJavascriptGraphAssetGraphSchema::GetGraphContextActions(FGraphContextMenuB } } -#if ENGINE_MINOR_VERSION < 24 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 24 void UJavascriptGraphAssetGraphSchema::GetContextMenuActions(const UEdGraph* CurrentGraph, const UEdGraphNode* InGraphNode, const UEdGraphPin* InGraphPin, class FMenuBuilder* MenuBuilder, bool bIsDebugging) const { if (OnBuildMenu.IsBound()) diff --git a/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.h b/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.h index bab5132c..44f1655d 100644 --- a/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.h +++ b/Source/JavascriptGraphEditor/JavascriptGraphAssetGraphSchema.h @@ -293,7 +293,7 @@ class UJavascriptGraphAssetGraphSchema : public UEdGraphSchema //~ Begin EdGraphSchema Interface virtual void GetGraphContextActions(FGraphContextMenuBuilder& ContextMenuBuilder) const override; -#if ENGINE_MINOR_VERSION < 24 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 24 virtual void GetContextMenuActions(const UEdGraph* CurrentGraph, const UEdGraphNode* InGraphNode, const UEdGraphPin* InGraphPin, class FMenuBuilder* MenuBuilder, bool bIsDebugging) const override; #else virtual void GetContextMenuActions(class UToolMenu* Menu, class UGraphNodeContextMenuContext* Context) const override; diff --git a/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.cpp b/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.cpp index 678c03c3..455bf480 100644 --- a/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.cpp +++ b/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.cpp @@ -241,7 +241,7 @@ FJavascriptArrangedWidget UJavascriptGraphEditorLibrary::FindPinGeometries(FJava FJavascriptPinWidget UJavascriptGraphEditorLibrary::FindPinToPinWidgetMap(FJavascriptDetermineLinkGeometryContainer Container, FJavascriptEdGraphPin Pin) { FJavascriptPinWidget Widget = FJavascriptPinWidget(); -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 TSharedPtr* SGraphPinHandle = Container.PinToPinWidgetMap->Find(Pin); if (SGraphPinHandle) { diff --git a/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.h b/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.h index e0e7362f..6695142b 100644 --- a/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.h +++ b/Source/JavascriptGraphEditor/JavascriptGraphEditorLibrary.h @@ -105,7 +105,7 @@ struct FJavascriptDetermineLinkGeometryContainer TSharedRef* InOutputPinWidget, TMap* InNodeWidgetMap, TMap, FArrangedWidget>* InPinGeometries, -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 TMap< UEdGraphPin*, TSharedPtr >* InPinToPinWidgetMap #else TMap< UEdGraphPin*, TSharedRef >* InPinToPinWidgetMap @@ -124,7 +124,7 @@ struct FJavascriptDetermineLinkGeometryContainer TMap* NodeWidgetMap; TMap, FArrangedWidget>* PinGeometries; -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 TMap< UEdGraphPin*, TSharedPtr >* PinToPinWidgetMap; #else TMap< UEdGraphPin*, TSharedRef >* PinToPinWidgetMap; diff --git a/Source/JavascriptGraphEditor/JavascriptGraphTextPropertyEditableTextBox.cpp b/Source/JavascriptGraphEditor/JavascriptGraphTextPropertyEditableTextBox.cpp index da51c21b..16c1dcf3 100644 --- a/Source/JavascriptGraphEditor/JavascriptGraphTextPropertyEditableTextBox.cpp +++ b/Source/JavascriptGraphEditor/JavascriptGraphTextPropertyEditableTextBox.cpp @@ -36,7 +36,7 @@ class FJavascriptEditableTextGraphPin : public IEditableTextProperty virtual bool IsDefaultValue() const override { FString TextAsString; -#if ENGINE_MINOR_VERSION < 22 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22 if (FTextStringHelper::WriteToString(TextAsString, GraphPinObj->DefaultTextValue)) { return TextAsString.Equals(GraphPinObj->AutogeneratedDefaultValue, ESearchCase::CaseSensitive); diff --git a/Source/JavascriptGraphEditor/SJavascriptGraphEdNodePin.cpp b/Source/JavascriptGraphEditor/SJavascriptGraphEdNodePin.cpp index 1fcd7fc5..b7ec9b2f 100644 --- a/Source/JavascriptGraphEditor/SJavascriptGraphEdNodePin.cpp +++ b/Source/JavascriptGraphEditor/SJavascriptGraphEdNodePin.cpp @@ -7,6 +7,8 @@ #include "Widgets/SBoxPanel.h" #include "Components/Widget.h" +PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS + void SJavascriptGraphPin::Construct(const FArguments& InArgs, UEdGraphPin* InPin) { this->SetCursor(EMouseCursor::Default); @@ -95,7 +97,7 @@ void SJavascriptGraphPin::Construct(const FArguments& InArgs, UEdGraphPin* InPin } } // Create the widget used for the pin body (status indicator, label, and value) -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 LabelAndValue = #else TSharedRef LabelAndValue = @@ -173,7 +175,7 @@ void SJavascriptGraphPin::Construct(const FArguments& InArgs, UEdGraphPin* InPin .AutoWidth() .VAlign(VAlign_Center) [ -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 LabelAndValue.ToSharedRef() #else LabelAndValue @@ -188,7 +190,7 @@ void SJavascriptGraphPin::Construct(const FArguments& InArgs, UEdGraphPin* InPin .AutoWidth() .VAlign(VAlign_Center) [ -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 LabelAndValue.ToSharedRef() #else LabelAndValue diff --git a/Source/JavascriptHttp/JavascriptHttpRequest.cpp b/Source/JavascriptHttp/JavascriptHttpRequest.cpp index 6b65c4b6..38f1231b 100644 --- a/Source/JavascriptHttp/JavascriptHttpRequest.cpp +++ b/Source/JavascriptHttp/JavascriptHttpRequest.cpp @@ -15,7 +15,7 @@ typedef FTickableGameObject FTickableRequest; struct FHttpProcessor : public FTickableRequest { public: -#if ENGINE_MINOR_VERSION < 26 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26 FHttpProcessor(TSharedPtr InRef) #else FHttpProcessor(FHttpRequestPtr InRef) @@ -23,7 +23,7 @@ struct FHttpProcessor : public FTickableRequest : Ref(InRef) {} -#if ENGINE_MINOR_VERSION < 26 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26 TSharedPtr Ref; #else FHttpRequestPtr Ref = nullptr; diff --git a/Source/JavascriptHttp/JavascriptHttpRequest.h b/Source/JavascriptHttp/JavascriptHttpRequest.h index 78d77a9f..e8182cc7 100644 --- a/Source/JavascriptHttp/JavascriptHttpRequest.h +++ b/Source/JavascriptHttp/JavascriptHttpRequest.h @@ -41,7 +41,7 @@ class JAVASCRIPTHTTP_API UJavascriptHttpRequest : public UObject GENERATED_UCLASS_BODY() public: -#if ENGINE_MINOR_VERSION < 26 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26 TSharedPtr Request; #else FHttpRequestPtr Request = nullptr; diff --git a/Source/JavascriptUMG/JavascriptGameViewport.cpp b/Source/JavascriptUMG/JavascriptGameViewport.cpp index 94752cb1..1cda5381 100644 --- a/Source/JavascriptUMG/JavascriptGameViewport.cpp +++ b/Source/JavascriptUMG/JavascriptGameViewport.cpp @@ -110,7 +110,7 @@ void FJavascriptUMGViewportClient::Tick(float InDeltaTime) { for (FActorIterator It(GameScene->GetWorld()); It; ++It) { -#if ENGINE_MINOR_VERSION > 14 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 14) || ENGINE_MAJOR_VERSION > 4 It->DispatchBeginPlay(); #else if (It->HasActorBegunPlay() == false) diff --git a/Source/JavascriptUMG/JavascriptTileView.cpp b/Source/JavascriptUMG/JavascriptTileView.cpp index 5b635d35..0a066589 100644 --- a/Source/JavascriptUMG/JavascriptTileView.cpp +++ b/Source/JavascriptUMG/JavascriptTileView.cpp @@ -10,7 +10,7 @@ TSharedRef UJavascriptTileView::RebuildListWidget() { MyTileView = SNew(STileView< UObject* >) .SelectionMode(SelectionMode) - .ListItemsSource(&ListItems) + .ListItemsSource(&TileListItems) .ItemHeight(EntryHeight) .OnSelectionChanged_Lambda([this](UObject* Object, ESelectInfo::Type SelectInfo){ OnSelectionChanged(Object, SelectInfo); diff --git a/Source/JavascriptUMG/JavascriptTileView.h b/Source/JavascriptUMG/JavascriptTileView.h index 4ede61ac..6e0619f0 100644 --- a/Source/JavascriptUMG/JavascriptTileView.h +++ b/Source/JavascriptUMG/JavascriptTileView.h @@ -34,4 +34,7 @@ class JAVASCRIPTUMG_API UJavascriptTileView : public UTileView // UObject interface virtual void ProcessEvent(UFunction* Function, void* Parms) override; // End of UObject interface + + UPROPERTY(Transient) + TArray TileListItems; }; diff --git a/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs b/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs index 494cbda9..ecdb63a4 100644 --- a/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs +++ b/Source/JavascriptWebSocket/JavascriptWebSocket.Build.cs @@ -18,8 +18,7 @@ public JavascriptWebSocket(ReadOnlyTargetRules Target) : base(Target) }); bool bPlatformSupportsLibWebsockets = - Target.Platform == UnrealTargetPlatform.Win32 || - Target.Platform == UnrealTargetPlatform.Win64 || + Target.IsInPlatformGroup(UnrealPlatformGroup.Windows) || Target.Platform == UnrealTargetPlatform.Android || Target.Platform == UnrealTargetPlatform.Mac || Target.IsInPlatformGroup(UnrealPlatformGroup.Unix); @@ -41,7 +40,7 @@ private void HackWebSocketIncludeDir(String WebsocketPath, ReadOnlyTargetRules T bool bHasZlib = false; - if (Target.Platform == UnrealTargetPlatform.Win64 || Target.Platform == UnrealTargetPlatform.Win32) + if (Target.IsInPlatformGroup(UnrealPlatformGroup.Windows)) { PlatformSubdir = Path.Combine(PlatformSubdir, "VS" + Target.WindowsPlatform.GetVisualStudioCompilerVersionName()); bHasZlib = true; diff --git a/Source/V8/Private/Delegates.cpp b/Source/V8/Private/Delegates.cpp index b3f4b98c..54ed04b0 100644 --- a/Source/V8/Private/Delegates.cpp +++ b/Source/V8/Private/Delegates.cpp @@ -228,7 +228,7 @@ class FJavascriptDelegate : public FGCObject, public TSharedFromThis 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 p->AddDelegate(Delegate, WeakObject.Get()); #else auto Target = p->GetPropertyValuePtr_InContainer(WeakObject.Get()); @@ -258,7 +258,7 @@ class FJavascriptDelegate : public FGCObject, public TSharedFromThis 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 p->RemoveDelegate(Delegate, WeakObject.Get()); #else auto Target = p->GetPropertyValuePtr_InContainer(WeakObject.Get()); diff --git a/Source/V8/Private/Inspector.cpp b/Source/V8/Private/Inspector.cpp index dccaac6c..c2826e21 100644 --- a/Source/V8/Private/Inspector.cpp +++ b/Source/V8/Private/Inspector.cpp @@ -8,7 +8,7 @@ PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS -#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 14) || ENGINE_MAJOR_VERSION > 4 static const int32 CONTEXT_GROUP_ID = 1; #if PLATFORM_WINDOWS diff --git a/Source/V8/Private/JavascriptContext_Private.cpp b/Source/V8/Private/JavascriptContext_Private.cpp index 7c382941..c33574f2 100644 --- a/Source/V8/Private/JavascriptContext_Private.cpp +++ b/Source/V8/Private/JavascriptContext_Private.cpp @@ -131,7 +131,7 @@ static void SetClassFlags(UClass* Class, const TArray& Flags) { TEXT("Abstract"), CLASS_Abstract }, { TEXT("DefaultConfig"), CLASS_DefaultConfig }, { TEXT("Transient"), CLASS_Transient }, -#if ENGINE_MINOR_VERSION < 26 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26 { TEXT("AdvancedDisplay"), CLASS_AdvancedDisplay }, #endif { TEXT("NotPlaceable"), CLASS_NotPlaceable }, @@ -1075,7 +1075,7 @@ class FJavascriptContextImplementation : public FJavascriptContext else Class->GetDefaultObject(); -#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 12 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 12) || ENGINE_MAJOR_VERSION > 4 // Assemble reference token stream for garbage collection/ RTGC. if (!Class->HasAnyClassFlags(CLASS_TokenStreamAssembled)) { @@ -1171,7 +1171,7 @@ class FJavascriptContextImplementation : public FJavascriptContext Class->GetDefaultObject(true); -#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 12 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 12) || ENGINE_MAJOR_VERSION > 4 // Assemble reference token stream for garbage collection/ RTGC. Class->AssembleReferenceTokenStream(true); #endif diff --git a/Source/V8/Private/JavascriptIsolate_Private.cpp b/Source/V8/Private/JavascriptIsolate_Private.cpp index 62e7e81d..c35eef8b 100644 --- a/Source/V8/Private/JavascriptIsolate_Private.cpp +++ b/Source/V8/Private/JavascriptIsolate_Private.cpp @@ -748,7 +748,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate for (int Index = 0; Index < Num; ++Index) { uint8* PairPtr = MapHelper.GetPairPtr(Index); -#if ENGINE_MINOR_VERSION < 22 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22 auto Key = InternalReadProperty(p->KeyProp, PairPtr + p->MapLayout.KeyOffset, Owner, Flags); #else auto Key = InternalReadProperty(p->KeyProp, PairPtr, Owner, Flags); @@ -1109,7 +1109,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate MapHelper.Rehash(); uint8* PairPtr = MapHelper.GetPairPtr(ElementIndex); -#if ENGINE_MINOR_VERSION < 22 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22 InternalWriteProperty(p->KeyProp, PairPtr + p->MapLayout.KeyOffset, Key, Owner, Flags); #else InternalWriteProperty(p->KeyProp, PairPtr, Key, Owner, Flags); @@ -1980,7 +1980,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate bool bTransient = info.Length() > 1 ? info[1]->BooleanValue(isolate) : false; bool bIsRequired = info.Length() > 2 ? info[2]->BooleanValue(isolate) : true; bool bIsAbstract = info.Length() > 3 ? info[3]->BooleanValue(isolate) : false; -#if ENGINE_MINOR_VERSION < 23 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23 auto Object = ObjectInitializer->CreateDefaultSubobject(ObjectInitializer->GetObj(), *Name, ReturnType, ReturnType, bIsRequired, bIsAbstract, bTransient); #else auto Object = ObjectInitializer->CreateDefaultSubobject(ObjectInitializer->GetObj(), *Name, ReturnType, ReturnType, bIsRequired, bTransient); @@ -2967,7 +2967,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate void SetWeak(UniquePersistent& Handle, T* GarbageCollectedObject) { typedef TPair WeakData; -#if ENGINE_MINOR_VERSION < 26 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 26 typedef typename WeakData::KeyType WeakDataKeyInitType; typedef typename WeakData::ValueType WeakDataValueInitType; typedef TPairInitializer InitializerType; diff --git a/Source/V8/Private/JavascriptLibrary.cpp b/Source/V8/Private/JavascriptLibrary.cpp index 5e4c3c1a..f6dcd6c7 100644 --- a/Source/V8/Private/JavascriptLibrary.cpp +++ b/Source/V8/Private/JavascriptLibrary.cpp @@ -59,7 +59,7 @@ bool UJavascriptLibrary::ResolveIp(FString HostName, FString& OutIp) auto SocketSub = ISocketSubsystem::Get(); TSharedRef HostAddr = SocketSub->CreateInternetAddr(); -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 FAddressInfoResult GAIResult = SocketSub->GetAddressInfo(*HostName, nullptr, EAddressInfoFlags::Default, NAME_None); if (GAIResult.Results.Num() > 0) { @@ -718,22 +718,22 @@ FJavascriptStreamableManager UJavascriptLibrary::CreateStreamableManager() return{ MakeShareable(new FStreamableManager) }; } -void UJavascriptLibrary::SimpleAsyncLoad(const FJavascriptStreamableManager& Manager, FStringAssetReference const& Target, int32 Priority) +void UJavascriptLibrary::SimpleAsyncLoad(const FJavascriptStreamableManager& Manager, FSoftObjectPath const& Target, int32 Priority) { Manager->RequestAsyncLoad(Target, FStreamableDelegate(), Priority, true); } -void UJavascriptLibrary::Unload(const FJavascriptStreamableManager& Manager, FStringAssetReference const& Target) +void UJavascriptLibrary::Unload(const FJavascriptStreamableManager& Manager, FSoftObjectPath const& Target) { Manager->Unload(Target); } -bool UJavascriptLibrary::IsAsyncLoadComplete(const FJavascriptStreamableManager& Manager, FStringAssetReference const& Target) +bool UJavascriptLibrary::IsAsyncLoadComplete(const FJavascriptStreamableManager& Manager, FSoftObjectPath const& Target) { return Manager->IsAsyncLoadComplete(Target); } -void UJavascriptLibrary::RequestAsyncLoad(const FJavascriptStreamableManager& Manager, const TArray& TargetsToStream, FJavascriptFunction DelegateToCall, int32 Priority) +void UJavascriptLibrary::RequestAsyncLoad(const FJavascriptStreamableManager& Manager, const TArray& TargetsToStream, FJavascriptFunction DelegateToCall, int32 Priority) { auto Copy = new FJavascriptFunction; *Copy = DelegateToCall; @@ -854,7 +854,7 @@ FJavascriptStat UJavascriptLibrary::NewStat( { FJavascriptStat Out; #if STATS -#if ENGINE_MINOR_VERSION > 20 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 20) || ENGINE_MAJOR_VERSION > 4 ANSICHAR StatName[NAME_SIZE]; ANSICHAR GroupName[NAME_SIZE]; ANSICHAR GroupCategoryName[NAME_SIZE]; diff --git a/Source/V8/Private/Translator.cpp b/Source/V8/Private/Translator.cpp index 0d68e01e..763a38f2 100644 --- a/Source/V8/Private/Translator.cpp +++ b/Source/V8/Private/Translator.cpp @@ -139,7 +139,7 @@ namespace v8 { if (auto s = Cast(Struct)) { -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 return s->GetAuthoredNameForField(Property); #else return s->PropertyNameToDisplayName(name); @@ -157,7 +157,7 @@ namespace v8 { if (auto s = Cast(Struct)) { -#if ENGINE_MINOR_VERSION > 22 +#if (ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 22) || ENGINE_MAJOR_VERSION > 4 return s->GetAuthoredNameForField(Property) == NameToMatch.ToString(); #else return s->PropertyNameToDisplayName(name) == NameToMatch.ToString(); diff --git a/Source/V8/Public/JavascriptComponent.h b/Source/V8/Public/JavascriptComponent.h index d4c168ad..abe52bda 100644 --- a/Source/V8/Public/JavascriptComponent.h +++ b/Source/V8/Public/JavascriptComponent.h @@ -14,7 +14,7 @@ struct V8_API FJavascriptAsset FName Name; UPROPERTY(EditAnywhere, Category = "Javascript") - FStringAssetReference Asset; + FSoftObjectPath Asset; }; USTRUCT() diff --git a/Source/V8/Public/JavascriptGeneratedClass_Native.h b/Source/V8/Public/JavascriptGeneratedClass_Native.h index bfb08512..3c8ec51e 100644 --- a/Source/V8/Public/JavascriptGeneratedClass_Native.h +++ b/Source/V8/Public/JavascriptGeneratedClass_Native.h @@ -27,7 +27,7 @@ class V8_API UJavascriptGeneratedClass_Native : public UBlueprintGeneratedClass // UClass interface #if WITH_EDITOR virtual UClass* GetAuthoritativeClass() override { return UClass::GetAuthoritativeClass(); } -#if ENGINE_MINOR_VERSION < 22 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 22 virtual void ConditionalRecompileClass(TArray* ObjLoaded) override { UClass::ConditionalRecompileClass(ObjLoaded); } #else virtual void ConditionalRecompileClass(FUObjectSerializeContext* InLoadContext) override { UClass::ConditionalRecompileClass(InLoadContext); } @@ -35,13 +35,13 @@ class V8_API UJavascriptGeneratedClass_Native : public UBlueprintGeneratedClass virtual UObject* GetArchetypeForCDO() const override { return UClass::GetArchetypeForCDO(); } #endif //WITH_EDITOR -#if ENGINE_MINOR_VERSION < 23 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 23 virtual bool IsFunctionImplementedInBlueprint(FName InFunctionName) const override { return false; } #else virtual bool IsFunctionImplementedInScript(FName InFunctionName) const override { return false; } #endif -#if ENGINE_MINOR_VERSION < 21 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 21 virtual uint8* GetPersistentUberGraphFrame(UObject* Obj, UFunction* FuncToCheck) const override { return nullptr; } virtual void GetRequiredPreloadDependencies(TArray& DependenciesOut) override { UClass::GetRequiredPreloadDependencies(DependenciesOut); } #endif @@ -54,7 +54,7 @@ class V8_API UJavascriptGeneratedClass_Native : public UBlueprintGeneratedClass virtual void Link(FArchive& Ar, bool bRelinkExistingProperties) override { UClass::Link(Ar, bRelinkExistingProperties); } virtual void PurgeClass(bool bRecompilingOnLoad) override { UClass::PurgeClass(bRecompilingOnLoad); } virtual void Bind() override { UClass::Bind(); } -#if ENGINE_MINOR_VERSION < 24 +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 24 virtual UObject* FindArchetype(UClass* ArchetypeClass, const FName ArchetypeName) const override { return UClass::FindArchetype(ArchetypeClass, ArchetypeName); } #else virtual UObject* FindArchetype(const UClass* ArchetypeClass, const FName ArchetypeName) const override { return UClass::FindArchetype(ArchetypeClass, ArchetypeName); } diff --git a/Source/V8/Public/JavascriptLibrary.h b/Source/V8/Public/JavascriptLibrary.h index a777a7dd..2ff0d9bf 100644 --- a/Source/V8/Public/JavascriptLibrary.h +++ b/Source/V8/Public/JavascriptLibrary.h @@ -291,10 +291,10 @@ class V8_API UJavascriptLibrary : public UBlueprintFunctionLibrary static FJavascriptStreamableManager CreateStreamableManager(); UFUNCTION(BlueprintCallable, Category = "Scripting|Javascript") - static void SimpleAsyncLoad(const FJavascriptStreamableManager& Manager, FStringAssetReference const& Target, int32 Priority); + static void SimpleAsyncLoad(const FJavascriptStreamableManager& Manager, FSoftObjectPath const& Target, int32 Priority); UFUNCTION(BlueprintCallable, Category = "Scripting|Javascript") - static void RequestAsyncLoad(const FJavascriptStreamableManager& Manager, const TArray& TargetsToStream, FJavascriptFunction DelegateToCall, int32 Priority); + static void RequestAsyncLoad(const FJavascriptStreamableManager& Manager, const TArray& TargetsToStream, FJavascriptFunction DelegateToCall, int32 Priority); UFUNCTION(BlueprintCallable, Category = "Scripting|Javascript") static void V8_SetFlagsFromString(const FString& V8Flags); @@ -303,10 +303,10 @@ class V8_API UJavascriptLibrary : public UBlueprintFunctionLibrary static void V8_SetIdleTaskBudget(float BudgetInSeconds); UFUNCTION(BlueprintCallable, Category = "Scripting|Javascript") - static void Unload(const FJavascriptStreamableManager& Manager, FStringAssetReference const& Target); + static void Unload(const FJavascriptStreamableManager& Manager, FSoftObjectPath const& Target); UFUNCTION(BlueprintCallable, Category = "Scripting|Javascript") - static bool IsAsyncLoadComplete(const FJavascriptStreamableManager& Manager, FStringAssetReference const& Target); + static bool IsAsyncLoadComplete(const FJavascriptStreamableManager& Manager, FSoftObjectPath const& Target); UFUNCTION(BlueprintCallable, Category = "Scripting|Javascript") static FJavascriptLogCategory CreateLogCategory(const FString& CategoryName, ELogVerbosity_JS InDefaultVerbosity); diff --git a/Source/V8/V8.Build.cs b/Source/V8/V8.Build.cs index b9b45f23..a81dca51 100644 --- a/Source/V8/V8.Build.cs +++ b/Source/V8/V8.Build.cs @@ -77,7 +77,7 @@ private void HackWebSocketIncludeDir(String WebsocketPath, ReadOnlyTargetRules T bool bHasZlib = false; - if (Target.Platform == UnrealTargetPlatform.Win64 || Target.Platform == UnrealTargetPlatform.Win32) + if (Target.IsInPlatformGroup(UnrealPlatformGroup.Windows)) { PlatformSubdir = Path.Combine(PlatformSubdir, "VS" + Target.WindowsPlatform.GetVisualStudioCompilerVersionName()); bHasZlib = true; @@ -103,7 +103,7 @@ private bool LoadV8(ReadOnlyTargetRules Target) int[] v8_version = GetV8Version(); bool ShouldLink_libsampler = !(v8_version[0] == 5 && v8_version[1] < 3); bool ShouldLink_lib_v8_compiler = (v8_version[0] > 6 && v8_version[1] > 6); - if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32)) + if (Target.IsInPlatformGroup(UnrealPlatformGroup.Windows)) { string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib");