Added new comfort option - snappy movement

This option, when enables, increases the friction and acceleration
coefficients so that the movement feels move instantaneous and "snappy".
This may help improve comfort for players without strong "VR legs" at a
cost of changing the movement in SP mode (it doesn't work in skirmis or
multiplayer modes). Previously it was enabled by default for
singleplayer mode.

Author: RippeR37

code/game/bg_pmove.c

@@ -50,15 +50,15 @@ extern vr_clientinfo_t *vr;
 
 
 float PM_GetFrictionCoefficient( void ) {
-	if (vr != NULL && vr->clientNum == pm->ps->clientNum && !vr->use_fake_6dof) {
+	if (vr != NULL && vr->clientNum == pm->ps->clientNum && !vr->use_fake_6dof && vr->snappy_movement) {
 		return 10.0f;
 	} else {
 		return 6.0f;
 	}
 }
 
 float PM_GetAccelerationCoefficient( void ) {
-	if (vr != NULL && vr->clientNum == pm->ps->clientNum && !vr->use_fake_6dof) {
+	if (vr != NULL && vr->clientNum == pm->ps->clientNum && !vr->use_fake_6dof && vr->snappy_movement) {
 		return 1000.0f;
 	} else {
 		return 10.0f;

code/q3_ui/ui_comfort.c

@@ -30,6 +30,7 @@ COMFORT OPTIONS MENU
 
 
 #include "ui_local.h"
+#include "../vr/vr_clientinfo.h"
 
 
 #define ART_FRAMEL				"menu/art/frame2_l"
@@ -41,17 +42,20 @@ COMFORT OPTIONS MENU
 
 #define ID_COMFORTVIGNETTE		127
 #define ID_HEIGHTADJUST			128
-#define ID_ROLLHIT			    129
-#define ID_SMOOTHFOLLOW		    130
-#define ID_HAPTICINTENSITY	    131
-#define ID_BHAPTICS			    132
-#define ID_HUDDEPTH			    133
-#define ID_HUDYOFFSET		    134
-#define ID_HUDSCALE			    135
+#define ID_SNAPPYMOVEMENT		120
+#define ID_ROLLHIT			    130
+#define ID_SMOOTHFOLLOW		    131
+#define ID_HAPTICINTENSITY	    132
+#define ID_BHAPTICS			    133
+#define ID_HUDDEPTH			    134
+#define ID_HUDYOFFSET		    135
+#define ID_HUDSCALE			    136
 
 #define	NUM_HUDDEPTH			21
 
-#define ID_BACK					136
+#define ID_BACK					137
+
+extern vr_clientinfo_t* vr;
 
 typedef struct {
 	menuframework_s		menu;
@@ -62,6 +66,7 @@ typedef struct {
 
 	menuslider_s 		comfortvignette;
 	menuslider_s 		heightadjust;
+	menuradiobutton_s	snappymovement;
 	menuradiobutton_s	rollhit;
 	menuradiobutton_s	smoothfollow;
 	menuslider_s 		hapticintensity;
@@ -79,13 +84,18 @@ static comfort_t s_comfort;
 static void Comfort_SetMenuItems( void ) {
 	s_comfort.comfortvignette.curvalue		= trap_Cvar_VariableValue( "vr_comfortVignette" );
 	s_comfort.heightadjust.curvalue				= trap_Cvar_VariableValue( "vr_heightAdjust" );
+	s_comfort.snappymovement.curvalue     = trap_Cvar_VariableValue( "vr_snappyMovement" ) != 0;
 	s_comfort.rollhit.curvalue						= trap_Cvar_VariableValue( "vr_rollWhenHit" ) != 0;
 	s_comfort.smoothfollow.curvalue				= trap_Cvar_VariableValue( "cg_smoothFollow" ) != 0;
 	s_comfort.bhaptics.curvalue				= trap_Cvar_VariableValue( "vr_bhaptics" ) != 0;
 	s_comfort.hapticintensity.curvalue		= trap_Cvar_VariableValue( "vr_hapticIntensity" );
 	s_comfort.huddepth.curvalue						= (int)trap_Cvar_VariableValue( "vr_hudDepth" ) % NUM_HUDDEPTH;
 	s_comfort.hudyoffset.curvalue					= trap_Cvar_VariableValue( "vr_hudYOffset" ) + 200;
 	s_comfort.hudscale.curvalue						= trap_Cvar_VariableValue( "vr_hudScale" );
+
+	if (vr) {
+		vr->snappy_movement = s_comfort.snappymovement.curvalue;
+	}
 }
 
 
@@ -103,6 +113,13 @@ static void Comfort_MenuEvent( void* ptr, int notification ) {
 			trap_Cvar_SetValue( "vr_heightAdjust", s_comfort.heightadjust.curvalue );
 			break;
 
+		case ID_SNAPPYMOVEMENT:
+			trap_Cvar_SetValue( "vr_snappyMovement", s_comfort.snappymovement.curvalue );
+			if (vr) {
+				vr->snappy_movement = s_comfort.snappymovement.curvalue;
+			}
+			break;
+
 		case ID_ROLLHIT:
 			trap_Cvar_SetValue( "vr_rollWhenHit", s_comfort.rollhit.curvalue );
 			break;
@@ -192,6 +209,15 @@ static void Comfort_MenuInit( void ) {
 	s_comfort.heightadjust.minvalue		     = 0.0f;
 	s_comfort.heightadjust.maxvalue		     = 1.0f;
 
+	y += BIGCHAR_HEIGHT+2;
+	s_comfort.snappymovement.generic.type        = MTYPE_RADIOBUTTON;
+	s_comfort.snappymovement.generic.name	      = "Snappy movement (SP):";
+	s_comfort.snappymovement.generic.flags	      = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
+	s_comfort.snappymovement.generic.callback    = Comfort_MenuEvent;
+	s_comfort.snappymovement.generic.id          = ID_SNAPPYMOVEMENT;
+	s_comfort.snappymovement.generic.x	          = VR_X_POS;
+	s_comfort.snappymovement.generic.y	          = y;
+
 	y += BIGCHAR_HEIGHT+2;
 	s_comfort.rollhit.generic.type        = MTYPE_RADIOBUTTON;
 	s_comfort.rollhit.generic.name	      = "Roll When Hit:";
@@ -282,6 +308,7 @@ static void Comfort_MenuInit( void ) {
 
 	Menu_AddItem( &s_comfort.menu, &s_comfort.comfortvignette );
 	Menu_AddItem( &s_comfort.menu, &s_comfort.heightadjust );
+	Menu_AddItem( &s_comfort.menu, &s_comfort.snappymovement );
 	Menu_AddItem( &s_comfort.menu, &s_comfort.rollhit );
 	Menu_AddItem( &s_comfort.menu, &s_comfort.smoothfollow );
 	Menu_AddItem( &s_comfort.menu, &s_comfort.bhaptics );

code/vr/vr_clientinfo.h

@@ -50,6 +50,7 @@ typedef struct {
 	qboolean in_menu;
 	qboolean local_server;
 	qboolean single_player;
+	qboolean snappy_movement;
 	qboolean use_fake_6dof;
 	VR_FollowMode follow_mode;
 	qboolean weapon_select;

code/vr/vr_cvars.c

@@ -20,6 +20,7 @@ cvar_t *vr_showItemInHand = NULL;
 cvar_t *vr_refreshrate = NULL;
 cvar_t *vr_superSampling = NULL;
 cvar_t *vr_weaponScope = NULL;
+cvar_t *vr_snappyMovement = NULL;
 cvar_t *vr_rollWhenHit = NULL;
 cvar_t *vr_hudYOffset = NULL;
 cvar_t *vr_hudScale = NULL;
@@ -65,6 +66,7 @@ void VR_InitCvars( void )
 	vr_refreshrate = Cvar_Get ("vr_refreshrate", "90", CVAR_ARCHIVE);
 	vr_superSampling = Cvar_Get ("vr_superSampling", "1.0", CVAR_ARCHIVE);
 	vr_weaponScope = Cvar_Get ("vr_weaponScope", "1", CVAR_ARCHIVE);
+	vr_snappyMovement = Cvar_Get ("vr_snappyMovement", "0", CVAR_ARCHIVE); // 0 - disabled (SP == MP), 1 - enabled (SP instant movement/no inertia)
 	vr_rollWhenHit = Cvar_Get ("vr_rollWhenHit", "0", CVAR_ARCHIVE);
 	vr_hudYOffset = Cvar_Get ("vr_hudYOffset", "0", CVAR_ARCHIVE);
 	vr_hudScale = Cvar_Get ("vr_hudScale", "1.0", CVAR_ARCHIVE);