Add option to switch between head- and controller-oriented movement

Author: fholger

Code/GameCVars.cpp

@@ -880,6 +880,7 @@ void SCVars::InitVRCVars(IConsole* pConsole)
 	pConsole->Register("vr_weapon_hand", &vr_weapon_hand, 1, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Which hand holds and controls weapon: 0 (left) or 1 (right)");
 	pConsole->Register("vr_movement_hand", &vr_movement_hand, 0, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Which hand controls player movement: 0 (left) or 1 (right)");
 	pConsole->Register("vr_suit_hand", &vr_suit_hand, 1, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Which hand controls the suit menu: 0 (left) or 1 (right)");
+	pConsole->Register("vr_movement_mode", &vr_movement_mode, 0, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Controls the orientation of player movement. 0 - head, 1 - controller");
 	pConsole->Register("vr_weapon_pitch_offset", &vr_weapon_pitch_offset, 0, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Adjust weapon vertical holding angle");
 	pConsole->Register("vr_weapon_yaw_offset", &vr_weapon_yaw_offset, 0, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Adjust weapon horizontal holding angle");
 	pConsole->Register("vr_weapon_crosshair", &vr_weapon_crosshair, 0, VF_RESTRICTEDMODE|VF_DUMPTODISK, "If enabled, displays a simple crosshair for player weapons to assist with aiming in VR");

Code/GameCVars.h

@@ -443,6 +443,7 @@ struct SCVars
 	int vr_weapon_hand;
 	int vr_movement_hand;
 	int vr_suit_hand;
+	int vr_movement_mode;
 	float vr_weapon_pitch_offset;
 	float vr_weapon_yaw_offset;
 	int vr_weapon_crosshair;

Code/PlayerMovement.cpp

@@ -160,7 +160,7 @@ static Vec3 ProjectPointToLine(const Vec3 &point,const Vec3 &lineStart,const Vec
 //-----------------------------------------------------------------------------------------------
 void CPlayerMovement::ProcessFlyMode()
 {
-	Quat viewQuat = m_baseQuat * gVR->GetHMDQuat();
+	Quat viewQuat = GetFlyQuat();
 	Vec3 move = viewQuat * m_movement.desiredVelocity;
 
 	float zMove(0.0f);
@@ -192,8 +192,9 @@ void CPlayerMovement::ProcessFlyingZeroG()
 {
 	bool debug = false;
 	Vec3 entityPos = m_player.GetEntity()->GetWorldPos();
-	Vec3 vRight(m_baseQuat.GetColumn0());
-	Vec3 vFwd(m_baseQuat.GetColumn1());
+	Quat baseQuat = GetMoveQuat();
+	Vec3 vRight(baseQuat.GetColumn0());
+	Vec3 vFwd(baseQuat.GetColumn1());
 
 	bool trail = (g_pGameCVars->pl_zeroGParticleTrail != 0);
 	if (trail)
@@ -295,7 +296,7 @@ void CPlayerMovement::ProcessFlyingZeroG()
 		desiredLocalVelocity.z = desiredLocalNormalizedVelocity.z * maxSpeed;
 
 		// The desired movement is applied in viewspace, not in entityspace, since entity does not nessecarily pitch while swimming.
-		Quat viewQuat = m_baseQuat * gVR->GetHMDQuat();
+		Quat viewQuat = GetFlyQuat();
 		desiredWorldVelocity += viewQuat.GetColumn0() * desiredLocalVelocity.x;
 		desiredWorldVelocity += viewQuat.GetColumn1() * desiredLocalVelocity.y;
 		desiredWorldVelocity += viewQuat.GetColumn2() * desiredLocalVelocity.z;
@@ -653,7 +654,8 @@ void CPlayerMovement::ProcessSwimming()
 {
  	bool debug = (g_pGameCVars->cl_debugSwimming != 0);
 	Vec3 entityPos = m_player.GetEntity()->GetWorldPos();
-	Vec3 vRight(m_baseQuat.GetColumn0());
+	Quat baseQuat = GetMoveQuat();
+	Vec3 vRight(baseQuat.GetColumn0());
 
 	// Don't enable sticky surface directly when entering water.
 	if (m_stats.inWaterTimer < 0.5f)
@@ -781,7 +783,7 @@ void CPlayerMovement::ProcessSwimming()
 		desiredLocalNormalizedVelocity.x = m_movement.desiredVelocity.x * g_pGameCVars->pl_swimSideSpeedMul;
 		desiredLocalNormalizedVelocity.y = m_movement.desiredVelocity.y * backwardMultiplier;
 
- 		Quat viewQuat = m_baseQuat * gVR->GetHMDQuat();
+ 		Quat viewQuat = GetFlyQuat();
 
 		// AI can set a custom sprint value, so don't cap the movement vector
 		float sprintMultiplier = 1.0f;
@@ -938,7 +940,8 @@ void CPlayerMovement::ProcessParachute()
 	m_request.type = eCMT_Impulse;//eCMT_Fly;
 	m_request.velocity = (Vec3(0,0,desiredZ)-m_stats.velocity) * m_stats.mass/* * m_frameTime*/;//desiredVelocity;
 
-	Vec3 forwardComp(m_baseQuat.GetColumn1() * 10.0f);
+	Quat baseQuat = GetMoveQuat();
+	Vec3 forwardComp(baseQuat.GetColumn1() * 10.0f);
 	forwardComp.z = 0.0f;
 
 	m_request.velocity += forwardComp * m_stats.mass;// * m_frameTime;//desiredVelocity;
@@ -987,8 +990,9 @@ void CPlayerMovement::ProcessOnGroundOrJumping(CPlayer& player)
 		NETINPUT_TRACE(m_player.GetEntityId(), backwardMul);
 		NETINPUT_TRACE(m_player.GetEntityId(), strafeMul);
 
-		move += m_baseQuat.GetColumn0() * desiredVelocityClamped.x * strafeMul * backwardMul;
-		move += m_baseQuat.GetColumn1() * desiredVelocityClamped.y * backwardMul;
+		Quat baseQuat = GetMoveQuat();
+		move += baseQuat.GetColumn0() * desiredVelocityClamped.x * strafeMul * backwardMul;
+		move += baseQuat.GetColumn1() * desiredVelocityClamped.y * backwardMul;
 	}
 
 	float sprintMult = 1.0f;
@@ -1706,3 +1710,23 @@ void CPlayerMovement::AdjustPlayerPositionOnLadder(CPlayer &player)
 		}
 	}
 }
+
+Quat CPlayerMovement::GetMoveQuat()
+{
+	if (g_pGameCVars->vr_movement_mode == 0)
+		return m_baseQuat;
+	else
+	{
+		Vec3 fwd = gVR->GetMovementControllerQuat().GetColumn1();
+		fwd.z = 0;
+		return Quat::CreateRotationVDir(fwd.GetNormalizedSafe());
+	}
+}
+
+Quat CPlayerMovement::GetFlyQuat()
+{
+	if (g_pGameCVars->vr_movement_mode == 0)
+		return m_baseQuat * gVR->GetHMDQuat();
+	else
+		return gVR->GetMovementControllerQuat();
+}

Code/PlayerMovement.h

@@ -42,6 +42,9 @@ class CPlayerMovement
 	void AdjustMovementForEnvironment( Vec3& movement, bool sprinting );
 	void AdjustPlayerPositionOnLadder(CPlayer &player);
 
+	Quat GetMoveQuat();
+	Quat GetFlyQuat();
+
 	SCharacterMoveRequest m_request; // our primary output... how to move!
 	bool m_detachLadder; // do we want to detach from a ladder?
 	Vec3 m_velocity; // from CPlayer... gets updated here and committed

Code/VR/VRGui.cpp

@@ -203,6 +203,13 @@ void VRGui::DrawSettingsMenu()
 		bool invertVehicleY = g_pGameCVars->vr_vehicle_invert_y;
 		ImGui::Checkbox("Invert look Y-axis for vehicles and mounted guns", &invertVehicleY);
 		g_pGameCVars->vr_vehicle_invert_y = invertVehicleY;
+
+		ImGui::Text("Movement relative to");
+		ImGui::SetItemTooltip("Choose if movement direction is relative to head or controller");
+		ImGui::SameLine(0.2f * windowSize.x);
+		ImGui::RadioButton("Head", &g_pGameCVars->vr_movement_mode, 0);
+		ImGui::SameLine();
+		ImGui::RadioButton("Controller", &g_pGameCVars->vr_movement_mode, 1);
 	}
 
 	if (ImGui::CollapsingHeader("Weapons"))

Code/VR/VRManager.cpp

@@ -515,6 +515,12 @@ Matrix34 VRManager::GetWorldControllerWeaponTransform(int side)
 	return view * controllerTransform;
 }
 
+Quat VRManager::GetMovementControllerQuat()
+{
+	Matrix34 controllerTransform = GetWorldControllerTransform(g_pGameCVars->vr_movement_hand);
+	return Quat(controllerTransform);
+}
+
 Vec3 VRManager::GetControllerVelocity(int side)
 {
 	Vec3 controllerVelocity = gXR->GetInput()->GetControllerVelocity(side);

Code/VR/VRManager.h

@@ -51,6 +51,7 @@ class VRManager
 	Matrix34 GetControllerWeaponTransform(int side);
 	Matrix34 GetTwoHandWeaponTransform();
 	Matrix34 GetWorldControllerWeaponTransform(int side);
+	Quat GetMovementControllerQuat();
 	Vec3 GetControllerVelocity(int side);
 	Vec3 GetControllerWorldVelocity(int side);
 	void ModifyPlayerEye(CPlayer* pPlayer, Vec3& eyePosition, Vec3& eyeDirection);