From 09fccd697c18b78c5c7a69aa4ee489b74401c9f4 Mon Sep 17 00:00:00 2001
From: Simon Oehrl <oehrl@vr.rwth-aachen.de>
Date: Tue, 21 Sep 2021 14:00:39 +0000
Subject: [PATCH] Fix namespace of None

---
 .../Utility/VirtualRealityUtilities.cpp       | 334 +++++++++---------
 1 file changed, 167 insertions(+), 167 deletions(-)

diff --git a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
index 799dcfa2..f014c535 100644
--- a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
+++ b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
@@ -1,167 +1,167 @@
-#include "Utility/VirtualRealityUtilities.h"
-
-#if PLATFORM_SUPPORTS_NDISPLAY
-    #include "Cluster/IDisplayClusterClusterManager.h"
-    #include "Components/DisplayClusterCameraComponent.h"
-    #include "Config/IDisplayClusterConfigManager.h"
-    #include "DisplayClusterRootActor.h"
-    #include "DisplayClusterConfigurationTypes.h"
-    #include "Game/IDisplayClusterGameManager.h"
-    #include "IDisplayCluster.h"
-#endif
-
-#include "Engine/Engine.h"
-#include "IXRTrackingSystem.h"
-#include "IHeadMountedDisplay.h"
-
-bool UVirtualRealityUtilities::IsDesktopMode()
-{
-	return !IsRoomMountedMode() && !IsHeadMountedMode();
-}
-
-bool UVirtualRealityUtilities::IsRoomMountedMode()
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	return IDisplayCluster::Get().GetOperationMode() == EDisplayClusterOperationMode::Cluster;
-#else
-	return false;
-#endif
-}
-
-bool UVirtualRealityUtilities::IsHeadMountedMode()
-{
-	return GEngine->XRSystem.IsValid() && GEngine->XRSystem->IsHeadTrackingAllowed();
-}
-
-bool UVirtualRealityUtilities::IsCave()
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	if(!IsRoomMountedMode()) return false;
-	
-	const UDisplayClusterConfigurationData* ClusterConfig = IDisplayCluster::Get().GetConfigMgr()->GetConfig();
-	return ClusterConfig->CustomParameters.Contains("Hardware_Platform")
-		&& ClusterConfig->CustomParameters.Find("Hardware_Platform")->Equals("aixcave", ESearchCase::IgnoreCase);
-#else
-	return false;
-#endif
-}
-
-bool UVirtualRealityUtilities::IsTdw()
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	if(!IsRoomMountedMode()) return false;
-	
-	const UDisplayClusterConfigurationData* ClusterConfig = IDisplayCluster::Get().GetConfigMgr()->GetConfig();
-	return ClusterConfig->CustomParameters.Contains("Hardware_Platform")
-		&& ClusterConfig->CustomParameters.Find("Hardware_Platform")->Equals("TiledDisplayWall", ESearchCase::IgnoreCase);
-#else
-	return false;
-#endif
-}
-
-bool UVirtualRealityUtilities::IsRolv()
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	if(!IsRoomMountedMode()) return false;
-	
-	const UDisplayClusterConfigurationData* ClusterConfig = IDisplayCluster::Get().GetConfigMgr()->GetConfig();
-	return ClusterConfig->CustomParameters.Contains("Hardware_Platform")
-		&& ClusterConfig->CustomParameters.Find("Hardware_Platform")->Equals("ROLV", ESearchCase::IgnoreCase);
-#else
-	return false;
-#endif
-}
-
-/* Return true on the Master in cluster mode and in a normal desktop session. Otherwise false */
-bool UVirtualRealityUtilities::IsMaster()
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	if (!IDisplayCluster::IsAvailable()) 
-	{
-		return true;
-	}
-	IDisplayClusterClusterManager* Manager = IDisplayCluster::Get().GetClusterMgr();
-	if (Manager == nullptr)
-	{
-		return true; // if we are not in cluster mode, we are always the master
-	}
-	return Manager->IsMaster() || !Manager->IsSlave();
-#else
-    return true;
-#endif
-}
-
-bool UVirtualRealityUtilities::IsSlave()
-{
-	return !IsMaster();
-}
-
-FString UVirtualRealityUtilities::GetNodeName()
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	return IsRoomMountedMode() ? IDisplayCluster::Get().GetClusterMgr()->GetNodeId() : FString(TEXT("Localhost"));
-#else
-	return FString(TEXT("Localhost"));
-#endif
-}
-
-float UVirtualRealityUtilities::GetEyeDistance()
-{
-	if(IsHeadMountedMode())
-	{
-	    return GEngine->XRSystem->GetHMDDevice()->GetInterpupillaryDistance();
-	}
-    else
-	{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	    ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
-	    return (RootActor) ? RootActor->GetDefaultCamera()->GetInterpupillaryDistance() : 0.0f;
-#else
-	    return 0.0f;
-#endif
-	}
-}
-
-EEyeStereoOffset UVirtualRealityUtilities::GetNodeEyeType()
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
-	return static_cast<EEyeStereoOffset>((RootActor) ? RootActor->GetDefaultCamera()->GetStereoOffset() : EDisplayClusterEyeStereoOffset::None);
-#else
-	return None;
-#endif
-}
-
-USceneComponent* UVirtualRealityUtilities::GetClusterComponent(const FString& Name)
-{
-#if PLATFORM_SUPPORTS_NDISPLAY
-	ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
-	return (RootActor) ? RootActor->GetComponentById(Name) : nullptr;
-#else
-	return nullptr;
-#endif
-}
-
-USceneComponent* UVirtualRealityUtilities::GetNamedClusterComponent(const ENamedClusterComponent& Component)
-{
-	switch(Component)
-	{
-	case ENamedClusterComponent::NCC_CAVE_ORIGIN: return GetClusterComponent("cave_origin");
-	case ENamedClusterComponent::NCC_CAVE_CENTER: return GetClusterComponent("cave_center");
-	case ENamedClusterComponent::NCC_CAVE_LHT: return GetClusterComponent("left_hand_target");
-	case ENamedClusterComponent::NCC_CAVE_RHT: return GetClusterComponent("right_hand_target");
-	case ENamedClusterComponent::NCC_SHUTTERGLASSES: return GetClusterComponent("shutter_glasses");
-	case ENamedClusterComponent::NCC_ROLV_ORIGIN: return GetClusterComponent("rolv_origin");
-	case ENamedClusterComponent::NCC_FLYSTICK: return GetClusterComponent("flystick");
-	case ENamedClusterComponent::NCC_TDW_ORIGIN: return GetClusterComponent("tdw_origin_floor");
-	case ENamedClusterComponent::NCC_TDW_CENTER: return GetClusterComponent("tdw_center");
-	case ENamedClusterComponent::NCC_CALIBRATIO: return GetClusterComponent("calibratio");
-	case ENamedClusterComponent::NCC_TRACKING_ORIGIN:
-		USceneComponent* Result;
-		if((Result = GetClusterComponent("cave_origin"))) return Result;
-		if((Result = GetClusterComponent("rolv_origin"))) return Result;
-		if((Result = GetClusterComponent("tdw_origin_floor"))) return Result;
-		return nullptr;
-	default: return nullptr;
-	}
-}
+#include "Utility/VirtualRealityUtilities.h"
+
+#if PLATFORM_SUPPORTS_NDISPLAY
+    #include "Cluster/IDisplayClusterClusterManager.h"
+    #include "Components/DisplayClusterCameraComponent.h"
+    #include "Config/IDisplayClusterConfigManager.h"
+    #include "DisplayClusterRootActor.h"
+    #include "DisplayClusterConfigurationTypes.h"
+    #include "Game/IDisplayClusterGameManager.h"
+    #include "IDisplayCluster.h"
+#endif
+
+#include "Engine/Engine.h"
+#include "IXRTrackingSystem.h"
+#include "IHeadMountedDisplay.h"
+
+bool UVirtualRealityUtilities::IsDesktopMode()
+{
+	return !IsRoomMountedMode() && !IsHeadMountedMode();
+}
+
+bool UVirtualRealityUtilities::IsRoomMountedMode()
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	return IDisplayCluster::Get().GetOperationMode() == EDisplayClusterOperationMode::Cluster;
+#else
+	return false;
+#endif
+}
+
+bool UVirtualRealityUtilities::IsHeadMountedMode()
+{
+	return GEngine->XRSystem.IsValid() && GEngine->XRSystem->IsHeadTrackingAllowed();
+}
+
+bool UVirtualRealityUtilities::IsCave()
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	if(!IsRoomMountedMode()) return false;
+	
+	const UDisplayClusterConfigurationData* ClusterConfig = IDisplayCluster::Get().GetConfigMgr()->GetConfig();
+	return ClusterConfig->CustomParameters.Contains("Hardware_Platform")
+		&& ClusterConfig->CustomParameters.Find("Hardware_Platform")->Equals("aixcave", ESearchCase::IgnoreCase);
+#else
+	return false;
+#endif
+}
+
+bool UVirtualRealityUtilities::IsTdw()
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	if(!IsRoomMountedMode()) return false;
+	
+	const UDisplayClusterConfigurationData* ClusterConfig = IDisplayCluster::Get().GetConfigMgr()->GetConfig();
+	return ClusterConfig->CustomParameters.Contains("Hardware_Platform")
+		&& ClusterConfig->CustomParameters.Find("Hardware_Platform")->Equals("TiledDisplayWall", ESearchCase::IgnoreCase);
+#else
+	return false;
+#endif
+}
+
+bool UVirtualRealityUtilities::IsRolv()
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	if(!IsRoomMountedMode()) return false;
+	
+	const UDisplayClusterConfigurationData* ClusterConfig = IDisplayCluster::Get().GetConfigMgr()->GetConfig();
+	return ClusterConfig->CustomParameters.Contains("Hardware_Platform")
+		&& ClusterConfig->CustomParameters.Find("Hardware_Platform")->Equals("ROLV", ESearchCase::IgnoreCase);
+#else
+	return false;
+#endif
+}
+
+/* Return true on the Master in cluster mode and in a normal desktop session. Otherwise false */
+bool UVirtualRealityUtilities::IsMaster()
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	if (!IDisplayCluster::IsAvailable()) 
+	{
+		return true;
+	}
+	IDisplayClusterClusterManager* Manager = IDisplayCluster::Get().GetClusterMgr();
+	if (Manager == nullptr)
+	{
+		return true; // if we are not in cluster mode, we are always the master
+	}
+	return Manager->IsMaster() || !Manager->IsSlave();
+#else
+    return true;
+#endif
+}
+
+bool UVirtualRealityUtilities::IsSlave()
+{
+	return !IsMaster();
+}
+
+FString UVirtualRealityUtilities::GetNodeName()
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	return IsRoomMountedMode() ? IDisplayCluster::Get().GetClusterMgr()->GetNodeId() : FString(TEXT("Localhost"));
+#else
+	return FString(TEXT("Localhost"));
+#endif
+}
+
+float UVirtualRealityUtilities::GetEyeDistance()
+{
+	if(IsHeadMountedMode())
+	{
+	    return GEngine->XRSystem->GetHMDDevice()->GetInterpupillaryDistance();
+	}
+    else
+	{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	    ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
+	    return (RootActor) ? RootActor->GetDefaultCamera()->GetInterpupillaryDistance() : 0.0f;
+#else
+	    return 0.0f;
+#endif
+	}
+}
+
+EEyeStereoOffset UVirtualRealityUtilities::GetNodeEyeType()
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
+	return static_cast<EEyeStereoOffset>((RootActor) ? RootActor->GetDefaultCamera()->GetStereoOffset() : EDisplayClusterEyeStereoOffset::None);
+#else
+	return EDisplayClusterEyeStereoOffset::None;
+#endif
+}
+
+USceneComponent* UVirtualRealityUtilities::GetClusterComponent(const FString& Name)
+{
+#if PLATFORM_SUPPORTS_NDISPLAY
+	ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
+	return (RootActor) ? RootActor->GetComponentById(Name) : nullptr;
+#else
+	return nullptr;
+#endif
+}
+
+USceneComponent* UVirtualRealityUtilities::GetNamedClusterComponent(const ENamedClusterComponent& Component)
+{
+	switch(Component)
+	{
+	case ENamedClusterComponent::NCC_CAVE_ORIGIN: return GetClusterComponent("cave_origin");
+	case ENamedClusterComponent::NCC_CAVE_CENTER: return GetClusterComponent("cave_center");
+	case ENamedClusterComponent::NCC_CAVE_LHT: return GetClusterComponent("left_hand_target");
+	case ENamedClusterComponent::NCC_CAVE_RHT: return GetClusterComponent("right_hand_target");
+	case ENamedClusterComponent::NCC_SHUTTERGLASSES: return GetClusterComponent("shutter_glasses");
+	case ENamedClusterComponent::NCC_ROLV_ORIGIN: return GetClusterComponent("rolv_origin");
+	case ENamedClusterComponent::NCC_FLYSTICK: return GetClusterComponent("flystick");
+	case ENamedClusterComponent::NCC_TDW_ORIGIN: return GetClusterComponent("tdw_origin_floor");
+	case ENamedClusterComponent::NCC_TDW_CENTER: return GetClusterComponent("tdw_center");
+	case ENamedClusterComponent::NCC_CALIBRATIO: return GetClusterComponent("calibratio");
+	case ENamedClusterComponent::NCC_TRACKING_ORIGIN:
+		USceneComponent* Result;
+		if((Result = GetClusterComponent("cave_origin"))) return Result;
+		if((Result = GetClusterComponent("rolv_origin"))) return Result;
+		if((Result = GetClusterComponent("tdw_origin_floor"))) return Result;
+		return nullptr;
+	default: return nullptr;
+	}
+}
-- 
GitLab