qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 06:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

More tweaks to joystick code. amp settings have a far greater effect now...

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-12-30 06:08:24 +00:00
parent 3cfd2c0a8e
commit 29b48c594e
1 changed files with 22 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
libs/video/targets/joy.c
View file

@ -86,8 +86,8 @@ JOY_Move (void)
if (!joy_active || !joy_enable->int_val)
return;
mult_joy = 1 / (201 - (4 * joy_amp->value * joy_pre_amp->value *
in_amp->value * in_pre_amp->value));
mult_joy = (joy_amp->value * joy_pre_amp->value *
in_amp->value * in_pre_amp->value) / 200.0;
// Yes, mult_joy looks like a mess, but use of pre_amp values is useful in
// scripts, and *_pre_amp will matter once joystick filtering/acceleration
// is implemented
@ -95,64 +95,44 @@ JOY_Move (void)
for (i = 0; i < JOY_MAX_AXES; i++) {
switch (joy_axes[i].axis->int_val) {
case 1:
if (joy_axes[i].current) {
viewdelta.angles[YAW] -=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.angles[YAW] -= joy_axes[i].current * mult_joy;
break;
case -1:
if (joy_axes[i].current) {
viewdelta.angles[YAW] +=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.angles[YAW] += joy_axes[i].current * mult_joy;
break;
case 2:
if (joy_axes[i].current) {
viewdelta.position[2] -=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.position[2] -= joy_axes[i].current * mult_joy;
break;
case -2:
if (joy_axes[i].current) {
viewdelta.position[2] +=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.position[2] += joy_axes[i].current * mult_joy;
break;
case 3:
if (joy_axes[i].current) {
viewdelta.position[0] +=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.position[0] += joy_axes[i].current * mult_joy;
break;
case -3:
if (joy_axes[i].current) {
viewdelta.position[0] -=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.position[0] -= joy_axes[i].current * mult_joy;
break;
case 4:
if (joy_axes[i].current) {
viewdelta.angles[PITCH] -=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.angles[PITCH] -= joy_axes[i].current * mult_joy;
break;
case -4:
if (joy_axes[i].current) {
viewdelta.angles[PITCH] +=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.angles[PITCH] += joy_axes[i].current * mult_joy;
break;
case 5:
if (joy_axes[i].current) {
viewdelta.position[1] -=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.position[1] -= joy_axes[i].current * mult_joy;
break;
case -5:
if (joy_axes[i].current) {
viewdelta.position[1] +=
(float) (joy_axes[i].current * mult_joy);
}
if (joy_axes[i].current)
viewdelta.position[1] += joy_axes[i].current * mult_joy;
break;
default:
break;