X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=player.h;h=c8c9abc54b8932ecd480838014a44001ca9c4dfb;hb=6294ef64d948eab2365e39a2645c9843aa96fba8;hp=0b6db882031480bbd9a803f33649955b96c732c2;hpb=a64c18c5996fd5ac9601239f91b12275f04f9cd9;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index 0b6db88..c8c9abc 100644
--- a/player.h
+++ b/player.h
@@ -14,7 +14,7 @@
 #include "bvh.h"
 
 VG_STATIC float 
-   k_walkspeed             = 20.0f,  /* no longer used */
+   k_walkspeed             = 12.0f,  /* no longer used */
    k_runspeed              = 20.0f,
    k_board_radius          = 0.3f,
    k_board_length          = 0.45f,
@@ -87,6 +87,21 @@ 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_walkh,
+                        *input_walkv,
+                        *input_switch_mode,
+                        *input_reset,
+                        *input_grab;
    
    /* Camera */
    float air_blend;
@@ -124,6 +139,7 @@ VG_STATIC struct gplayer
 
    float walk;
    int step_phase;
+   enum mdl_surface_prop surface_prop;
 
    /* player model */
    struct player_model
@@ -188,6 +204,8 @@ VG_STATIC void player_save_rewind_frame(void);
 /* 
  * Submodules
  */
+VG_STATIC void player_mouseview(void);
+
 #include "player_physics.h"
 #include "player_ragdoll.h"
 #include "player_model.h"
@@ -202,6 +220,68 @@ 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_walkh = vg_create_named_input( "walk-h", 
+                                               k_input_type_axis );
+   player.input_walkv = vg_create_named_input( "walk-v", 
+                                               k_input_type_axis );
+
+
+   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 a",
+      "bind +steer-h d",
+
+      "bind  steer-v gp-ls-v",
+      "bind -steer-v w",
+      "bind +steer-v s",
+
+      "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-h gp-ls-h",
+      "bind  walk-v gp-ls-v",
+      "bind +walk-h d",
+      "bind -walk-h a",
+      "bind +walk-v w",
+      "bind -walk-v s",
+
+      "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  );
@@ -219,7 +299,7 @@ VG_STATIC void player_init(void)                                            /* 1
       .data = &k_walkspeed,
       .data_type = k_convar_dtype_f32,
       .opt_f32 = { .clamp = 0 },
-      .persistent = 1
+      .persistent = 0
    });
 
    vg_convar_push( (struct vg_convar){
@@ -265,6 +345,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)
@@ -288,6 +371,18 @@ VG_STATIC void player_save_rewind_frame(void)
    }
 }
 
+/*
+ * Free camera movement
+ */
+VG_STATIC void player_mouseview(void)
+{
+   if( ui_want_mouse() )
+      return;
+
+   v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles );
+   player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f );
+}
+
 /* Deal with input etc */
 VG_STATIC void player_update_pre(void)
 {
@@ -298,54 +393,71 @@ VG_STATIC void player_update_pre(void)
       return;
    }
 
-   if( vg_get_button_down( "reset" ) )
+   if( vg_input_button_down( player.input_reset ) )
    {
-      double delta = world.time - world.last_use;
-
-      if( (delta <= RESET_MAX_TIME) && (world.last_use != 0.0) )
+      if( player.is_dead )
       {
-         player.rewinding = 1;
-         player.rewind_sound_wait = 1;
-         player.rewind_time = (float)player.rewind_length - 0.0001f;
-         player_save_rewind_frame();
+         reset_player( 0, NULL );
          audio_lock();
-         audio_play_oneshot( &audio_rewind[0], 1.0f );
+         audio_play_oneshot( &audio_ui[0], 1.0f );
          audio_unlock();
+      }
+      else
+      {
+         double delta = world.time - world.last_use;
 
-         /* based on analytical testing. DONT CHANGE!
-          * 
-          *    time taken: y = (x^(4/5)) * 74.5
-          *    inverse   : x = (2/149)^(4/5) * y^(4/5)
-          */
+         if( (delta <= RESET_MAX_TIME) && (world.last_use != 0.0) )
+         {
+            player.rewinding = 1;
+            player.rewind_sound_wait = 1;
+            player.rewind_time = (float)player.rewind_length - 0.0001f;
+            player_save_rewind_frame();
+            audio_lock();
+            audio_play_oneshot( &audio_rewind[0], 1.0f );
+            audio_unlock();
 
-         float constant = powf( 2.0f/149.0f, 4.0f/5.0f ),
-               curve    = powf( player.rewind_total_length, 4.0f/5.0f );
-         
-         player.rewind_predicted_time = constant * curve;
-         player.diag_rewind_start = vg.time;
-         player.diag_rewind_time  = player.rewind_time;
+            /* based on analytical testing. DONT CHANGE!
+             * 
+             *    time taken: y = (x^(4/5)) * 74.5
+             *    inverse   : x = (2/149)^(4/5) * y^(4/5)
+             */
 
-         player.is_dead = 0;
-         player.death_tick_allowance = 30;
-         player_restore_frame();
+            float constant = powf( 2.0f/149.0f, 4.0f/5.0f ),
+                  curve    = powf( player.rewind_total_length, 4.0f/5.0f );
+            
+            player.rewind_predicted_time = constant * curve;
+            player.diag_rewind_start = vg.time;
+            player.diag_rewind_time  = player.rewind_time;
 
-         if( !phys->on_board )
-         {
-            player.angles[0] = atan2f( -phys->rb.forward[2], 
-                                       -phys->rb.forward[0] );
-         }
+            player.is_dead = 0;
+            player.death_tick_allowance = 30;
+            player_restore_frame();
 
-         player.mdl.shoes[0] = 1;
-         player.mdl.shoes[1] = 1;
+            if( !phys->on_board )
+            {
+               player.angles[0] = atan2f( -phys->rb.forward[2], 
+                                          -phys->rb.forward[0] );
+            }
+
+            player.mdl.shoes[0] = 1;
+            player.mdl.shoes[1] = 1;
 
-         world_routes_notify_reset();
+            world_routes_notify_reset();
 
-         /* apply 1 frame of movement */
-         player_do_motion();
+            /* apply 1 frame of movement */
+            player_do_motion();
+         }
+         else
+         {
+            /* cant do that */
+            audio_lock();
+            audio_play_oneshot( &audio_rewind[4], 1.0f );
+            audio_unlock();
+         }
       }
    }
 
-   if( vg_get_button_down( "switchmode" ) )
+   if( vg_input_button_down( player.input_switch_mode ) )
    {
       phys->on_board ^= 0x1;
 
@@ -362,6 +474,9 @@ VG_STATIC void player_update_pre(void)
 
       audio_unlock();
    }
+
+   if( !phys->on_board )
+      player_mouseview();
 }
 
 VG_STATIC void player_update_fixed(void)                                    /* 2 */
@@ -472,17 +587,6 @@ VG_STATIC void player_update_post(void)
             budget -= advt;
          }
 
-#if 0
-         if( player.dist_accum >= 5.0f )
-         {
-            audio_lock();
-            audio_player_playclip( &audio_rewind_player, &audio_rewind[4] );
-            audio_unlock();
-
-            player.dist_accum -= 5.0f;
-         }
-#endif
-
          player.rewind_time = vg_maxf( 0.0f, player.rewind_time );
 
          float current_time = vg.time - player.diag_rewind_start,
@@ -587,6 +691,7 @@ VG_STATIC void player_kill(void)
    {
       player.is_dead = 1;
       player_ragdoll_copy_model( player.phys.rb.v );
+      world_routes_clear();
    }
 }