Update to support UE 5.4

N7Alpha · May 11, 2024 · f6f4c30 · f6f4c30
1 parent a147af3
commit f6f4c30
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -40,7 +40,8 @@ jobs:
           - {major: 5, minor: 1}
           - {major: 5, minor: 2}
           - {major: 5, minor: 3}
-
+          - {major: 5, minor: 4}
+
     steps:
       - uses: actions/[email protected]
 

diff --git a/Source/UnrealLibretro/Public/LibretroGameMode.h b/Source/UnrealLibretro/Public/LibretroGameMode.h
@@ -10,6 +10,7 @@
 #include "HeadMountedDisplayFunctionLibrary.h"
 #if    ENGINE_MAJOR_VERSION == 5 \
     && ENGINE_MINOR_VERSION >= 1 \
+    && ENGINE_MINOR_VERSION <  4 \
     && WITH_EDITOR
 #include "Misc/MessageDialog.h"
 #include "OpenXRInputSettings.h"
@@ -63,8 +64,10 @@ class UNREALLIBRETRO_API ALibretroGameMode : public AGameModeBase
         SpawnParams.Owner = NewPlayer;
         SpawnParams.Instigator = nullptr;
 
+// @todo This check broke in 5.4 so I've disabled it. Check commit 8529eca in the UnrealEngine repo for how to fix
 #if    ENGINE_MAJOR_VERSION == 5 \
     && ENGINE_MINOR_VERSION >= 1 \
+    && ENGINE_MINOR_VERSION <  4 \
     && WITH_EDITOR
         UOpenXRInputSettings* OpenXRInputSettings = GetMutableDefault<UOpenXRInputSettings>();
         if (OpenXRInputSettings && OpenXRInputSettings->MappableInputConfig != nullptr)

diff --git a/Source/UnrealLibretro/Public/LibretroInputDefinitions.h b/Source/UnrealLibretro/Public/LibretroInputDefinitions.h
@@ -20,7 +20,7 @@ struct FLibretroOptionDescription
 {
     GENERATED_BODY()
 
-    static CONSTEXPR int DefaultOptionIndex = 0; // By libretro convention
+    static constexpr int DefaultOptionIndex = 0; // By libretro convention
 
     UPROPERTY(BlueprintReadOnly, Category = "Libretro")
     FString         Key;

diff --git a/Source/UnrealLibretro/Public/LibretroVRPawn.h b/Source/UnrealLibretro/Public/LibretroVRPawn.h
@@ -48,8 +48,13 @@ class UNREALLIBRETRO_API ALibretroVRPawn : public APawn
 
         MotionControllerLeft->MotionSource = "Left";
         MotionControllerRight->MotionSource = "Right";
+
+        // Controllers not displayed on 5.4 @todo
+#if    ENGINE_MAJOR_VERSION <  5 \
+    || ENGINE_MINOR_VERSION <  4
         MotionControllerLeft->bDisplayDeviceModel = true;
         MotionControllerRight->bDisplayDeviceModel = true;
+#endif
 
 #if    ENGINE_MAJOR_VERSION >  4 \
     || ENGINE_MINOR_VERSION >= 26
@@ -139,7 +144,7 @@ class UNREALLIBRETRO_API ALibretroVRPawn : public APawn
         decltype(MotionControllerLeftAim)& MotionControllerAim;
     };
 
-    CONSTEXPR FHand GetHand(EControllerHand ControllerHand)
+    constexpr FHand GetHand(EControllerHand ControllerHand)
     {
         if (ControllerHand == EControllerHand::Left)
         {
@@ -151,7 +156,7 @@ class UNREALLIBRETRO_API ALibretroVRPawn : public APawn
         }
     }
 
-    CONSTEXPR FHand GetOtherHand(EControllerHand ControllerHand)
+    constexpr FHand GetOtherHand(EControllerHand ControllerHand)
     {
         if (ControllerHand == EControllerHand::Left)
         {
@@ -170,7 +175,14 @@ class UNREALLIBRETRO_API ALibretroVRPawn : public APawn
         // Begin Play - Set Tracking Origin to floor
         if (UHeadMountedDisplayFunctionLibrary::IsHeadMountedDisplayEnabled())
         {
-            UHeadMountedDisplayFunctionLibrary::SetTrackingOrigin(EHMDTrackingOrigin::Floor);
+            UHeadMountedDisplayFunctionLibrary::SetTrackingOrigin(
+#if    ENGINE_MAJOR_VERSION == 5 \
+    && ENGINE_MINOR_VERSION >= 4
+                EHMDTrackingOrigin::LocalFloor
+#else
+                EHMDTrackingOrigin::Floor
+#endif
+            );
         }
     }