X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=input.h;h=ee7cbee9e5f9d5828e970998878d78c7a20ffa34;hb=9c0893a71497912deecdcd84dff9afbeac32f8f4;hp=b4262bc0f0ef9a08e460e7338d8266a330c8a30e;hpb=02e009ae6e20938675277e9ce2f467e17b170cc7;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/input.h b/input.h index b4262bc..ee7cbee 100644 --- a/input.h +++ b/input.h @@ -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, @@ -25,6 +26,14 @@ 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_max, }; @@ -39,6 +48,9 @@ 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 }; @@ -46,7 +58,7 @@ struct { float axis_states[ k_sraxis_max ][2]; v2f joystick_states[ k_srjoystick_max ][2]; u8 button_states[ k_srbind_max ][2]; - u32 ignore_input_frames; + u32 enabled; } static srinput; @@ -67,8 +79,7 @@ static const char *controller_glyphs[ SDL_CONTROLLER_BUTTON_MAX ][2] = [ SDL_CONTROLLER_BUTTON_GUIDE ] = { "\x91", "\x91" }, }; -static const char *controller_glyph( u32 sdl_index ) -{ +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 ) @@ -105,11 +116,20 @@ static const char *button_display_string( enum sr_bind button ) [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_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 ] = { @@ -123,11 +143,20 @@ static const char *button_display_string( enum sr_bind button ) [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 ) @@ -141,13 +170,17 @@ 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" + [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_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 ) @@ -180,10 +213,16 @@ static const char *joystick_display_string( enum sr_joystick joystick, else return keyboard_table[ joystick ][axis]; } -static int buttons_filter_fixed(void) -{ - if( srinput.ignore_input_frames ) return 1; - if( vg_ui.wants_mouse ) return 1; +static int input_filter_generic(void){ + if( !srinput.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 ) @@ -193,8 +232,7 @@ static int buttons_filter_fixed(void) } /* Rising edge of button */ -static int button_down( enum sr_bind button ) -{ +static int button_down( enum sr_bind button ){ if( buttons_filter_fixed() ) return 0; if( srinput.button_states[ button ][0] && @@ -205,8 +243,7 @@ static int button_down( enum sr_bind button ) } /* Falling edge of button */ -static int button_up( enum sr_bind button ) -{ +static int button_up( enum sr_bind button ){ if( buttons_filter_fixed() ) return 0; if( !srinput.button_states[ button ][0] && @@ -217,24 +254,25 @@ static int button_up( enum sr_bind button ) } /* State of button */ -static int button_press( enum sr_bind button ) -{ - if( vg_ui.wants_mouse ) return 0; - return srinput.button_states[ button ][0]; +static int button_press( enum sr_bind button ){ + if( input_filter_generic() ) + return 0; + return + srinput.button_states[ button ][0]; } -static void joystick_state( enum sr_joystick joystick, v2f state ) -{ - if( vg_ui.wants_mouse ) +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_ui.wants_mouse ) 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 ) @@ -244,9 +282,6 @@ static void setbtn( enum sr_bind button, u8 value ) static void skaterift_preupdate_inputs(void) { - if( srinput.ignore_input_frames ) - srinput.ignore_input_frames --; - for( u32 i=0; i= 0 ){ struct vg_controller *controller = @@ -323,21 +377,30 @@ static void skaterift_preupdate_inputs(void) 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_world_left, buttons[ SDL_CONTROLLER_BUTTON_DPAD_LEFT ] ); + setbtn( k_srbind_world_right,buttons[ SDL_CONTROLLER_BUTTON_DPAD_RIGHT ]); + setbtn( k_srbind_home, buttons[ SDL_CONTROLLER_BUTTON_Y ] ); 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_START ] ); setbtn( k_srbind_mback, buttons[ SDL_CONTROLLER_BUTTON_START ] ); + setbtn( k_srbind_replay_resume, buttons[ SDL_CONTROLLER_BUTTON_A ] ); + setbtn( k_srbind_replay_play, buttons[ SDL_CONTROLLER_BUTTON_X ] ); + setbtn( k_srbind_replay_freecam, buttons[ SDL_CONTROLLER_BUTTON_Y ] ); + setbtn( k_srbind_sit, buttons[ SDL_CONTROLLER_BUTTON_B ] ); + setbtn( k_srbind_lobby, buttons[ SDL_CONTROLLER_BUTTON_DPAD_LEFT ] ); + // k_srbind_chat 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]; + *axisbrowsev = &srinput.axis_states[ k_sraxis_mbrowse_v ][0], + *axisreplayh = &srinput.axis_states[ k_sraxis_replay_h ][0]; steer[0] += axis[ SDL_CONTROLLER_AXIS_LEFTX ]; steer[1] += axis[ SDL_CONTROLLER_AXIS_LEFTY ]; @@ -348,6 +411,8 @@ static void skaterift_preupdate_inputs(void) 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 ]; + axisreplayh[0] += vg_maxf(0.0f,axis[SDL_CONTROLLER_AXIS_TRIGGERRIGHT]); + axisreplayh[0] -= vg_maxf(0.0f,axis[SDL_CONTROLLER_AXIS_TRIGGERLEFT]); float lh = axis[ SDL_CONTROLLER_AXIS_LEFTX ], lv = axis[ SDL_CONTROLLER_AXIS_LEFTY ],