Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More menu adjustments #1941

Merged
merged 7 commits into from
Oct 6, 2024
Merged

More menu adjustments #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5069e95
Use consistent description
ceski-1 Oct 5, 2024
2112f1c
Use previous outer deadzone defaults
ceski-1 Oct 5, 2024
68583b9
Prioritize sensitivity thermos
ceski-1 Oct 5, 2024
10e755b
Rename gap macro to be less confusing
ceski-1 Oct 5, 2024
99a9235
Add gamepad movement sensitivities to menu
ceski-1 Oct 5, 2024
13352a7
Update advanced gamepad menu
ceski-1 Oct 5, 2024
90a6d65
Movement speed --> sensitivity
ceski-1 Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions src/i_gamepad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ enum
static boolean joy_enable;
joy_platform_t joy_platform;
static int joy_stick_layout;
static int joy_forward_speed;
static int joy_strafe_speed;
static int joy_forward_sensitivity;
static int joy_strafe_sensitivity;
static int joy_turn_speed;
static int joy_look_speed;
static int joy_outer_turn_speed;
static int joy_outer_look_speed;
static int joy_outer_ramp_time;
static int joy_scale_diagonal_movement;
static int joy_movement_type;
static int joy_movement_curve;
static int joy_camera_curve;
static int joy_movement_deadzone_type;
Expand Down Expand Up @@ -136,6 +136,11 @@ boolean I_StandardLayout(void)
return (joy_stick_layout < LAYOUT_FLICK_STICK);
}

boolean I_RampTimeEnabled(void)
{
return (joy_outer_turn_speed > 0);
}

static void CalcExtraScale(axes_t *ax)
{
if ((ax->x.extra_sens > 0.0f || ax->y.extra_sens > 0.0f) && ax->max_mag)
Expand Down Expand Up @@ -448,17 +453,17 @@ static void RefreshSettings(void)
CalcMovement = axes_func[joy_movement_deadzone_type];
CalcCamera = axes_func[joy_camera_deadzone_type];

movement.x.sens = joy_strafe_speed / 10.0f;
movement.y.sens = joy_forward_speed / 10.0f;
movement.x.sens = joy_strafe_sensitivity / 10.0f;
movement.y.sens = joy_forward_sensitivity / 10.0f;

camera.x.sens = joy_turn_speed / (float)DEFAULT_SPEED;
camera.y.sens = joy_look_speed / (float)DEFAULT_SPEED;

camera.x.extra_sens = joy_outer_turn_speed / (float)DEFAULT_SPEED;
camera.y.extra_sens = joy_outer_look_speed / (float)DEFAULT_SPEED;
camera.ramp_time = joy_outer_ramp_time * 1000;
camera.ramp_time = joy_outer_ramp_time * 10000;

movement.circle_to_square = (joy_scale_diagonal_movement > 0);
movement.circle_to_square = (joy_movement_type > 0);

movement.exponent = joy_movement_curve / 10.0f;
camera.exponent = I_StandardLayout() ? (joy_camera_curve / 10.0f) : 1.0f;
Expand Down Expand Up @@ -489,10 +494,10 @@ void I_BindGamepadVariables(void)
BIND_NUM_PADADV(joy_stick_layout, LAYOUT_DEFAULT, 0, NUM_LAYOUTS - 1,
"Analog stick layout (0 = Off; 1 = Default; 2 = Southpaw; 3 = Legacy; "
"4 = Legacy Southpaw; 5 = Flick Stick; 6 = Flick Stick Southpaw)");
BIND_NUM(joy_forward_speed, 10, 0, 20,
"Forward speed (0 = 0.0x; 20 = 2.0x)");
BIND_NUM(joy_strafe_speed, 10, 0, 20,
"Strafe speed (0 = 0.0x; 20 = 2.0x)");
BIND_NUM(joy_forward_sensitivity, 10, 0, 40,
"Forward sensitivity (0 = 0.0x; 40 = 4.0x)");
BIND_NUM(joy_strafe_sensitivity, 10, 0, 40,
"Strafe sensitivity (0 = 0.0x; 40 = 4.0x)");
BIND_NUM_GENERAL(joy_turn_speed, DEFAULT_SPEED, 0, 720,
"Turn speed [degrees/second]");
BIND_NUM_GENERAL(joy_look_speed, DEFAULT_SPEED * 9 / 16, 0, 720,
Expand All @@ -501,10 +506,10 @@ void I_BindGamepadVariables(void)
"Extra turn speed at outer deadzone [degrees/second]");
BIND_NUM(joy_outer_look_speed, 0, 0, 720,
"Extra look speed at outer deadzone [degrees/second]");
BIND_NUM(joy_outer_ramp_time, 200, 0, 1000,
"Ramp time for extra speed [milliseconds]");
BIND_NUM_PADADV(joy_scale_diagonal_movement, 1, 0, 1,
"Scale diagonal movement (0 = Linear; 1 = Circle to Square)");
BIND_NUM(joy_outer_ramp_time, 20, 0, 100,
"Ramp time for extra speed (0 = Instant; 100 = 1000 ms)");
BIND_NUM_PADADV(joy_movement_type, 1, 0, 1,
"Movement type (0 = Normalized; 1 = Faster Diagonals)");
BIND_NUM_PADADV(joy_movement_curve, 10, 10, 30,
"Movement response curve (10 = Linear; 20 = Squared; 30 = Cubed)");
BIND_NUM_PADADV(joy_camera_curve, 20, 10, 30,
Expand All @@ -517,9 +522,9 @@ void I_BindGamepadVariables(void)
"Movement inner deadzone [percent]");
BIND_NUM_GENERAL(joy_camera_inner_deadzone, 15, 0, 50,
"Camera inner deadzone [percent]");
BIND_NUM(joy_movement_outer_deadzone, 5, 0, 30,
BIND_NUM(joy_movement_outer_deadzone, 2, 0, 30,
"Movement outer deadzone [percent]");
BIND_NUM(joy_camera_outer_deadzone, 5, 0, 30,
BIND_NUM(joy_camera_outer_deadzone, 2, 0, 30,
"Camera outer deadzone [percent]");
BIND_NUM(joy_trigger_deadzone, 15, 0, 50,
"Trigger deadzone [percent]");
Expand Down
1 change: 1 addition & 0 deletions src/i_gamepad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ void I_GetRawAxesScaleMenu(boolean move, float *scale, float *limit);
boolean I_GamepadEnabled(void);
boolean I_UseStickLayout(void);
boolean I_StandardLayout(void);
boolean I_RampTimeEnabled(void);
void I_CalcRadial(axes_t *ax, float *xaxis, float *yaxis);
void I_CalcGamepadAxes(boolean strafe);
void I_UpdateAxesData(const struct event_s *ev);
Expand Down
Loading