mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-27 04:00:42 +00:00
d3a3c74112
New Wii control defaults for the Wii Remote + Nunchuk and the Classic Controller. This includes new code added just so that the Home key brings up the menu in-game, reducing the need for a USB keyboard. On the technical side, raw joystick access (comparable to what is available for keyboard and mouse) is now present in jmact, on the game side. (added: joystick.[ch]) Using this new raw joystick access, I replaced tueidj's hack to map A and B to LMB/RMB and D-Pad Up/Down to the scrollwheel. I made the menus more friendly to mouse and joystick browsing by adding and unifying checks and clears for various buttons and gamefuncs. In fact, the majority of the time spent on this commit was tracking down problems that appeared with the factoring and trying to understand the menu system and the way input checks are precariously executed. In addition, "Press any key or button to continue" now truly means what it says. As a result of incorporating proper raw access into control.c instead of it directly accessing the implementaiton, the program *may* no longer be affected by joystick input when it is out of focus. This follows the pattern set by the mouse, and I think this is a positive change. A small bonus: In the classic/old keyboard preset, the key for Show_Console has been changed from '`' to 'C' because '`' is taken by Quick_Kick. git-svn-id: https://svn.eduke32.com/eduke32@2728 1a8010ca-5511-0410-912e-c29ae57300e0
56 lines
1.5 KiB
C
56 lines
1.5 KiB
C
|
|
#ifndef __joystick_h
|
|
#define __joystick_h
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#if defined(GEKKO)
|
|
#define WII_A 0x00000001
|
|
#define WII_B 0x00000002
|
|
#define WII_1 0x00000004
|
|
#define WII_2 0x00000008
|
|
#define WII_MINUS 0x00000010
|
|
#define WII_PLUS 0x00000020
|
|
#define WII_HOME 0x00000040
|
|
#define WII_Z 0x00000080
|
|
#define WII_C 0x00000100
|
|
#define WII_X 0x00000200
|
|
#define WII_Y 0x00000400
|
|
#define WII_FULL_L 0x00000800
|
|
#define WII_FULL_R 0x00001000
|
|
#define WII_ZL 0x00002000
|
|
#define WII_ZR 0x00004000
|
|
#define WII_DPAD_UP 0x00008000
|
|
#define WII_DPAD_RIGHT 0x00010000
|
|
#define WII_DPAD_DOWN 0x00020000
|
|
#define WII_DPAD_LEFT 0x00040000
|
|
#endif
|
|
|
|
#define HAT_CENTERED 0x00
|
|
#define HAT_UP 0x01
|
|
#define HAT_RIGHT 0x02
|
|
#define HAT_DOWN 0x04
|
|
#define HAT_LEFT 0x08
|
|
#define HAT_RIGHTUP (HAT_RIGHT|HAT_UP)
|
|
#define HAT_RIGHTDOWN (HAT_RIGHT|HAT_DOWN)
|
|
#define HAT_LEFTUP (HAT_LEFT|HAT_UP)
|
|
#define HAT_LEFTDOWN (HAT_LEFT|HAT_DOWN)
|
|
|
|
int32_t JOYSTICK_GetButtons( void );
|
|
int32_t JOYSTICK_ClearButton( int32_t b );
|
|
void JOYSTICK_ClearAllButtons( void );
|
|
|
|
int32_t JOYSTICK_GetHat( int32_t h );
|
|
void JOYSTICK_ClearHat( int32_t h );
|
|
void JOYSTICK_ClearAllHats( void );
|
|
|
|
int32_t JOYSTICK_GetAxis( int32_t a );
|
|
void JOYSTICK_ClearAxis( int32_t a );
|
|
void JOYSTICK_ClearAllAxes( void );
|
|
|
|
#ifdef __cplusplus
|
|
};
|
|
#endif
|
|
#endif /* __joystick_h */
|