Make HUD work better for modal HUD

fholger · Feb 6, 2024 · 599108d · 599108d
1 parent aa8c204
commit 599108d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Code/Player.cpp b/Code/Player.cpp
@@ -1015,7 +1015,8 @@ void CPlayer::Update(SEntityUpdateContext& ctx, int updateSlot)
 
 void CPlayer::ProcessRoomscaleMovement()
 {
-	if (!m_linkStats.CanRotate() || !g_pGameCVars->vr_enable_motion_controllers)
+	bool modalHudActive = g_pGame->GetHUD() && g_pGame->GetHUD()->GetModalHUD();
+	if (modalHudActive || !m_linkStats.CanRotate() || !g_pGameCVars->vr_enable_motion_controllers)
 		return;
 	if (GetLinkedVehicle() || m_stats.isOnLadder || !GetEntity()->GetPhysics())
 		return;
@@ -1074,11 +1075,13 @@ void CPlayer::ProcessRoomscaleMovement()
 
 void CPlayer::ProcessRoomscaleRotation()
 {
-	if (!m_linkStats.CanRotate() || !g_pGameCVars->vr_enable_motion_controllers)
+	bool modalHudActive = g_pGame->GetHUD() && g_pGame->GetHUD()->GetModalHUD();
+	if (modalHudActive || !m_linkStats.CanRotate() || !g_pGameCVars->vr_enable_motion_controllers)
 		return;
 	if (GetLinkedVehicle() || m_stats.isOnLadder || !GetEntity()->GetPhysics())
 		return;
 
+
 	if (m_stats.onGround <= 0) // fixme: roomscale rotation feels off during the initial parachute jump
 		return;
 

diff --git a/Code/VR/VRManager.cpp b/Code/VR/VRManager.cpp
@@ -437,7 +437,8 @@ void VRManager::Update()
 		RecalibrateView();
 	}
 
-	if (gVRRenderer->ShouldRenderVR())
+	bool modalHudActive = g_pGame->GetHUD() && g_pGame->GetHUD()->GetModalHUD();
+	if (gVRRenderer->ShouldRenderVR() && !modalHudActive)
 		SetHudAttachedToHead();
 	else
 		SetHudInFrontOfPlayer();