X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=input.h;h=275c6a441217d6d3b2e8b66d862e8eb0b2574840;hb=78cc452a8343821ba47c0905d755657847dafd25;hp=6f19634f606e4dde10fd52754dbcaf9d3804cd66;hpb=223e75026f958029f9664380ed20a5daa3ee2ae7;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/input.h b/input.h index 6f19634..275c6a4 100644 --- a/input.h +++ b/input.h @@ -7,17 +7,19 @@ #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, k_srbind_push, + k_srbind_skid, k_srbind_trick0, k_srbind_trick1, k_srbind_trick2, + k_srbind_sit, k_srbind_use, k_srbind_reset, + k_srbind_dead_respawn, k_srbind_camera, k_srbind_mleft, k_srbind_mright, @@ -26,6 +28,19 @@ enum sr_bind{ k_srbind_mback, k_srbind_maccept, 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_run, + + k_srbind_miniworld_teleport, + k_srbind_miniworld_resume, + k_srbind_devbutton, k_srbind_max, }; @@ -40,145 +55,149 @@ enum sr_axis{ k_sraxis_grab = 0, k_sraxis_mbrowse_h, k_sraxis_mbrowse_v, + k_sraxis_replay_h, + k_sraxis_skid, k_sraxis_max }; + +#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_mouse, SDL_BUTTON_LEFT, vg_mode_mul, 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_DPAD_LEFT ), +[k_srbind_dead_respawn] = + INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), +[k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), +[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_gui_visible, 0, + vg_keyboard, SDLK_RETURN, vg_keyboard, SDLK_RETURN2, + vg_gui_visible, 1, + 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_run ] = (vg_input_op[]){ vg_keyboard, SDLK_LSHIFT, + vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT, vg_end }, + +[k_srbind_miniworld_resume] = (vg_input_op[]){ + vg_keyboard, SDLK_RETURN, vg_gui_visible, 0, + vg_keyboard, SDLK_RETURN2, + vg_gui_visible, 1, + vg_joy_button, SDL_CONTROLLER_BUTTON_X, vg_end +}, +[k_srbind_miniworld_teleport]= INPUT_BASIC( SDLK_q, + SDL_CONTROLLER_BUTTON_LEFTSHOULDER ), +[k_srbind_skid] = (vg_input_op[]){ vg_keyboard, SDLK_LCTRL, vg_end }, +[k_srbind_devbutton] = (vg_input_op[]){ vg_keyboard, SDLK_3, 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_sub, vg_keyboard, SDLK_LEFT, + vg_mode_add, vg_keyboard, SDLK_RIGHT, + vg_mode_add, 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_sub, 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_skid] = (vg_input_op[]){ + vg_mode_add, vg_joy_button, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, + vg_mode_sub, vg_joy_button, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, + 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_index, 1, vg_mode_add, vg_keyboard, SDLK_s, + vg_mode_sub, vg_keyboard, SDLK_w, + vg_mode_absmax, vg_joy_ls, + vg_end +}, +[k_srjoystick_grab] = (vg_input_op[]){ + vg_joy_rs, vg_end +}, +[k_srjoystick_look] = (vg_input_op[]){ + vg_joy_rs, 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]; -} -static srinput; -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; + enum input_state { + k_input_state_enabled, + k_input_state_resume, + k_input_state_resuming, + k_input_state_pause } - 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_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 ) - }; - - const char *keyboard_table[ k_srbind_max ] = { - [k_srbind_jump] = KEYBOARD_GLYPH( "A" ), - [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_mup] = KEYBOARD_GLYPH( "\x94" ), - [k_srbind_mdown] = KEYBOARD_GLYPH( "\x96" ), - [k_srbind_mback] = "\xa3", - [k_srbind_maccept]= "\xa2", - [k_srbind_mopen] = "\xa3" , - }; - - 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 ) -{ - const char *controller_table[ k_sraxis_max ] = { - [k_sraxis_grab] = "\x90", - [k_sraxis_mbrowse_h] = "\x88", - [k_sraxis_mbrowse_v] = "\x89" - }; - - 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") - }; - - if( vg_input.display_input_method == k_input_method_controller ) - return controller_table[ axis ]; - else - return keyboard_table[ axis ]; + state; } +static srinput; -static const char *joystick_display_string( enum sr_joystick joystick ) -{ - const char *controller_table[ k_srjoystick_max ] = { - [k_srjoystick_steer] = "\x88", - [k_srjoystick_grab] = "\x8e", - [k_srjoystick_look] = "\x8e" - }; - - const char *keyboard_table[ k_srjoystick_max ] = { - [k_srjoystick_steer] = KEYBOARD_GLYPH( "\x93" )KEYBOARD_GLYPH( "\x95" ), - [k_srjoystick_grab] = "\xa4", - [k_srjoystick_look] = "\xa4" - }; - - if( vg_input.display_input_method == k_input_method_controller ) - return controller_table[ joystick ]; - else - return keyboard_table[ joystick ]; +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( vg_console.enabled ) +static int buttons_filter_fixed(void){ + if( input_filter_generic() ) return 1; if( vg.engine_stage == k_engine_stage_update_fixed ) @@ -189,10 +208,8 @@ static int buttons_filter_fixed(void) } /* Rising edge of button */ -static int button_down( enum sr_bind button ) -{ - if( buttons_filter_fixed() ) - return 0; +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] ) @@ -202,10 +219,8 @@ static int button_down( enum sr_bind button ) } /* Falling edge of button */ -static int button_up( enum sr_bind button ) -{ - if( buttons_filter_fixed() ) - return 0; +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] ) @@ -215,35 +230,34 @@ static int button_up( enum sr_bind button ) } /* State of button */ -static int button_press( enum sr_bind button ) -{ - if( vg_console.enabled ) +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( vg_console.enabled ) +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( vg_console.enabled ) return 0.0f; - else return srinput.axis_states[axis][0]; +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 ) -{ - srinput.button_states[button][0] |= value; -} +static void skaterift_preupdate_inputs(void){ + if( srinput.state == k_input_state_resuming ) + srinput.state = k_input_state_enabled; + + if( srinput.state == k_input_state_resume ) + srinput.state = k_input_state_resuming; -static void skaterift_preupdate_inputs(void) -{ 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 ] ); - setbtn( k_srbind_mback, buttons[ SDL_CONTROLLER_BUTTON_B ] ); - setbtn( k_srbind_maccept,buttons[ SDL_CONTROLLER_BUTTON_A ] ); - setbtn( k_srbind_mopen, buttons[ SDL_CONTROLLER_BUTTON_GUIDE ] ); - - float *axis = controller->axises; - - float *steer = srinput.joystick_states[ k_srjoystick_steer ][0], - *look = srinput.joystick_states[ k_srjoystick_look ][0], - *grab = srinput.joystick_states[ k_srjoystick_grab ][0], - *axisgrab = &srinput.axis_states[ k_sraxis_grab ][0], - *axisbrowseh = &srinput.axis_states[ k_sraxis_mbrowse_h ][0], - *axisbrowsev = &srinput.axis_states[ k_sraxis_mbrowse_v ][0]; - - steer[0] += axis[ SDL_CONTROLLER_AXIS_LEFTX ]; - steer[1] += axis[ SDL_CONTROLLER_AXIS_LEFTY ]; - look[0] += axis[ SDL_CONTROLLER_AXIS_RIGHTX ]; - look[1] += axis[ SDL_CONTROLLER_AXIS_RIGHTY ]; - grab[0] += axis[ SDL_CONTROLLER_AXIS_RIGHTX ]; - grab[1] += axis[ SDL_CONTROLLER_AXIS_RIGHTY ]; - axisgrab[0] += vg_maxf( 0.0f, axis[ SDL_CONTROLLER_AXIS_TRIGGERRIGHT ] ); - axisbrowseh[0] += axis[ SDL_CONTROLLER_AXIS_LEFTX ]; - axisbrowsev[0] += axis[ SDL_CONTROLLER_AXIS_LEFTY ]; - - 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 sensitivity ){ + if( x > 0.0f ) srinput.button_states[k_srbind_mright][0] = 1; + else srinput.button_states[k_srbind_mleft][0] = 1; + } + + if( fabsf(y) > sensitivity ){ + if( y > 0.0f ) srinput.button_states[k_srbind_mup][0] = 1; + else srinput.button_states[k_srbind_mdown][0] = 1; + } } #endif /* INPUT_H */