fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

joy accel

Browse source
This commit is contained in:
Eric Wasylishen 2016-03-08 00:13:16 -08:00
parent 198d27b6fb
commit b7ef69e9ff
1 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
quakespasm/Quake/in_sdl.c
View file

@ -49,12 +49,13 @@ static cvar_t in_debugkeys = {"in_debugkeys", "0", CVAR_NONE};
#endif
// SDL2 Game Controller cvars
cvar_t joy_deadzone = { "joy_deadzone", "0.2", CVAR_NONE };
cvar_t joy_deadzone = { "joy_deadzone", "0.175", CVAR_NONE };
cvar_t joy_deadzone_trigger = { "joy_deadzone_trigger", "0.001", CVAR_NONE };
cvar_t joy_sensitivity_yaw = { "joy_sensitivity_yaw", "300", CVAR_NONE };
cvar_t joy_sensitivity_pitch = { "joy_sensitivity_pitch", "150", CVAR_NONE };
cvar_t joy_invert = { "joy_invert", "0", CVAR_NONE };
cvar_t joy_exponent = { "joy_exponent", "3", CVAR_NONE };
cvar_t joy_accel = { "joy_accel", "2000", CVAR_NONE };
cvar_t joy_swapmovelook = { "joy_swapmovelook", "0", CVAR_NONE };
cvar_t joy_enable = { "joy_enable", "1", CVAR_NONE };
@ -370,6 +371,7 @@ void IN_Init (void)
Cvar_RegisterVariable(&joy_deadzone_trigger);
Cvar_RegisterVariable(&joy_invert);
Cvar_RegisterVariable(&joy_exponent);
Cvar_RegisterVariable(&joy_accel);
Cvar_RegisterVariable(&joy_swapmovelook);
Cvar_RegisterVariable(&joy_enable);
@ -416,6 +418,9 @@ static joyaxisstate_t joy_axisstate;
static double joy_buttontimer[SDL_CONTROLLER_BUTTON_MAX];
static double joy_emulatedkeytimer[10];
static vec_t joy_targetspeed; // absolute value
static vec_t joy_currspeed; // absolute value
/*
================
IN_ApplyEasing
@ -443,6 +448,41 @@ static joyaxis_t IN_ApplyEasing(joyaxis_t axis, float exponent)
return result;
}
/*
================
IN_ApplyEasing
assumes axis values are in [-1, 1]. Raises the axis values to the given exponent, keeping signs.
================
*/
static joyaxis_t IN_ApplyAcceleration(joyaxis_t axis)
{
joyaxis_t result = { 0 };
const vec_t stick_magnitude = sqrtf((axis.x * axis.x) + (axis.y * axis.y));
if (stick_magnitude == 0)
return result; // stick is at 0
if (joy_accel.value == 0)
return axis; // acceleration is disabled
joy_targetspeed = stick_magnitude;
if (joy_targetspeed > joy_currspeed)
{
vec_t accel = joy_accel.value / joy_sensitivity_yaw.value;
joy_currspeed += host_frametime * accel;
joy_currspeed = q_min(joy_targetspeed, joy_currspeed);
}
else
{
joy_currspeed = joy_targetspeed;
}
result.x = axis.x * (joy_currspeed / stick_magnitude);
result.y = axis.y * (joy_currspeed / stick_magnitude);
return result;
}
/*
================
IN_ApplyMoveEasing
@ -662,6 +702,7 @@ void IN_JoyMove (usercmd_t *cmd)
moveAxis = IN_ApplyMoveEasing(moveAxis);
lookAxis = IN_ApplyEasing(lookAxis, joy_exponent.value);
lookAxis = IN_ApplyAcceleration(lookAxis);
if (in_speed.state & 1)
speed = cl_movespeedkey.value;