Migrate mouse acceleration cvars cl_mouseAccel*

Author: slipher

src/engine/client/cl_input.cpp

@@ -40,6 +40,15 @@ Maryland 20850 USA.
 #include "engine/qcommon/sys.h"
 #include "framework/CommandSystem.h"
 
+static Cvar::Cvar<float> cl_mouseAccel(
+	"cl_mouseAccel", "mouse acceleration strength", Cvar::NONE, 0);
+static Cvar::Range<Cvar::Cvar<int>> cl_mouseAccelStyle(
+	"cl_mouseAccelStyle", "mouse acceleration - 0: 'legacy' quadratic, 1: 'new' exponential",
+	Cvar::NONE, 0, 0, 1);
+static Cvar::Range<Cvar::Cvar<float>> cl_mouseAccelOffset(
+	"cl_mouseAccelOffset", "accel style 1 characteristic mouse speed (higher = less accel)",
+	Cvar::NONE, 5, 0.001, 999);
+
 static Cvar::Cvar<bool> in_gameControllerAvailable(
 	"in_gameControllerAvailable", "whether controller is a gamepad (as opposed to joystick)",
 	Cvar::ROM, false);
@@ -536,16 +545,16 @@ void CL_MouseMove( usercmd_t *cmd )
 		return;
 	}
 
-	if ( cl_mouseAccel->value != 0.0f )
+	if ( cl_mouseAccel.Get() != 0.0f )
 	{
-		if ( cl_mouseAccelStyle->integer == 0 )
+		if ( cl_mouseAccelStyle.Get() == 0 )
 		{
 			float accelSensitivity;
 			float rate;
 
 			rate = sqrt( mx * mx + my * my ) / ( float ) frame_msec;
 
-			accelSensitivity = cvar_sensitivity.Get() + rate * cl_mouseAccel->value;
+			accelSensitivity = cvar_sensitivity.Get() + rate * cl_mouseAccel.Get();
 			mx *= accelSensitivity;
 			my *= accelSensitivity;
 		}
@@ -557,15 +566,16 @@ void CL_MouseMove( usercmd_t *cmd )
 			// sensitivity remains pretty much unchanged at low speeds
 			// cl_mouseAccel is a power value to how the acceleration is shaped
 			// cl_mouseAccelOffset is the rate for which the acceleration will have doubled the non accelerated amplification
+			// cl_mouseAccelOffset should be set to the max rate value
 			// NOTE: decouple the config cvars for independent acceleration setup along X and Y?
 
 			rate[ 0 ] = fabsf( mx ) / ( float ) frame_msec;
 			rate[ 1 ] = fabsf( my ) / ( float ) frame_msec;
-			power[ 0 ] = powf( rate[ 0 ] / cl_mouseAccelOffset->value, cl_mouseAccel->value );
-			power[ 1 ] = powf( rate[ 1 ] / cl_mouseAccelOffset->value, cl_mouseAccel->value );
+			power[ 0 ] = powf( rate[ 0 ] / cl_mouseAccelOffset.Get(), cl_mouseAccel.Get() );
+			power[ 1 ] = powf( rate[ 1 ] / cl_mouseAccelOffset.Get(), cl_mouseAccel.Get());
 
-			mx = cvar_sensitivity.Get() * ( mx + ( ( mx < 0 ) ? -power[ 0 ] : power[ 0 ] ) * cl_mouseAccelOffset->value );
-			my = cvar_sensitivity.Get() * ( my + ( ( my < 0 ) ? -power[ 1 ] : power[ 1 ] ) * cl_mouseAccelOffset->value );
+			mx = cvar_sensitivity.Get() * ( mx + ( ( mx < 0 ) ? -power[ 0 ] : power[ 0 ] ) * cl_mouseAccelOffset.Get() );
+			my = cvar_sensitivity.Get() * ( my + ( ( my < 0 ) ? -power[ 1 ] : power[ 1 ] ) * cl_mouseAccelOffset.Get() );
 		}
 	}
 	else

src/engine/client/cl_main.cpp

@@ -2322,16 +2322,6 @@ void CL_Init()
 	cl_maxpackets = Cvar_Get( "cl_maxpackets", "125", 0 );
 	cl_packetdup = Cvar_Get( "cl_packetdup", "1", 0 );
 
-	cl_mouseAccel = Cvar_Get( "cl_mouseAccel", "0", 0 );
-
-	// 0: legacy mouse acceleration
-	// 1: new implementation
-
-	cl_mouseAccelStyle = Cvar_Get( "cl_mouseAccelStyle", "0", 0 );
-	// offset for the power function (for style 1, ignored otherwise)
-	// this should be set to the max rate value
-	cl_mouseAccelOffset = Cvar_Get( "cl_mouseAccelOffset", "5", 0 );
-
 	cl_allowDownload = Cvar_Get( "cl_allowDownload", "1", 0 );
 
 	cl_consoleFontKerning = Cvar_Get( "cl_consoleFontKerning", "0", 0 );

src/engine/client/client.h

@@ -399,10 +399,6 @@ extern Cvar::Range<Cvar::Cvar<int>> cl_doubletapdelay;
 extern cvar_t *cl_sensitivity;
 extern Cvar::Cvar<bool> cl_freelook;
 
-extern cvar_t *cl_mouseAccel;
-extern cvar_t *cl_mouseAccelOffset;
-extern cvar_t *cl_mouseAccelStyle;
-
 extern Cvar::Cvar<float> m_pitch;
 extern Cvar::Cvar<float> m_yaw;
 extern Cvar::Cvar<float> m_forward;