X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=input.h;h=cdb93a3ce7162f1fd7900157a53e6a51d317952f;hb=77c2df4874873fb2d085b9413ed97f66681ad7ac;hp=c6710f2696809e56b2c05b375cc78eef6b6a09bb;hpb=b3ca3b7a45eec11c46eb19772e10021177665adb;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/input.h b/input.h index c6710f2..cdb93a3 100644 --- a/input.h +++ b/input.h @@ -7,7 +7,7 @@ #include "vg/vg_console.h" #include "vg/vg_input.h" #include "vg/vg_m.h" -#include "conf.h" +#include "font.h" enum sr_bind{ k_srbind_jump = 0, @@ -15,6 +15,7 @@ enum sr_bind{ k_srbind_trick0, k_srbind_trick1, k_srbind_trick2, + k_srbind_sit, k_srbind_use, k_srbind_reset, k_srbind_camera, @@ -24,29 +25,318 @@ enum sr_bind{ k_srbind_mdown, k_srbind_mback, k_srbind_maccept, - k_srbind_max + k_srbind_mopen, + k_srbind_replay_play, + k_srbind_replay_freecam, + k_srbind_replay_resume, + k_srbind_world_left, + k_srbind_world_right, + k_srbind_home, + k_srbind_lobby, + k_srbind_chat, + k_srbind_max, }; -struct { - v2f joy_steer, - joy_grab, - joy_look; +enum sr_joystick{ + k_srjoystick_steer = 0, + k_srjoystick_grab, + k_srjoystick_look, + k_srjoystick_max +}; + +enum sr_axis{ + k_sraxis_grab = 0, + k_sraxis_mbrowse_h, + k_sraxis_mbrowse_v, + k_sraxis_replay_h, + k_sraxis_mworld_h, + + k_sraxis_max +}; - float axis_grab; +#define INPUT_BASIC( KB, JS ) \ + (vg_input_op[]){vg_keyboard, KB, vg_joy_button, JS, vg_end} + +static vg_input_op *input_button_list[] = { +[k_srbind_jump] = INPUT_BASIC( SDLK_SPACE, SDL_CONTROLLER_BUTTON_A ), +[k_srbind_push] = INPUT_BASIC( SDLK_w, SDL_CONTROLLER_BUTTON_B ), +[k_srbind_trick0] = (vg_input_op[]){ + vg_mouse, SDL_BUTTON_LEFT, + vg_joy_button, SDL_CONTROLLER_BUTTON_A, vg_end +}, +[k_srbind_trick1] = (vg_input_op[]){ + vg_mouse, SDL_BUTTON_RIGHT, + vg_joy_button, SDL_CONTROLLER_BUTTON_B, vg_end +}, +[k_srbind_trick2] = (vg_input_op[]){ + vg_mode_mul, vg_mouse, SDL_BUTTON_LEFT, vg_mouse, SDL_BUTTON_RIGHT, + vg_mode_absmax, vg_joy_button, SDL_CONTROLLER_BUTTON_X, vg_end +}, +[k_srbind_use] = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_Y ), +[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_LEFTSHOULDER ), +[k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ), +[k_srbind_mleft] = INPUT_BASIC( SDLK_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT ), +[k_srbind_mright]= INPUT_BASIC( SDLK_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), +[k_srbind_world_left] = + INPUT_BASIC( SDLK_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT ), +[k_srbind_world_right] = + INPUT_BASIC( SDLK_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), +[k_srbind_home] = INPUT_BASIC( SDLK_h, SDL_CONTROLLER_BUTTON_Y ), +[k_srbind_mup] = INPUT_BASIC( SDLK_UP, SDL_CONTROLLER_BUTTON_DPAD_UP ), +[k_srbind_mdown] = INPUT_BASIC( SDLK_DOWN, SDL_CONTROLLER_BUTTON_DPAD_DOWN ), +[k_srbind_mback] = INPUT_BASIC( SDLK_ESCAPE, SDL_CONTROLLER_BUTTON_B ), +[k_srbind_mopen] = INPUT_BASIC( SDLK_ESCAPE, SDL_CONTROLLER_BUTTON_START ), +[k_srbind_maccept] = (vg_input_op[]){ + vg_keyboard, SDLK_e, vg_keyboard, SDLK_RETURN, vg_keyboard, SDLK_RETURN2, + vg_joy_button, SDL_CONTROLLER_BUTTON_A, vg_end +}, +[k_srbind_replay_play] = INPUT_BASIC( SDLK_g, SDL_CONTROLLER_BUTTON_X ), +[k_srbind_replay_resume] = INPUT_BASIC( SDLK_SPACE, SDL_CONTROLLER_BUTTON_A ), +[k_srbind_replay_freecam] = INPUT_BASIC( SDLK_f, SDL_CONTROLLER_BUTTON_Y ), +[k_srbind_sit] = INPUT_BASIC( SDLK_z, SDL_CONTROLLER_BUTTON_B ), +[k_srbind_lobby] = INPUT_BASIC( SDLK_TAB, SDL_CONTROLLER_BUTTON_DPAD_LEFT ), +[k_srbind_chat ] = (vg_input_op[]){ vg_keyboard, SDLK_y, vg_end }, +[k_srbind_max]=NULL +}; + +static vg_input_op *input_axis_list[] = { +[k_sraxis_grab] = (vg_input_op[]){ + vg_keyboard, SDLK_LSHIFT, + vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, vg_end +}, +[k_sraxis_mbrowse_h] = (vg_input_op[]){ + vg_mode_add, vg_keyboard, SDLK_RIGHT, + vg_mode_sub, vg_keyboard, SDLK_LEFT, + vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTX, + vg_end +}, +[k_sraxis_mbrowse_v] = (vg_input_op[]){ + vg_mode_add, vg_keyboard, SDLK_UP, + vg_mode_sub, vg_keyboard, SDLK_DOWN, + vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTY, + vg_end +}, +[k_sraxis_replay_h] = (vg_input_op[]){ + vg_mode_add, vg_keyboard, SDLK_e, + vg_mode_sub, vg_keyboard, SDLK_q, + vg_mode_add, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, + vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT, + vg_end +}, +[k_sraxis_max]=NULL +}; + +static vg_input_op *input_joy_list[] = { +[k_srjoystick_steer] = (vg_input_op[]){ + vg_index, 0, vg_mode_add, vg_keyboard, SDLK_d, + vg_mode_sub, vg_keyboard, SDLK_a, + vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTX, + vg_index, 1, vg_mode_add, vg_keyboard, SDLK_s, + vg_mode_sub, vg_keyboard, SDLK_w, + vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_LEFTY, + vg_end +}, +[k_srjoystick_grab] = (vg_input_op[]){ + vg_index, 0, vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_RIGHTX, + vg_index, 1, vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_RIGHTY, + vg_end +}, +[k_srjoystick_look] = (vg_input_op[]){ + vg_index, 0, vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_RIGHTX, + vg_index, 1, vg_mode_absmax, vg_joy_axis, SDL_CONTROLLER_AXIS_RIGHTY, + vg_end +}, +[k_srjoystick_max]=NULL +}; + +struct { + float axis_states[ k_sraxis_max ][2]; + v2f joystick_states[ k_srjoystick_max ][2]; u8 button_states[ k_srbind_max ][2]; - float repeaters[4]; + + enum input_state { + k_input_state_enabled, + k_input_state_resume, + k_input_state_pause + } + state; } static srinput; -static int button_down( enum sr_bind button ) +static const char *controller_glyphs[ SDL_CONTROLLER_BUTTON_MAX ][2] = +{ /* xbox/generic playstation */ + [ SDL_CONTROLLER_BUTTON_A ] = { "\x1e\x85","\x1e\x82" }, + [ SDL_CONTROLLER_BUTTON_B ] = { "\x1e\x86","\x1e\x81" }, + [ SDL_CONTROLLER_BUTTON_X ] = { "\x1e\x83","\x1e\x7f" }, + [ SDL_CONTROLLER_BUTTON_Y ] = { "\x1e\x84","\x1e\x80" }, + [ SDL_CONTROLLER_BUTTON_LEFTSTICK ] = { "\x87", "\x87" }, + [ SDL_CONTROLLER_BUTTON_RIGHTSTICK ] = { "\x8b", "\x8b" }, + [ SDL_CONTROLLER_BUTTON_LEFTSHOULDER ] = { "\x91", "\x91" }, + [ SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ]= { "\x92", "\x92" }, + [ SDL_CONTROLLER_BUTTON_DPAD_LEFT ] = { "\x1e\x93","\x1e\x93" }, + [ SDL_CONTROLLER_BUTTON_DPAD_UP ] = { "\x1e\x94","\x1e\x94" }, + [ SDL_CONTROLLER_BUTTON_DPAD_RIGHT ] = { "\x1e\x95","\x1e\x95" }, + [ SDL_CONTROLLER_BUTTON_DPAD_DOWN ] = { "\x1e\x96","\x1e\x96" }, + [ SDL_CONTROLLER_BUTTON_GUIDE ] = { "\x91", "\x91" }, +}; + +static const char *controller_glyph( u32 sdl_index ){ + if( vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS3 || + vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS4 || + vg_input.display_input_type == SDL_CONTROLLER_TYPE_PS5 ) + { + return controller_glyphs[ sdl_index ][ 1 ]; + } + else if( vg_input.display_input_type == + SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO || + vg_input.display_input_type == + SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT || + vg_input.display_input_type == + SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR || + vg_input.display_input_type == + SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT ) + { + return NULL; + } + else + return controller_glyphs[ sdl_index ][ 0 ]; +} + +#define KEYBOARD_GLYPH( X ) "\x1f" X " " + +static const char *button_display_string( enum sr_bind button ) +{ + const char *controller_table[ k_srbind_max ] = { + [k_srbind_jump] = controller_glyph( SDL_CONTROLLER_BUTTON_A ), + [k_srbind_push] = controller_glyph( SDL_CONTROLLER_BUTTON_B ), + [k_srbind_trick0] = controller_glyph( SDL_CONTROLLER_BUTTON_A ), + [k_srbind_trick1] = controller_glyph( SDL_CONTROLLER_BUTTON_B ), + [k_srbind_trick2] = controller_glyph( SDL_CONTROLLER_BUTTON_X ), + [k_srbind_use] = controller_glyph( SDL_CONTROLLER_BUTTON_Y ), + [k_srbind_reset] = controller_glyph( SDL_CONTROLLER_BUTTON_LEFTSHOULDER ), + [k_srbind_camera] = controller_glyph( SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ), + [k_srbind_mleft] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_LEFT ), + [k_srbind_mright] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), + [k_srbind_world_left] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_LEFT ), + [k_srbind_world_right] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), + [k_srbind_home] = controller_glyph( SDL_CONTROLLER_BUTTON_Y ), + [k_srbind_mup] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_UP ), + [k_srbind_mdown] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_DOWN ), + [k_srbind_mback] = controller_glyph( SDL_CONTROLLER_BUTTON_B ), + [k_srbind_maccept]= controller_glyph( SDL_CONTROLLER_BUTTON_A ), + [k_srbind_mopen] = controller_glyph( SDL_CONTROLLER_BUTTON_GUIDE ), +[k_srbind_replay_play]= controller_glyph( SDL_CONTROLLER_BUTTON_X ), +[k_srbind_replay_freecam]=controller_glyph(SDL_CONTROLLER_BUTTON_Y ), +[k_srbind_replay_resume]=controller_glyph( SDL_CONTROLLER_BUTTON_A ), + [k_srbind_sit] = controller_glyph( SDL_CONTROLLER_BUTTON_B ), + [k_srbind_lobby] = controller_glyph( SDL_CONTROLLER_BUTTON_DPAD_LEFT ), + [k_srbind_chat] = "" + }; + + const char *keyboard_table[ k_srbind_max ] = { + [k_srbind_jump] = "\xa1", + [k_srbind_push] = KEYBOARD_GLYPH( "W" ), + [k_srbind_trick0] = "\x99", + [k_srbind_trick1] = "\x9a", + [k_srbind_trick2] = "\x9b", + [k_srbind_use] = KEYBOARD_GLYPH( "E" ), + [k_srbind_reset] = KEYBOARD_GLYPH( "R" ), + [k_srbind_camera] = KEYBOARD_GLYPH( "C" ), + [k_srbind_mleft] = KEYBOARD_GLYPH( "\x93" ), + [k_srbind_mright] = KEYBOARD_GLYPH( "\x95" ), + [k_srbind_world_left] = KEYBOARD_GLYPH( "\x93" ), + [k_srbind_world_right] = KEYBOARD_GLYPH( "\x95" ), + [k_srbind_home] = KEYBOARD_GLYPH( "H" ), + [k_srbind_mup] = KEYBOARD_GLYPH( "\x94" ), + [k_srbind_mdown] = KEYBOARD_GLYPH( "\x96" ), + [k_srbind_mback] = "\xa3", + [k_srbind_maccept]= "\xa2", + [k_srbind_mopen] = "\xa3" , +[k_srbind_replay_play]= KEYBOARD_GLYPH( "G" ), +[k_srbind_replay_freecam] = KEYBOARD_GLYPH( "F" ), +[k_srbind_replay_resume]= "\xa1", + [k_srbind_sit] = KEYBOARD_GLYPH( "Z" ), + [k_srbind_lobby] = KEYBOARD_GLYPH( "" ), // FIXME: what is tab? + [k_srbind_chat] = KEYBOARD_GLYPH( "Y" ) + }; + + if( vg_input.display_input_method == k_input_method_controller ) + return controller_table[ button ]; + else + return keyboard_table[ button ]; +} + +static const char *axis_display_string( enum sr_axis axis ) { - if( vg_console.enabled ) + const char *controller_table[ k_sraxis_max ] = { + [k_sraxis_grab] = "\x90", + [k_sraxis_mbrowse_h] = "\x88", + [k_sraxis_mbrowse_v] = "\x89", + [k_sraxis_replay_h] = "\x8f\x90", + [k_sraxis_mworld_h] = "\x93\x95" + }; + + const char *keyboard_table[ k_sraxis_max ] = { + [k_sraxis_grab] = "\x9e", + [k_sraxis_mbrowse_h] = KEYBOARD_GLYPH("\x93")KEYBOARD_GLYPH("\x95"), + [k_sraxis_mbrowse_v] = KEYBOARD_GLYPH("\x96")KEYBOARD_GLYPH("\x94"), + [k_sraxis_replay_h] = KEYBOARD_GLYPH("Q")KEYBOARD_GLYPH("E"), + [k_sraxis_mworld_h] = KEYBOARD_GLYPH("\x93")KEYBOARD_GLYPH("\x95"), + }; + + if( vg_input.display_input_method == k_input_method_controller ) + return controller_table[ axis ]; + else + return keyboard_table[ axis ]; +} + +static const char *joystick_display_string( enum sr_joystick joystick, + u32 axis ) +{ + const char *controller_table[ k_srjoystick_max ][3] = { + [k_srjoystick_steer] = {"\x88","\x89","\x8a"}, + [k_srjoystick_grab] = {"\x8c","\x8d","\x8e"}, + [k_srjoystick_look] = {"\x8c","\x8d","\x8e"} + }; + + const char *keyboard_table[ k_srjoystick_max ][3] = { + [k_srjoystick_steer] = {KEYBOARD_GLYPH("A")KEYBOARD_GLYPH("D"), /*h*/ + KEYBOARD_GLYPH("W")KEYBOARD_GLYPH("S"), /*v*/ + + KEYBOARD_GLYPH("A")KEYBOARD_GLYPH("D") /*hv*/ + KEYBOARD_GLYPH("W")KEYBOARD_GLYPH("S"), }, + [k_srjoystick_grab] = {"\xa4","\xa4","\xa4"}, + [k_srjoystick_look] = {"\xa4","\xa4","\xa4"} + }; + + if( vg_input.display_input_method == k_input_method_controller ) + return controller_table[ joystick ][axis]; + else return keyboard_table[ joystick ][axis]; +} + +static int input_filter_generic(void){ + if( srinput.state != k_input_state_enabled || + vg_ui.wants_mouse || vg_console.enabled ) + return 1; + else return 0; +} + +static int buttons_filter_fixed(void){ + if( input_filter_generic() ) + return 1; if( vg.engine_stage == k_engine_stage_update_fixed ) if( vg.fixed_iterations > 0 ) - return 0; + return 1; + + return 0; +} + +/* Rising edge of button */ +static int button_down( enum sr_bind button ){ + if( buttons_filter_fixed() ) return 0; if( srinput.button_states[ button ][0] && !srinput.button_states[ button ][1] ) @@ -55,14 +345,9 @@ static int button_down( enum sr_bind button ) return 0; } -static int button_up( enum sr_bind button ) -{ - if( vg_console.enabled ) - return 0; - - if( vg.engine_stage == k_engine_stage_update_fixed ) - if( vg.fixed_iterations > 0 ) - return 0; +/* Falling edge of button */ +static int button_up( enum sr_bind button ){ + if( buttons_filter_fixed() ) return 0; if( !srinput.button_states[ button ][0] && srinput.button_states[ button ][1] ) @@ -71,12 +356,26 @@ static int button_up( enum sr_bind button ) return 0; } -static int button_press( enum sr_bind button ) -{ - if( vg_console.enabled ) +/* State of button */ +static int button_press( enum sr_bind button ){ + if( input_filter_generic() ) return 0; + return + srinput.button_states[ button ][0]; +} - return srinput.button_states[ button ][0]; +static void joystick_state( enum sr_joystick joystick, v2f state ){ + if( input_filter_generic() ) + v2_zero( state ); + else + v2_copy( srinput.joystick_states[ joystick ][0], state ); +} + +static float axis_state( enum sr_axis axis ){ + if( input_filter_generic() ) + return 0.0f; + else + return srinput.axis_states[axis][0]; } static void setbtn( enum sr_bind button, u8 value ) @@ -84,91 +383,52 @@ static void setbtn( enum sr_bind button, u8 value ) srinput.button_states[button][0] |= value; } -static void skaterift_preupdate_inputs(void) -{ +static void skaterift_preupdate_inputs(void){ + if( srinput.state == k_input_state_resume ) + srinput.state = k_input_state_enabled; + for( u32 i=0; ibuttons; - setbtn( k_srbind_jump, buttons[ SDL_CONTROLLER_BUTTON_A ] ); - setbtn( k_srbind_push, buttons[ SDL_CONTROLLER_BUTTON_B ] ); - setbtn( k_srbind_trick0, buttons[ SDL_CONTROLLER_BUTTON_A ] ); - setbtn( k_srbind_trick1, buttons[ SDL_CONTROLLER_BUTTON_B ] ); - setbtn( k_srbind_trick2, buttons[ SDL_CONTROLLER_BUTTON_X ] ); - setbtn( k_srbind_use, buttons[ SDL_CONTROLLER_BUTTON_Y ] ); - setbtn( k_srbind_reset, buttons[ SDL_CONTROLLER_BUTTON_LEFTSHOULDER ] ); - setbtn( k_srbind_camera, buttons[ SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ] ); - setbtn( k_srbind_mleft, buttons[ SDL_CONTROLLER_BUTTON_DPAD_LEFT ] ); - setbtn( k_srbind_mright, buttons[ SDL_CONTROLLER_BUTTON_DPAD_RIGHT ] ); - setbtn( k_srbind_mup, buttons[ SDL_CONTROLLER_BUTTON_DPAD_UP ] ); - setbtn( k_srbind_mdown, buttons[ SDL_CONTROLLER_BUTTON_DPAD_DOWN ] ); - - float *axis = controller->axises; - - srinput.joy_steer[0] += axis[ SDL_CONTROLLER_AXIS_LEFTX ], - srinput.joy_steer[1] += axis[ SDL_CONTROLLER_AXIS_LEFTY ], - srinput.joy_look[0] += axis[ SDL_CONTROLLER_AXIS_RIGHTX ]; - srinput.joy_look[1] += axis[ SDL_CONTROLLER_AXIS_RIGHTY ]; - srinput.joy_grab[0] += axis[ SDL_CONTROLLER_AXIS_RIGHTX ]; - srinput.joy_grab[1] += axis[ SDL_CONTROLLER_AXIS_RIGHTY ]; - srinput.axis_grab += vg_maxf( 0.0f, - axis[ SDL_CONTROLLER_AXIS_TRIGGERRIGHT ] ); - - float lh = axis[ SDL_CONTROLLER_AXIS_LEFTX ], - lv = axis[ SDL_CONTROLLER_AXIS_LEFTY ], - sensitivity = 0.35f; - - if( lh > sensitivity ) setbtn( k_srbind_mright, 1 ); - if( lh < -sensitivity ) setbtn( k_srbind_mleft, 1 ); - if( lv > sensitivity ) setbtn( k_srbind_mup, 1 ); - if( lv < -sensitivity ) setbtn( k_srbind_mdown, 1 ); + for( int i=0; i