Merge branch 'develop' into 'master'

Develop

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

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"
@@ -153,7 +154,7 @@ void ACAVEOverlayController::SetDoorMode(EDoor_Mode M)
 		Door_Current_Opening_Width_Absolute = Wall_Distance * 2;
 		if (Screen_Type == SCREEN_DOOR) Overlay->BlackBox->SetRenderScale(FVector2D(1, 1));
 		if (Screen_Type == SCREEN_DOOR_PARTIAL) Overlay->BlackBox->SetRenderScale(FVector2D(1, 1));
-		if (Screen_Type == SCREEN_MASTER) Overlay->BlackBox->SetRenderScale(FVector2D(1, 1));
+		if (Screen_Type == SCREEN_MASTER) Overlay->BlackBox->SetRenderScale(FVector2D(0, 1));
 		Overlay->BlackBox->SetVisibility(ESlateVisibility::Visible);
 		break;
 	case EDoor_Mode::DOOR_CLOSED:
@@ -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 (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 (!bDisplay_Cluster_Mode) return; // Not our business
+	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 };