nJoy: Fixed the analog shoulder buttons for the XBox 360 pad

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1944 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-01-20 05:28:30 +00:00
parent bede48c6b1
commit 00bca8d807
7 changed files with 259 additions and 129 deletions

View File

@ -131,7 +131,8 @@ struct CONTROLLER_MAPPING // GC PAD MAPPING
int enabled; // Pad attached?
int deadzone; // Deadzone... what else?
int ID; // SDL joystick device ID
int controllertype; // Joystick, Joystick with no hat or a keyboard (perhaps a mouse later)
int controllertype; // Hat: Hat or custom buttons
int triggertype; // Triggers range
int eventnum; // Linux Event Number, Can't be found dynamically yet
};
@ -167,12 +168,20 @@ enum
CTL_START
};
// DPad Type
enum
{
CTL_DPAD_HAT = 0, // Automatically use the first hat that SDL finds
CTL_DPAD_CUSTOM // Custom directional pad settings
};
// Trigger Type
enum
{
CTL_TRIGGER_HALF = 0, // XBox 360
CTL_TRIGGER_WHOLE // Other pads
};
enum
{
CTL_D_PAD_UP = 0,
@ -224,7 +233,7 @@ void DEBUG_INIT();
void DEBUG_QUIT();
void Pad_Use_Rumble(u8 _numPAD, SPADStatus* _pPADStatus); // Rumble
u8 Pad_Convert(int _val); // Value conversion
u8 Pad_Convert(int _val, int _type = 1); // Value conversion
std::vector<int> Pad_Square_to_Circle(int _x, int _y); // Value conversion
//void SaveConfig();