Remove motion control toggle, as disabling motion controls is no long…

…er supported
fholger · Jan 20, 2025 · dd8c589 · dd8c589
1 parent 9868d46
commit dd8c589
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 36 deletions.
diff --git a/Code/GameCVars.cpp b/Code/GameCVars.cpp
@@ -874,7 +874,6 @@ void SCVars::InitVRCVars(IConsole* pConsole)
 	pConsole->Register("vr_yaw_deadzone_angle", &vr_yaw_deadzone_angle, 30, VF_RESTRICTEDMODE|VF_SAVEGAME, "Controls the deadzone angle in front of the player where weapon aim does not rotate the camera");
 	pConsole->Register("vr_shadow_optimization", &vr_shadow_optimization, 1, VF_RESTRICTEDMODE, "If enabled, only draws shadow maps once for the first eye, hopefully improving performance without any side effects");
 	pConsole->Register("vr_resolution_scale", &vr_resolution_scale, 1, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Allows changing the VR render resolution");
-	pConsole->Register("vr_enable_motion_controllers", &vr_enable_motion_controllers, 1, VF_RESTRICTEDMODE|VF_SAVEGAME, "Play with tracked motion controllers");
 	pConsole->Register("vr_controller_yaw_deadzone", &vr_controller_yaw_deadzone, 0.15f, VF_RESTRICTEDMODE, "Deadzone for stick turning");
 	pConsole->Register("vr_controller_stick_action_threshold", &vr_controller_stick_action_threshold, 0.75f, VF_RESTRICTEDMODE, "How far a stick needs to be extended to trigger an input action");
 	pConsole->Register("vr_controller_stick_zone_cutoff", &vr_controller_stick_zone_cutoff, 0.35f, VF_RESTRICTEDMODE, "If stick is extended this far in one axis, disable any input actions in the other axis");
@@ -884,7 +883,7 @@ void SCVars::InitVRCVars(IConsole* pConsole)
 	pConsole->Register("vr_weapon_angle_offset", &vr_weapon_angle_offset, 0, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Adjust weapon 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");
 	pConsole->Register("vr_vehicle_crosshair", &vr_vehicle_crosshair, 1, VF_RESTRICTEDMODE|VF_DUMPTODISK, "If enabled, displays a simple crosshair for vehicle weapons to assist with aiming in VR");
-	pConsole->Register("vr_cutscenes_angle_snap", &vr_cutscenes_angle_snap, 60, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Ignores camera rotation in cutscenes until the angle difference reaches this value, then snaps the angle to the new value");
+	pConsole->Register("vr_cutscenes_angle_snap", &vr_cutscenes_angle_snap, 45, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Ignores camera rotation in cutscenes until the angle difference reaches this value, then snaps the angle to the new value");
 	pConsole->Register("vr_cinema_3d", &vr_cinema_3d, 1, VF_RESTRICTEDMODE|VF_DUMPTODISK, "If enabled, whenever the game switches to a cinema mode (e.g. binoculars, weapon scopes or cutscenes), the cinema will render in 3D");
 	pConsole->Register("vr_cinema_3d_eye_dist", &vr_cinema_3d_eye_dist, 0.032f, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Determines the distance between the stereoscopic cameras in 3D cinema render mode");
 	pConsole->Register("vr_haptics_enabled", &vr_haptics_enabled, 1, VF_RESTRICTEDMODE|VF_DUMPTODISK, "Send haptic feedback to the motion controllers");

diff --git a/Code/GameCVars.h b/Code/GameCVars.h
@@ -440,7 +440,6 @@ struct SCVars
 	float vr_yaw_deadzone_angle;
 	int vr_shadow_optimization;
 	float vr_resolution_scale;
-	int vr_enable_motion_controllers;
 	int vr_weapon_hand;
 	int vr_movement_hand;
 	float vr_weapon_angle_offset;

diff --git a/Code/HomingMissile.cpp b/Code/HomingMissile.cpp
@@ -174,14 +174,8 @@ void CHomingMissile::UpdateControlledMissile(float frameTime)
 						SMovementState state;
 						pMC->GetMovementState(state);
 
-						eyePos = state.eyePosition;
-						eyeDir = state.eyeDirection;
-
-						if (g_pGameCVars->vr_enable_motion_controllers)
-						{
-							eyePos = state.weaponPosition;
-							eyeDir = state.fireDirection;
-						}
+						eyePos = state.weaponPosition;
+						eyeDir = state.fireDirection;
 					}
 					else
 					{	

diff --git a/Code/Lam.cpp b/Code/Lam.cpp
@@ -931,11 +931,8 @@ void CLam::AdjustLaserFPDirection(CItem* parent, Vec3 &dir, Vec3 &pos)
 		pos = camera.GetPosition();
 		dir = camera.GetMatrix().GetColumn1();
 
-		if (g_pGameCVars->vr_enable_motion_controllers)
-		{
-			pos = info.weaponPosition;
-			dir = info.fireDirection;
-		}
+		pos = info.weaponPosition;
+		dir = info.fireDirection;
 
 		dir.Normalize();
 	}
@@ -1023,4 +1020,3 @@ void CLam::PostSerialize()
 		ActivateLight(true);
 	}*/
 }
-
diff --git a/Code/Player.cpp b/Code/Player.cpp
@@ -1018,7 +1018,7 @@ void CPlayer::Update(SEntityUpdateContext& ctx, int updateSlot)
 void CPlayer::ProcessRoomscaleMovement()
 {
 	bool modalHudActive = g_pGame->GetHUD() && g_pGame->GetHUD()->GetModalHUD();
-	if (modalHudActive || !m_linkStats.CanRotate() || !g_pGameCVars->vr_enable_motion_controllers)
+	if (modalHudActive || !m_linkStats.CanRotate())
 		return;
 	if (GetLinkedVehicle() || m_stats.isOnLadder || !GetEntity()->GetPhysics() || m_stats.mountedWeaponID || m_stats.isGrabbed || m_stats.isFrozen.Value())
 		return;
@@ -1085,7 +1085,7 @@ void CPlayer::ProcessRoomscaleMovement()
 void CPlayer::ProcessRoomscaleRotation()
 {
 	bool modalHudActive = g_pGame->GetHUD() && g_pGame->GetHUD()->GetModalHUD();
-	if (modalHudActive || !m_linkStats.CanRotate() || !g_pGameCVars->vr_enable_motion_controllers)
+	if (modalHudActive || !m_linkStats.CanRotate())
 		return;
 	if (GetLinkedVehicle() || m_stats.isOnLadder || !GetEntity()->GetPhysics() || m_stats.mountedWeaponID || m_stats.isGrabbed || m_stats.isFrozen.Value())
 		return;

diff --git a/Code/RocketLauncher.cpp b/Code/RocketLauncher.cpp
@@ -369,7 +369,7 @@ void CRocketLauncher::UpdateDotEffect(float frameTime)
 
 	CActor *pActor = GetOwnerActor();
 	IMovementController * pMC = pActor ? pActor->GetMovementController() : NULL;
-	if (pMC && !g_pGameCVars->vr_enable_motion_controllers)
+	if (pMC && false)
 	{ 
 		SMovementState info;
 		pMC->GetMovementState(info);

diff --git a/Code/VR/OpenXRInput.cpp b/Code/VR/OpenXRInput.cpp
@@ -157,7 +157,7 @@ void OpenXRInput::Shutdown()
 
 void OpenXRInput::Update()
 {
-	if (!m_session || !g_pGameCVars->vr_enable_motion_controllers)
+	if (!m_session)
 		return;
 
 	std::vector<XrActiveActionSet> activeSets;

diff --git a/Code/VR/VRManager.cpp b/Code/VR/VRManager.cpp
@@ -381,13 +381,8 @@ inline float GetAngleDifference360( float a1, float a2 )
 
 void VRManager::ModifyWeaponPosition(CPlayer* player, Ang3& weaponAngles, Vec3& weaponPosition, bool slave)
 {
-	if (!g_pGameCVars->vr_enable_motion_controllers
-		|| g_pGame->GetMenu()->IsMenuActive()
-		//|| g_pGame->GetHUD()->GetModalHUD()
-		)
-	{
+	if (g_pGame->GetMenu()->IsMenuActive())
 		return;
-	}
 
 	CWeapon* weapon = player->GetWeapon(player->GetCurrentItemId());
 	if (!weapon || weapon->IsModifying() || (!gVRRenderer->ShouldRenderVR() && !weapon->IsZoomed() && !weapon->IsZooming()))
@@ -508,8 +503,7 @@ Vec3 VRManager::GetControllerWorldVelocity(int side)
 
 void VRManager::ModifyPlayerEye(CPlayer* pPlayer, Vec3& eyePosition, Vec3& eyeDirection)
 {
-	if (!g_pGameCVars->vr_enable_motion_controllers
-		|| g_pGame->GetMenu()->IsMenuActive()
+	if (g_pGame->GetMenu()->IsMenuActive()
 		|| g_pGame->GetHUD()->GetModalHUD()
 		|| !gVRRenderer->ShouldRenderVR())
 	{

diff --git a/Code/VR/VRRenderer.cpp b/Code/VR/VRRenderer.cpp
@@ -348,13 +348,10 @@ void VRRenderer::DrawCrosshair()
 	Vec3 crosshairPos = cam.GetPosition();
 	Vec3 dir = cam.GetViewdir();
 
-	if (g_pGameCVars->vr_enable_motion_controllers)
-	{
-		SMovementState moveState;
-		pPlayer->GetMovementController()->GetMovementState(moveState);
-		crosshairPos = moveState.weaponPosition;
-		dir = moveState.fireDirection;
-	}
+	SMovementState moveState;
+	pPlayer->GetMovementController()->GetMovementState(moveState);
+	crosshairPos = moveState.weaponPosition;
+	dir = moveState.fireDirection;
 
 	dir.Normalize();
 	float maxDistance = 10.f;