X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=input.h;h=337782420c932ff4d2b9e0729709b73b7e86b402;hb=0ba0bbe2da453f17f56a88521057e6514ae30b8f;hp=d60fece386d84e14bfe963c832ea23719a9b4869;hpb=70ff4a83e5a4b35436388d9bb999c939559ac23f;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/input.h b/input.h
index d60fece..3377824 100644
--- a/input.h
+++ b/input.h
@@ -1,17 +1,15 @@
-#ifndef INPUT_H
-#define INPUT_H
-
-#define VG_GAME
-#include "vg/vg.h"
+#pragma once
 #include "vg/vg_platform.h" 
 #include "vg/vg_console.h"
 #include "vg/vg_input.h"
 #include "vg/vg_m.h"
 #include "font.h"
 
-enum sr_bind{
+enum sr_bind
+{
    k_srbind_jump = 0,
    k_srbind_push,
+   k_srbind_skid,
    k_srbind_trick0,
    k_srbind_trick1,
    k_srbind_trick2,
@@ -27,6 +25,7 @@ enum sr_bind{
    k_srbind_mback, 
    k_srbind_maccept,
    k_srbind_mopen,
+   k_srbind_mhub,
    k_srbind_replay_play,
    k_srbind_replay_freecam,
    k_srbind_replay_resume,
@@ -35,10 +34,11 @@ enum sr_bind{
    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,
 };
 
@@ -54,6 +54,7 @@ enum sr_axis{
    k_sraxis_mbrowse_h,
    k_sraxis_mbrowse_v,
    k_sraxis_replay_h,
+   k_sraxis_skid,
    k_sraxis_max
 };
 
@@ -77,21 +78,21 @@ static vg_input_op *input_button_list[] = {
    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_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_dead_respawn] =
-   INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ),
-[k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ),
+   INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_UP ),
+[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_mhub]  = INPUT_BASIC( SDLK_h, SDL_CONTROLLER_BUTTON_Y ),
 [k_srbind_maccept] = (vg_input_op[]){
    vg_keyboard, SDLK_e, vg_gui_visible, 0,
       vg_keyboard, SDLK_RETURN, vg_keyboard, SDLK_RETURN2,
@@ -104,6 +105,8 @@ static vg_input_op *input_button_list[] = {
 [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,
@@ -113,7 +116,8 @@ static vg_input_op *input_button_list[] = {
 },
 [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
 };
 
@@ -129,16 +133,21 @@ static vg_input_op *input_axis_list[] = {
    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_add, vg_keyboard, SDLK_UP,
    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_add, vg_keyboard, SDLK_e,
    vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT,
+   vg_mode_add, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
+   vg_end
+},
+[k_sraxis_skid] = (vg_input_op[]){
+   vg_mode_sub, vg_joy_button, SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+   vg_mode_add, vg_joy_button, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
    vg_end
 },
 [k_sraxis_max]=NULL
@@ -146,10 +155,10 @@ static vg_input_op *input_axis_list[] = {
 
 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_index, 0, vg_mode_sub, vg_keyboard, SDLK_a,
+                vg_mode_add, vg_keyboard, SDLK_d,
+   vg_index, 1, vg_mode_sub, vg_keyboard, SDLK_w,
+                vg_mode_add, vg_keyboard, SDLK_s,
                 vg_mode_absmax, vg_joy_ls,
    vg_end
 },
@@ -178,8 +187,8 @@ struct {
 static srinput;
 
 static int input_filter_generic(void){
-   if( srinput.state != k_input_state_enabled || 
-       vg_ui.wants_mouse || vg_console.enabled )
+   if( (srinput.state != k_input_state_enabled) || vg_console.enabled ||
+       (workshop_form.page != k_workshop_form_hidden)  )
       return 1;
    else 
       return 0;
@@ -300,5 +309,3 @@ static void skaterift_preupdate_inputs(void){
       else           srinput.button_states[k_srbind_mdown][0] = 1;
    }
 }
-
-#endif /* INPUT_H */