Set player state variable to hmd/desktop when pawn input is set up. Not the...

Set player state variable to hmd/desktop when pawn input is set up. Not the best place to put this but will do for now.

Source/RWTHVRToolkit/Private/Core/RWTHVRGameModeBase.cpp

@@ -33,7 +33,7 @@ FString ARWTHVRGameModeBase::InitNewPlayer(APlayerController* NewPlayerControlle
 				                         : PrimaryNodeId;
 			
 			const EPlayerType Type = NodeName == PrimaryNodeId ? EPlayerType::nDisplayPrimary : EPlayerType::nDisplaySecondary;			
-			State->SetPlayerType(Type);		
+			State->RequestSetPlayerType(Type);		
 		}
 	}
 	

Source/RWTHVRToolkit/Private/Core/RWTHVRPlayerState.cpp

@@ -47,8 +47,25 @@ void ARWTHVRPlayerState::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& O
 	DOREPLIFETIME_WITH_PARAMS_FAST(ARWTHVRPlayerState, PlayerType, SharedParams);
 }
 
+void ARWTHVRPlayerState::SetPlayerTypeServerRpc_Implementation(const EPlayerType NewPlayerType)
+{
+	SetPlayerType(NewPlayerType);
+}
+
 void ARWTHVRPlayerState::SetPlayerType(const EPlayerType NewPlayerType)
 {
 	MARK_PROPERTY_DIRTY_FROM_NAME(ARWTHVRPlayerState, PlayerType, this);
 	PlayerType = NewPlayerType;
 }
+
+void ARWTHVRPlayerState::RequestSetPlayerType(const EPlayerType NewPlayerType)
+{
+	if (HasAuthority())
+	{
+		SetPlayerType(NewPlayerType);
+	}
+	else
+	{
+		SetPlayerTypeServerRpc(NewPlayerType);
+	}
+}

Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp

@@ -6,6 +6,7 @@
 #include "GameFramework/PlayerController.h"
 #include "EnhancedInputComponent.h"
 #include "EnhancedInputSubsystems.h"
+#include "Core/RWTHVRPlayerState.h"
 #include "Pawn/ContinuousMovementComponent.h"
 #include "Pawn/ReplicatedCameraComponent.h"
 #include "Pawn/ReplicatedMotionControllerComponent.h"
@@ -74,12 +75,24 @@ void AVirtualRealityPawn::SetupPlayerInputComponent(UInputComponent* PlayerInput
 		return;
 	}
 
+	EPlayerType Type = EPlayerType::Desktop;
 	if (UVirtualRealityUtilities::IsDesktopMode())
 	{
 		PlayerController->bShowMouseCursor = true;
 		PlayerController->bEnableClickEvents = true;
 		PlayerController->bEnableMouseOverEvents = true;
 	}
+	else if (UVirtualRealityUtilities::IsHeadMountedMode())
+	{
+		Type = EPlayerType::HMD;
+	}
+
+	// Should not do this here but on connection or on possess I think.
+	ARWTHVRPlayerState* State = GetPlayerState<ARWTHVRPlayerState>();
+	if (State)
+	{
+		State->RequestSetPlayerType(Type);
+	}
 	
 	InputSubsystem->ClearAllMappings();
 

Source/RWTHVRToolkit/Public/Core/RWTHVRPlayerState.h

@@ -22,6 +22,11 @@ private:
 	UPROPERTY(Replicated, Category=PlayerState, BlueprintGetter=GetPlayerType, meta=(AllowPrivateAccess))
 	EPlayerType PlayerType = EPlayerType::Desktop;
 
+	UFUNCTION(Reliable, Server)
+	void SetPlayerTypeServerRpc(EPlayerType NewPlayerType);
+
+	void SetPlayerType(EPlayerType NewPlayerType);
+
 public:
 
 	UFUNCTION(BlueprintGetter)
@@ -30,7 +35,8 @@ public:
 		return PlayerType;
 	}	
 
-	void SetPlayerType(EPlayerType NewType);
+	UFUNCTION(BlueprintCallable)
+	void RequestSetPlayerType(EPlayerType NewPlayerType);
 
 	virtual void CopyProperties(APlayerState* PlayerState) override;
 	virtual void OverrideWith(APlayerState* PlayerState) override;