X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=input.h;h=cdb93a3ce7162f1fd7900157a53e6a51d317952f;hb=77c2df4874873fb2d085b9413ed97f66681ad7ac;hp=1fc945fdd3870d9badccd25f61a30f28dcdb3eef;hpb=f0c064ff3c9bb162db39bf533e5df973816621c0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/input.h b/input.h index 1fc945f..cdb93a3 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, @@ -31,6 +32,8 @@ enum sr_bind{ k_srbind_world_left, k_srbind_world_right, k_srbind_home, + k_srbind_lobby, + k_srbind_chat, k_srbind_max, }; @@ -51,11 +54,113 @@ enum sr_axis{ 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_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]; - u32 enabled; + + enum input_state { + k_input_state_enabled, + k_input_state_resume, + k_input_state_pause + } + state; } static srinput; @@ -123,7 +228,10 @@ static const char *button_display_string( enum sr_bind button ) [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_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 ] = { @@ -148,6 +256,9 @@ static const char *button_display_string( enum sr_bind button ) [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 ) @@ -204,10 +315,17 @@ static const char *joystick_display_string( enum sr_joystick joystick, else return keyboard_table[ joystick ][axis]; } -static int buttons_filter_fixed(void) -{ - if( !srinput.enabled ) return 1; - if( vg_ui.wants_mouse ) return 1; +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 ) @@ -217,8 +335,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] && @@ -229,8 +346,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] && @@ -241,23 +357,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]; + if( input_filter_generic() ) + return 0.0f; + else + return srinput.axis_states[axis][0]; } static void setbtn( enum sr_bind button, u8 value ) @@ -265,8 +383,10 @@ 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; i= 0 ){ - struct vg_controller *controller = - &vg_input.controllers[vg_input.active_controller_index]; - - u32 *buttons = controller->buttons; - 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_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 ] ); - - 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], - *axisreplayh = &srinput.axis_states[ k_sraxis_replay_h ][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 ]; - 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 ], - 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_mdown, 1 ); - if( lv < -sensitivity ) setbtn( k_srbind_mup, 1 ); + for( int i=0; i