Merge branch 'feature/platform_distinction' into 'develop'

Feature/platform distinction

See merge request VR-Group/unreal-cave-overlay!7

Source/CAVEOverlay/Private/CAVEOverlayController.cpp

@@ -10,6 +10,7 @@
 #include "Components/InputComponent.h"
 #include "Cluster/IDisplayClusterClusterManager.h"
 #include "IDisplayClusterGameManager.h"
+#include "IDisplayClusterConfigManager.h"
 #include "UObject/ConstructorHelpers.h"
 #include <array>
 #include "Components/StaticMeshComponent.h"
@@ -181,10 +182,12 @@ void ACAVEOverlayController::BeginPlay()
 	Super::BeginPlay();
 
 	//Read situation
-	bHMD_Mode = GEngine->XRSystem.IsValid() && GEngine->XRSystem->IsHeadTrackingAllowed();
-	bDisplay_Cluster_Mode = IDisplayCluster::Get().GetOperationMode() == EDisplayClusterOperationMode::Cluster;
-
-	if (!bDisplay_Cluster_Mode) return; // Not our business
+	if (IDisplayCluster::Get().GetOperationMode() == EDisplayClusterOperationMode::Cluster) {
+		auto ClusterConfigCustom = IDisplayCluster::Get().GetConfigMgr()->GetConfigCustom();
+		bCAVE_Mode = ClusterConfigCustom.Args.Contains("Hardware_Platform") && ClusterConfigCustom.Args.Find("Hardware_Platform")->Equals("aixcave", ESearchCase::IgnoreCase);
+	}
+	
+	if (!bCAVE_Mode) return; // Not our business
 
 	//Input config
 	InputComponent->BindAction("Action4", EInputEvent::IE_Pressed, this, &ACAVEOverlayController::CycleDoorType);
@@ -253,7 +256,7 @@ void ACAVEOverlayController::Tick(float DeltaTime)
 {
 	Super::Tick(DeltaTime);
 
-	if (!bDisplay_Cluster_Mode) return; // Not our business
+	if (!bCAVE_Mode) return; // Not our business
 
 	RefreshPawnComponents();
 	if (!bAttached && Cave_Origin)

Source/CAVEOverlay/Public/CAVEOverlayController.h

@@ -29,8 +29,7 @@ protected:
 
 private:
 	//Execution Modes
-	bool bHMD_Mode = false;
-	bool bDisplay_Cluster_Mode = false;
+	bool bCAVE_Mode = false;
 
 	//Screen Types
 	enum EScreen_Type { SCREEN_MASTER, SCREEN_NORMAL, SCREEN_DOOR_PARTIAL, SCREEN_DOOR };