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

Now you can actually turn joyadvanced on and off while playing.

Browse source
This commit is contained in:
Dabb 2000-12-30 10:54:45 +00:00
parent 4d1a1fb5e9
commit 76f78fbbf3
1 changed files with 58 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
source/joy_win.c
View file

@ -44,6 +44,7 @@
#ifdef __MINGW32__ #ifdef __MINGW32__
# define INITGUID # define INITGUID
#endif #endif
#include "winquake.h" #include "winquake.h"
#include <dinput.h> #include <dinput.h>
#include "client.h" #include "client.h"
@ -54,7 +55,6 @@
#include "input.h" #include "input.h"
#include "cl_input.h" #include "cl_input.h"
#include "view.h" #include "view.h"
//#include "dosisms.h"
#include "host.h" #include "host.h"
// Joystick variables and structures // Joystick variables and structures
@ -84,46 +84,49 @@ enum _ControlList {
AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn AxisNada = 0, AxisForward, AxisLook, AxisSide, AxisTurn
}; };
static DWORD dwAxisFlags[JOY_MAX_AXES] = { DWORD dwAxisFlags[JOY_MAX_AXES] = {
JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ, JOY_RETURNR, JOY_RETURNU, JOY_RETURNV JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ, JOY_RETURNR, JOY_RETURNU, JOY_RETURNV
}; };
static DWORD dwAxisMap[JOY_MAX_AXES]; DWORD dwAxisMap[JOY_MAX_AXES];
static DWORD dwControlMap[JOY_MAX_AXES]; DWORD dwControlMap[JOY_MAX_AXES];
static PDWORD pdwRawValue[JOY_MAX_AXES]; PDWORD pdwRawValue[JOY_MAX_AXES];
JOYINFOEX ji;
static JOYINFOEX ji;
// none of these cvars are saved over a session // none of these cvars are saved over a session
// this means that advanced controller configuration needs to be executed // this means that advanced controller configuration needs to be executed
// each time. this avoids any problems with getting back to a default usage // each time. this avoids any problems with getting back to a default usage
// or when changing from one controller to another. this way at least something // or when changing from one controller to another. this way at least something
// works. // works.
static cvar_t *in_joystick; cvar_t *in_joystick;
static cvar_t *joy_name; cvar_t *joy_name;
static cvar_t *joy_advanced; cvar_t *joy_advanced;
static cvar_t *joy_advaxisx; cvar_t *joy_advaxisx;
static cvar_t *joy_advaxisy; cvar_t *joy_advaxisy;
static cvar_t *joy_advaxisz; cvar_t *joy_advaxisz;
static cvar_t *joy_advaxisr; cvar_t *joy_advaxisr;
static cvar_t *joy_advaxisu; cvar_t *joy_advaxisu;
static cvar_t *joy_advaxisv; cvar_t *joy_advaxisv;
static cvar_t *joy_forwardthreshold; cvar_t *joy_forwardthreshold;
static cvar_t *joy_sidethreshold; cvar_t *joy_sidethreshold;
static cvar_t *joy_pitchthreshold; cvar_t *joy_pitchthreshold;
static cvar_t *joy_yawthreshold; cvar_t *joy_yawthreshold;
static cvar_t *joy_forwardsensitivity; cvar_t *joy_forwardsensitivity;
static cvar_t *joy_sidesensitivity; cvar_t *joy_sidesensitivity;
static cvar_t *joy_pitchsensitivity; cvar_t *joy_pitchsensitivity;
static cvar_t *joy_yawsensitivity; cvar_t *joy_yawsensitivity;
static cvar_t *joy_wwhack1; cvar_t *joy_wwhack1;
static cvar_t *joy_wwhack2; cvar_t *joy_wwhack2;
static qboolean joy_avail, joy_advancedinit, joy_haspov; cvar_t *joy_debug;
static DWORD joy_oldbuttonstate, joy_oldpovstate;
static int joy_id; qboolean joy_advancedinit, joy_haspov;
static DWORD joy_flags; DWORD joy_oldbuttonstate, joy_oldpovstate;
static DWORD joy_numbuttons; int joy_id;
DWORD joy_flags;
DWORD joy_numbuttons;
// //
// //
@ -132,9 +135,10 @@ void JOY_AdvancedUpdate_f (void);
void JOY_StartupJoystick (void); void JOY_StartupJoystick (void);
void JOY_Move (usercmd_t *cmd); void JOY_Move (usercmd_t *cmd);
void JOY_Init_Cvars(void); void JOY_Init_Cvars(void);
PDWORD RawValuePointer (int axis); PDWORD RawValuePointer (int axis);
static qboolean qboolean
JOY_Read (void) JOY_Read (void)
{ {
memset (&ji, 0, sizeof (ji)); memset (&ji, 0, sizeof (ji));
@ -149,6 +153,15 @@ JOY_Read (void)
if (joy_wwhack1->int_val) { if (joy_wwhack1->int_val) {
ji.dwUpos += 100; ji.dwUpos += 100;
} }
if (joy_debug->int_val) {
if (ji.dwXpos) Con_Printf("X: %ld\n",ji.dwXpos);
if (ji.dwYpos) Con_Printf("Y: %ld\n",ji.dwYpos);
if (ji.dwZpos) Con_Printf("Z: %ld\n",ji.dwZpos);
if (ji.dwRpos) Con_Printf("R: %ld\n",ji.dwRpos);
if (ji.dwUpos) Con_Printf("U: %ld\n",ji.dwUpos);
if (ji.dwVpos) Con_Printf("V: %ld\n",ji.dwVpos);
if (ji.dwButtons) Con_Printf("B: %ld\n",ji.dwButtons);
}
return true; return true;
} else { // read error } else { // read error
return false; return false;
@ -161,7 +174,7 @@ JOY_Command (void)
int i, key_index; int i, key_index;
DWORD buttonstate, povstate; DWORD buttonstate, povstate;
if (!joy_avail) { if (!joy_found) {
return; return;
} }
// loop through the joystick buttons // loop through the joystick buttons
@ -217,12 +230,14 @@ JOY_Move (usercmd_t *cmd)
float speed, aspeed; float speed, aspeed;
float fAxisValue, fTemp; float fAxisValue, fTemp;
int i; int i;
static int lastjoy=0;
// complete initialization if first time in // complete initialization if first time in
// this is needed as cvars are not available at initialization time // this is needed as cvars are not available at initialization time
if (!joy_advancedinit) { if (!joy_advancedinit || lastjoy!=joy_advanced->int_val) {
JOY_AdvancedUpdate_f (); JOY_AdvancedUpdate_f ();
joy_advancedinit = true; joy_advancedinit = true;
lastjoy=joy_advanced->int_val;
} }
// verify joystick is available and that the user wants to use it // verify joystick is available and that the user wants to use it
if (!joy_active || !joy_enable->int_val) { if (!joy_active || !joy_enable->int_val) {
@ -376,10 +391,10 @@ JOY_Move (usercmd_t *cmd)
void void
JOY_Init (void) JOY_Init (void)
{ {
JOY_StartupJoystick();
Cmd_AddCommand ("joyadvancedupdate", JOY_AdvancedUpdate_f); Cmd_AddCommand ("joyadvancedupdate", JOY_AdvancedUpdate_f);
JOY_Init_Cvars();
Con_DPrintf ("This system does not have joystick support.\n"); // Con_DPrintf ("This system does not have joystick support.\n");
} }
void void
@ -467,7 +482,7 @@ JOY_StartupJoystick (void)
MMRESULT mmr = !JOYERR_NOERROR; MMRESULT mmr = !JOYERR_NOERROR;
// assume no joystick // assume no joystick
joy_avail = false; joy_found = false;
// abort startup if user requests no joystick // abort startup if user requests no joystick
if (COM_CheckParm ("-nojoy")) if (COM_CheckParm ("-nojoy"))
@ -513,9 +528,10 @@ JOY_StartupJoystick (void)
// completed // completed
// this is needed as cvars are not available during initialization // this is needed as cvars are not available during initialization
joy_avail = true;
joy_advancedinit = false; joy_advancedinit = false;
joy_found = true;
// fixme: do this right
joy_active = true;
Con_Printf ("\njoystick detected\n\n"); Con_Printf ("\njoystick detected\n\n");
} }
@ -545,7 +561,8 @@ RawValuePointer (int axis)
} }
void JOY_Init_Cvars(void) void
JOY_Init_Cvars(void)
{ {
joy_device = joy_device =
Cvar_Get ("joy_device", "none", CVAR_NONE | CVAR_ROM, Cvar_Get ("joy_device", "none", CVAR_NONE | CVAR_ROM,
@ -594,6 +611,8 @@ void JOY_Init_Cvars(void)
joy_wwhack1 = Cvar_Get ("joywwhack1", "0.0", CVAR_NONE, "None"); joy_wwhack1 = Cvar_Get ("joywwhack1", "0.0", CVAR_NONE, "None");
joy_wwhack2 = Cvar_Get ("joywwhack2", "0.0", CVAR_NONE, "None"); joy_wwhack2 = Cvar_Get ("joywwhack2", "0.0", CVAR_NONE, "None");
joy_debug = Cvar_Get ("joy_debug", "0.0", CVAR_NONE, "None");
return; return;
} }