keyboard

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index 92667821e84363b2ffda5c4134e9a6cc637c31d0..972807b7a9892c1c09caedddd7a3b5a831023d2e 100644 (file)
--- a/player.h
+++ b/player.h
@@ -87,6 +87,20 @@ VG_STATIC struct gplayer
 
    v3f handl_target, handr_target,
        handl, handr;
+
+   /* Input */
+   struct input_binding *input_js1h,
+                        *input_js1v,
+                        *input_js2h,
+                        *input_js2v,
+                        *input_emjs2h,
+                        *input_emjs2v,
+                        *input_jump,
+                        *input_push,
+                        *input_walk,
+                        *input_switch_mode,
+                        *input_reset,
+                        *input_grab;
    
    /* Camera */
    float air_blend;
@@ -203,6 +217,59 @@ VG_STATIC void player_save_rewind_frame(void);
 
 VG_STATIC void player_init(void)                                            /* 1 */
 {
+   player.input_js1h = vg_create_named_input( "steer-h", k_input_type_axis );
+   player.input_js1v = vg_create_named_input( "steer-v", k_input_type_axis );
+   player.input_grab = vg_create_named_input( "grab", k_input_type_axis_norm );
+   player.input_js2h = vg_create_named_input( "grab-h", k_input_type_axis );
+   player.input_js2v = vg_create_named_input( "grab-v", k_input_type_axis );
+   player.input_emjs2h = vg_create_named_input( "kbgrab-h", k_input_type_axis );
+   player.input_emjs2v = vg_create_named_input( "kbgrab-v", k_input_type_axis );
+   player.input_jump = vg_create_named_input( "jump", k_input_type_button );
+   player.input_push = vg_create_named_input( "push", k_input_type_axis_norm );
+   player.input_walk = vg_create_named_input( "walk", k_input_type_axis_norm );
+   player.input_switch_mode = vg_create_named_input( "switch-mode",
+                                                     k_input_type_button );
+   player.input_reset = vg_create_named_input( "reset", k_input_type_button );
+
+   const char *default_cfg[] = 
+   {
+      "bind steer-h gp-ls-h",
+      "bind  steer-h gp-ls-h",
+      "bind -steer-h a",
+      "bind +steer-h d",
+
+      "bind  steer-v gp-ls-v",
+      "bind -steer-v s",
+      "bind +steer-v w",
+
+      "bind grab gp-rt",
+      "bind grab-h gp-rs-h",
+      "bind grab-v gp-rs-v",
+
+      "bind -kbgrab-h left",
+      "bind +kbgrab-h right",
+      "bind -kbgrab-v down",
+      "bind +kbgrab-v up",
+
+      "bind jump space",
+      "bind jump gp-a",
+
+      "bind  push gp-lt",
+      "bind +push shift",
+
+      "bind  walk gp-lt",
+      "bind +walk w",
+
+      "bind reset gp-lb",
+      "bind reset r",
+
+      "bind switch-mode gp-y",
+      "bind switch-mode e",
+   };
+
+   for( int i=0; i<vg_list_size(default_cfg); i++ )
+      execute_console_input(default_cfg[i]);
+
    rb_init( &player.phys.rb );
    rb_init( &player.collide_front );
    rb_init( &player.collide_back  );
@@ -266,6 +333,9 @@ VG_STATIC void player_init(void)                                            /* 1
                        sizeof(struct rewind_frame) * PLAYER_REWIND_FRAMES );
 
    player_model_init();
+
+   /* controls */
+   
 }
 
 VG_STATIC void player_save_rewind_frame(void)
@@ -299,7 +369,7 @@ VG_STATIC void player_update_pre(void)
       return;
    }
 
-   if( vg_get_button_down( "reset" ) )
+   if( vg_input_button_down( player.input_reset ) )
    {
       if( player.is_dead )
       {
@@ -363,7 +433,7 @@ VG_STATIC void player_update_pre(void)
       }
    }
 
-   if( vg_get_button_down( "switchmode" ) )
+   if( vg_input_button_down( player.input_switch_mode ) )
    {
       phys->on_board ^= 0x1;