rail targeting

[carveJwlIkooP6JGAAIwe30JlM.git] / player.h

diff --git a/player.h b/player.h
index 0abb22e41963d8da8c5e8e579e93c0417aaba6ef..b2a69bd4090ec7a6b157324f49051d2497076366 100644 (file)
--- a/player.h
+++ b/player.h
@@ -2,6 +2,10 @@
  * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
 
+/*
+ * TODO: Tilt camera down to face borde when its behind you or out of vision
+ */
+
 #ifndef PLAYER_H
 #define PLAYER_H
 
@@ -14,7 +18,9 @@
 #include "bvh.h"
 
 VG_STATIC float 
-   k_walkspeed             = 12.0f,  /* no longer used */
+   k_walkspeed             = 12.0f,
+   k_air_accelerate        = 20.0f,
+
    k_runspeed              = 20.0f,
    k_board_radius          = 0.3f,
    k_board_length          = 0.45f,
@@ -29,7 +35,7 @@ VG_STATIC float
    k_steer_air             = 3.6f,
    k_steer_air_lerp        = 0.3f,
    k_pump_force            = 0.0f,
-   k_downforce             = 5.0f,
+   k_downforce             = 8.0f,
    k_walk_downforce        = 8.0f,
    k_jump_charge_speed     = (1.0f/1.0f),
    k_jump_force            = 5.0f,
@@ -62,14 +68,15 @@ VG_STATIC struct gplayer
       v3f a, v_last, m, bob, vl;
 
       /* Utility */
-      float vswitch, slip, slip_last,
-            reverse;
+      float vswitch, slip, slip_last, reverse;
 
       float grab, jump, pushing, push_time;
       v2f grab_mouse_delta;
 
+      int lift_frames;
+
       double start_push;
-      int in_air, on_board, jump_charge, jump_dir;
+      int in_air, on_board, jump_charge, jump_dir, grind;
 
       m3x3f vr,vr_pstep;
    }
@@ -83,8 +90,14 @@ VG_STATIC struct gplayer
    int rewind_sound_wait;
 
    v3f land_target;
-   v3f land_target_log[22];
-   u32 land_target_colours[22];
+
+   struct land_log
+   {
+      v3f positions[50];
+      u32 colour;
+      int count;
+   } 
+   land_log[22];
    int land_log_count;
 
    v3f handl_target, handr_target,
@@ -136,7 +149,8 @@ VG_STATIC struct gplayer
          walk_timer,
          fjump,
          fonboard,
-         frun;
+         frun,
+         fgrind;
 
    float walk;
    int step_phase;
@@ -294,13 +308,21 @@ VG_STATIC void player_init(void)                                            /* 1
    });
 
    vg_convar_push( (struct vg_convar){
-      .name = "walk_speed",
+      .name = "gwalk_speed",
       .data = &k_walkspeed,
       .data_type = k_convar_dtype_f32,
       .opt_f32 = { .clamp = 0 },
       .persistent = 0
    });
 
+   vg_convar_push( (struct vg_convar){
+      .name = "air_accelerate",
+      .data = &k_air_accelerate,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 0
+   });
+
    vg_convar_push( (struct vg_convar){
       .name = "run_speed",
       .data = &k_runspeed,
@@ -385,7 +407,7 @@ VG_STATIC void player_mouseview(void)
 
    v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles );
 
-   if( vg.gamepad_use_trackpad_look )
+   if( vg_input.controller_should_use_trackpad_look )
    {
       static v2f last_input;
       static v2f vel;
@@ -544,8 +566,14 @@ VG_STATIC void player_update_fixed(void)                                 /* 2 */
 VG_STATIC void player_update_post(void)
 {
    for( int i=0; i<player.land_log_count; i++ )
-      vg_line_cross( player.land_target_log[i], 
-            player.land_target_colours[i], 0.25f);
+   {
+      struct land_log *log = &player.land_log[i];
+      
+      for( int j=0; j<log->count - 1; j ++ )
+         vg_line( log->positions[j], log->positions[j+1], log->colour );
+
+      vg_line_cross( log->positions[log->count-1], log->colour, 0.25f );
+   }
 
    if( player.is_dead )
    {