From 0f95bcd7602b466ed294fc3a419a9cc73fadcacc Mon Sep 17 00:00:00 2001
From: David Gilbert <gilbert@vr.rwth-aachen.de>
Date: Mon, 3 Feb 2025 09:14:54 +0100
Subject: [PATCH] fix(utilities): Fixes problem with check for HMD, now using
 new Unreal internal function.

---
 Source/RWTHVRToolkit/Private/Utility/RWTHVRUtilities.cpp | 5 ++---
 Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs              | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/RWTHVRToolkit/Private/Utility/RWTHVRUtilities.cpp b/Source/RWTHVRToolkit/Private/Utility/RWTHVRUtilities.cpp
index 0ac047f0..4e7403fc 100644
--- a/Source/RWTHVRToolkit/Private/Utility/RWTHVRUtilities.cpp
+++ b/Source/RWTHVRToolkit/Private/Utility/RWTHVRUtilities.cpp
@@ -1,6 +1,7 @@
 #include "Utility/RWTHVRUtilities.h"
 
 #include "AudioDevice.h"
+#include "HeadMountedDisplayFunctionLibrary.h"
 #include "IHeadMountedDisplay.h"
 #include "IXRTrackingSystem.h"
 #include "Engine/Engine.h"
@@ -18,9 +19,7 @@ bool URWTHVRUtilities::IsDesktopMode() { return !IsRoomMountedMode() && !IsHeadM
 
 bool URWTHVRUtilities::IsHeadMountedMode()
 {
-	// In editor builds: checks for EdEngine->IsVRPreviewActive()
-	// In packaged builds: checks for `-vr` in commandline or bStartInVR in UGeneralProjectSettings
-	return FAudioDevice::CanUseVRAudioDevice();
+	return UHeadMountedDisplayFunctionLibrary::IsHeadMountedDisplayEnabled();
 }
 
 bool URWTHVRUtilities::IsRoomMountedMode()
diff --git a/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs
index a949553a..3ca3534e 100644
--- a/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs
+++ b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs
@@ -38,7 +38,7 @@ public class RWTHVRToolkit : ModuleRules
 		PrivateDependencyModuleNames.AddRange(
 			new string[]
 			{
-				"NetCore"
+				"NetCore", "XRBase"
 			}
 		);
 		if (Target.bBuildEditor == true)
-- 
GitLab