qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Joystick updates. Now support 8 joystick axes (since I have a 7-axis gamepad I'm testing with). Also adds swimup/swimdown as axis 5. And ability to invert axes by assigning them as negative numbers (set joyaxis1 "-1"). Joystick handling is liable to change radically as it improves, though, don't count on these as stable interfaces...

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-12-28 18:02:33 +00:00
parent 0f2f58754b
commit c523671606
1 changed files with 68 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@
Copyright (C) 2000 David Jeffery
Copyright (C) 2000 Jeff Teunissen <deek@dusknet.dhs.org>
Copyright (C) 2001 Ragnvald `Despair` Maartmann-Moe IV
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -38,18 +39,15 @@ static const char rcsid[] =
#include "QF/joystick.h"
#include "QF/keys.h"
#include "QF/mathlib.h"
#include "QF/va.h"
#include "compat.h"
#define JOY_MAX_AXES 6
#define JOY_MAX_BUTTONS 16
cvar_t *joy_device; // Joystick device name
cvar_t *joy_enable; // Joystick enabling flag
cvar_t *joy_amp; // Joystick amplification
cvar_t *joy_pre_amp; // Joystick pre-amplification
qboolean joy_found = false;
qboolean joy_active = false;
@ -64,7 +62,9 @@ ocvar_t joy_axes_cvar_init[JOY_MAX_AXES] = {
{"joyaxis3", "3"},
{"joyaxis4", "0"},
{"joyaxis5", "0"},
{"joyaxis6", "0"}
{"joyaxis6", "0"},
{"joyaxis7", "0"},
{"joyaxis8", "0"}
};
struct joy_axis joy_axes[JOY_MAX_AXES];
@ -86,11 +86,8 @@ JOY_Move (void)
if (!joy_active || !joy_enable->int_val)
return;
Cvar_SetValue (joy_amp, max (0.0001, joy_amp->value));
Cvar_SetValue (joy_pre_amp, max (0.0001, joy_pre_amp->value));
mult_joy = 4 * joy_amp->value * joy_pre_amp->value *
in_amp->value * in_pre_amp->value;
mult_joy = 1 / (201 - (4 * joy_amp->value * joy_pre_amp->value *
in_amp->value * in_pre_amp->value));
// 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
@ -98,27 +95,67 @@ 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 /
(201 - mult_joy));
(float) (joy_axes[i].current * mult_joy);
}
break;
case -1:
if (joy_axes[i].current) {
viewdelta.angles[YAW] +=
(float) (joy_axes[i].current * mult_joy);
}
break;
case 2:
if (joy_axes[i].current) {
viewdelta.position[2] -=
(float) (joy_axes[i].current /
(201 - mult_joy));
(float) (joy_axes[i].current * mult_joy);
}
break;
case -2:
if (joy_axes[i].current) {
viewdelta.position[2] +=
(float) (joy_axes[i].current * mult_joy);
}
break;
case 3:
if (joy_axes[i].current) {
viewdelta.position[0] +=
(float) (joy_axes[i].current /
(201 - mult_joy));
(float) (joy_axes[i].current * mult_joy);
}
break;
case -3:
if (joy_axes[i].current) {
viewdelta.position[0] -=
(float) (joy_axes[i].current * mult_joy);
}
break;
case 4:
if (joy_axes[i].current) {
viewdelta.angles[PITCH] -=
(float) (joy_axes[i].current /
(201 - mult_joy));
(float) (joy_axes[i].current * mult_joy);
}
break;
case -4:
if (joy_axes[i].current) {
viewdelta.angles[PITCH] +=
(float) (joy_axes[i].current * mult_joy);
}
break;
case 5:
if (joy_axes[i].current) {
viewdelta.position[1] -=
(float) (joy_axes[i].current * mult_joy);
}
break;
case -5:
if (joy_axes[i].current) {
viewdelta.position[1] +=
(float) (joy_axes[i].current * mult_joy);
}
break;
default:
break;
}
}
}
@ -153,6 +190,12 @@ JOY_Init (void)
joy_active = true;
}
static void
joyamp_f (cvar_t *var)
{
Cvar_Set (var, va ("%g", max (0.0001, var->value)));
}
void
JOY_Init_Cvars (void)
{
@ -162,10 +205,10 @@ JOY_Init_Cvars (void)
"Joystick device");
joy_enable = Cvar_Get ("joy_enable", "1", CVAR_NONE | CVAR_ARCHIVE, 0,
"Joystick enable flag");
joy_amp = Cvar_Get ("joy_amp", "1", CVAR_NONE | CVAR_ARCHIVE, 0,
joy_amp = Cvar_Get ("joy_amp", "1", CVAR_NONE | CVAR_ARCHIVE, joyamp_f,
"Joystick amplification");
joy_pre_amp = Cvar_Get ("joy_pre_amp", "1", CVAR_NONE | CVAR_ARCHIVE, 0,
"Joystick pre-amplification");
joy_pre_amp = Cvar_Get ("joy_pre_amp", "1", CVAR_NONE | CVAR_ARCHIVE,
joyamp_f, "Joystick pre-amplification");
for (i = 0; i < JOY_MAX_AXES; i++) {
joy_axes[i].axis = Cvar_Get (joy_axes_cvar_init[i].name,