X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=5a21afe662a2248252ecc776ecb7f5820e5ed64b;hb=47941822dae18a018c985847b052e70214a3ccc6;hp=e4c0fced5366a51cbfa083bd514d53e030705629;hpb=86dbcd5796ed674ca9433cce1ace8bef322cd121;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index e4c0fce..5a21afe 100644
--- a/player.h
+++ b/player.h
@@ -1,28 +1,26 @@
 /*
- * Copyright 2021-2022 (C) Mount0 Software, Harry Godden - All Rights Reserved
- * -----------------------------------------------------------------------------
- *
- * Player head module
- *
- * -----------------------------------------------------------------------------
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
 
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#define PLAYER_REWIND_FRAMES 60*4
+
 #include "audio.h"
 #include "common.h"
 #include "world.h"
 #include "skeleton.h"
 #include "bvh.h"
 
-static float 
-   k_walkspeed             = 7.0f,  /* no longer used */
-   k_runspeed              = 14.0f,
+VG_STATIC float 
+   k_walkspeed             = 20.0f,  /* no longer used */
+   k_runspeed              = 20.0f,
    k_board_radius          = 0.3f,
    k_board_length          = 0.45f,
    k_board_allowance       = 0.04f,
-   k_friction_lat          = 8.8f,
+   //k_friction_lat          = 8.8f,
+   k_friction_lat          = 12.0f,
    k_friction_resistance   = 0.01f,
    k_max_push_speed        = 16.0f,
    k_push_accel            = 10.0f,
@@ -32,16 +30,18 @@ static float
    k_steer_air_lerp        = 0.3f,
    k_pump_force            = 0.0f,
    k_downforce             = 5.0f,
+   k_walk_downforce        = 8.0f,
    k_jump_charge_speed     = (1.0f/1.0f),
    k_jump_force            = 5.0f,
    k_pitch_limit           = 1.5f,
    k_look_speed            = 2.0f,
-   k_walk_accel            = 5.0f,
+   k_walk_accel            = 150.0f,
    k_walk_friction         = 8.0f;
 
-static int freecam = 0;
-static int walk_grid_iterations = 1;
-static float fc_speed = 10.0f;
+VG_STATIC int cl_playermdl_id = 0;
+VG_STATIC int freecam = 0;
+VG_STATIC int walk_grid_iterations = 1;
+VG_STATIC float fc_speed = 10.0f;
 
 /* 
  * -----------------------------------------------------------------------------
@@ -49,7 +49,7 @@ static float fc_speed = 10.0f;
  * -----------------------------------------------------------------------------
  */
 
-static struct gplayer
+VG_STATIC struct gplayer
 {
    /* Physics */
    rigidbody collide_front, collide_back;
@@ -65,7 +65,8 @@ static struct gplayer
       float vswitch, slip, slip_last,
             reverse;
 
-      float grab, jump;
+      float grab, jump, pushing, push_time;
+      double start_push;
       int in_air, on_board, jump_charge, jump_dir;
 
       m3x3f vr,vr_pstep;
@@ -73,8 +74,11 @@ static struct gplayer
    phys, 
    phys_gate_frame;
 
-   float pushing, push_time;
-   int is_dead;
+   m4x3f visual_transform,
+         inv_visual_transform;
+
+   int is_dead, death_tick_allowance, rewinding;
+   int rewind_sound_wait;
 
    v3f land_target;
    v3f land_target_log[22];
@@ -86,10 +90,23 @@ static struct gplayer
    
    /* Camera */
    float air_blend;
+   float air_time;
    
    v3f camera_pos, smooth_localcam;
    v2f angles;
-   m4x3f camera, camera_inverse;
+
+   struct rewind_frame
+   {
+      v3f pos;
+      v2f ang;
+   }
+   *rewind_buffer;
+   u32 rewind_incrementer,
+       rewind_length;
+
+   float rewind_time, rewind_total_length, rewind_predicted_time;
+   double diag_rewind_start, diag_rewind_time;
+   float dist_accum;
 
    /* animation */
    double jump_time;
@@ -102,14 +119,18 @@ static struct gplayer
          fsetup,
          walk_timer,
          fjump,
-         fonboard;
+         fonboard,
+         frun;
 
+   float walk;
    int step_phase;
 
    /* player model */
    struct player_model
    {
-      glmesh mesh;
+      glmesh player_meshes[3];
+
+      mdl_context meta;
       struct skeleton sk;
       struct skeleton_anim *anim_stand,
                            *anim_highg,
@@ -118,7 +139,8 @@ static struct gplayer
                            *anim_push, *anim_push_reverse,
                            *anim_ollie, *anim_ollie_reverse,
                            *anim_grabs, *anim_stop,
-                           *anim_walk, *anim_run, *anim_idle;
+                           *anim_walk, *anim_run, *anim_idle,
+                           *anim_jump;
 
       u32 id_hip,
           id_ik_hand_l,
@@ -140,7 +162,7 @@ static struct gplayer
          rigidbody  rb;
          u32 parent;
       }
-      *ragdoll;
+      ragdoll[32];
       u32 ragdoll_count;
 
       int shoes[2];
@@ -156,11 +178,12 @@ player =
 /* 
  * API 
  */
-static float *player_get_pos(void);
-static void player_kill(void);
-static float *player_cam_pos(void);
-static void player_save_frame(void);
-static void player_restore_frame(void);
+VG_STATIC float *player_get_pos(void);
+VG_STATIC void player_kill(void);
+VG_STATIC float *player_cam_pos(void);
+VG_STATIC void player_save_frame(void);
+VG_STATIC void player_restore_frame(void);
+VG_STATIC void player_save_rewind_frame(void);
 
 /* 
  * Submodules
@@ -177,59 +200,205 @@ static void player_restore_frame(void);
  * -----------------------------------------------------------------------------
  */
 
-static void player_register(void)                                        /* 0 */
+VG_STATIC void player_init(void)                                            /* 1 */
 {
-   player_model_register();
+   rb_init( &player.phys.rb );
+   rb_init( &player.collide_front );
+   rb_init( &player.collide_back  );
+
+   vg_convar_push( (struct vg_convar){
+      .name = "cl_playermdl_id",
+      .data = &cl_playermdl_id,
+      .data_type = k_convar_dtype_i32,
+      .opt_i32 = { .min=0, .max=2, .clamp=1 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "walk_speed",
+      .data = &k_walkspeed,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "run_speed",
+      .data = &k_runspeed,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "walk_accel",
+      .data = &k_walk_accel,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "fc",
+      .data = &freecam,
+      .data_type = k_convar_dtype_i32,
+      .opt_i32 = { .min=0, .max=1, .clamp=1 },
+      .persistent = 1
+   });
+
+   vg_convar_push( (struct vg_convar){
+      .name = "fcs",
+      .data = &fc_speed,
+      .data_type = k_convar_dtype_f32,
+      .opt_f32 = { .clamp = 0 },
+      .persistent = 1
+   });
+
+	vg_function_push( (struct vg_cmd){
+		.name = "reset",
+		.function = reset_player
+	});
+
+   player.rewind_length = 0;
+   player.rewind_buffer = 
+      vg_linear_alloc( vg_mem.rtmemory, 
+                       sizeof(struct rewind_frame) * PLAYER_REWIND_FRAMES );
+
+   player_model_init();
 }
 
-static void player_init(void)                                            /* 1 */
+VG_STATIC void player_save_rewind_frame(void)
 {
-   player_model_init();
+   if( player.rewind_length < PLAYER_REWIND_FRAMES )
+   {
+      struct rewind_frame *fr = 
+         &player.rewind_buffer[ player.rewind_length ++ ];
 
-   rb_init( &player.collide_front );
-   rb_init( &player.collide_back  );
+      v2_copy( player.angles, fr->ang );
+      v3_copy( player.camera_pos, fr->pos );
+
+      player.rewind_incrementer = 0;
+
+      if( player.rewind_length > 1 )
+      {
+         player.rewind_total_length += 
+            v3_dist( player.rewind_buffer[player.rewind_length-1].pos,
+                     player.rewind_buffer[player.rewind_length-2].pos );
+      }
+   }
 }
 
-static void player_update(void)                                          /* 2 */
+/* Deal with input etc */
+VG_STATIC void player_update_pre(void)
 {
    struct player_phys *phys = &player.phys;
 
-   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);
+   if( player.rewinding )
+   {
+      return;
+   }
 
-   if( vg_get_axis("grabl")>0.0f)
+   if( vg_get_button_down( "reset" ) )
    {
-      player.is_dead = 0;
-      player_restore_frame();
+      double delta = world.time - world.last_use;
 
-      if( !phys->on_board )
+      if( delta <= RESET_MAX_TIME )
       {
-         player.angles[0] = atan2f( -phys->rb.forward[2], 
-                                    -phys->rb.forward[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();
+
+         /* based on analytical testing. DONT CHANGE!
+          * 
+          *    time taken: y = (x^(4/5)) * 74.5
+          *    inverse   : x = (2/149)^(4/5) * y^(4/5)
+          */
+
+         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;
+
+         player.is_dead = 0;
+         player.death_tick_allowance = 30;
+         player_restore_frame();
+
+         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();
+
+         /* apply 1 frame of movement */
+         player_do_motion();
       }
-
-      player.mdl.shoes[0] = 1;
-      player.mdl.shoes[1] = 1;
-
-      world_routes_notify_reset();
    }
 
    if( vg_get_button_down( "switchmode" ) )
    {
       phys->on_board ^= 0x1;
+
+      audio_lock();
+      if( phys->on_board )
+      {
+         v3_muladds( phys->rb.v, phys->rb.forward, 0.2f, phys->rb.v );
+         audio_play_oneshot( &audio_lands[6], 1.0f );
+      }
+      else
+      {
+         audio_play_oneshot( &audio_lands[5], 1.0f );
+      }
+
+      audio_unlock();
    }
+}
 
-   if( (glfwGetKey( vg_window, GLFW_KEY_O ) || (phys->rb.co[1] < 0.0f)) &&
-       !player.is_dead)
+VG_STATIC void player_update_fixed(void)                                    /* 2 */
+{
+   if( player.rewinding )
+      return;
+
+   if( player.death_tick_allowance )
+      player.death_tick_allowance --;
+
+   struct player_phys *phys = &player.phys;
+
+   if( player.is_dead )
    {
-      player_ragdoll_copy_model( phys->rb.v );
-      player.is_dead = 1;
+      player_ragdoll_iter();
+   }
+   else
+   {
+      player.rewind_incrementer ++;
+
+      if( player.rewind_incrementer > (u32)(0.25/VG_TIMESTEP_FIXED) )
+      {
+         player_save_rewind_frame();
+      }
+
+      player_do_motion();
    }
+}
+
+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);
 
    if( player.is_dead )
    {
-      player_ragdoll_iter();
       player_debug_ragdoll();
 
       if( !freecam )
@@ -237,7 +406,6 @@ static void player_update(void)                                          /* 2 */
    }
    else
    {
-      player_do_motion();
       player_animate();
 
       if( !freecam )
@@ -247,11 +415,142 @@ static void player_update(void)                                          /* 2 */
    if( freecam )
       player_freecam();
 
-   player_camera_update();
+
+   /* CAMERA POSITIONING: LAYER 0 */
+   v2_copy( player.angles, camera_angles );
+   v3_copy( player.camera_pos, camera_pos );
+
+   if( player.rewinding )
+   {
+      if( player.rewind_time <= 0.0f )
+      {
+         double taken = vg.time - player.diag_rewind_start;
+         vg_success( "Rewind took (rt, pl, tl): %f, %f, %f\n", 
+                           taken, player.diag_rewind_time,
+                           player.rewind_total_length );
+
+         player.rewinding = 0;
+         player.rewind_length = 1;
+         player.rewind_total_length = 0.0f;
+         player.rewind_incrementer = 0;
+         world.sky_target_rate = 1.0;
+      }
+      else
+      {
+         world.sky_target_rate = -100.0;
+         assert( player.rewind_length > 0 );
+
+         v2f override_angles;
+         v3f override_pos;
+
+         float budget         = vg.time_delta,
+               overall_length = player.rewind_length;
+
+         world_routes_rollback_time( player.rewind_time / overall_length );
+
+         for( int i=0; (i<10)&&(player.rewind_time>0.0f)&&(budget>0.0f); i ++ )
+         {
+            /* Interpolate frames */
+            int i0 = floorf( player.rewind_time ),
+                i1 = VG_MIN( i0+1, player.rewind_length-1 );
+            
+            struct rewind_frame *fr =  &player.rewind_buffer[i0],
+                                *fr1 = &player.rewind_buffer[i1];
+
+            float dist = vg_maxf( v3_dist( fr->pos, fr1->pos ), 0.001f ),
+                  subl = vg_fractf( player.rewind_time ) + 0.001f,
+
+                  sramp= 3.0f-(1.0f/(0.4f+0.4f*player.rewind_time)),
+                  speed = sramp*28.0f + 0.5f*player.rewind_time,
+                  mod  = speed * (budget / dist),
+
+                  advl = vg_minf( mod, subl ),
+                  advt = (advl / mod) * budget;
+            
+            player.dist_accum += speed * advt;
+            player.rewind_time -= advl;
+            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,
+               remaining    = player.rewind_predicted_time - current_time;
+
+         if( player.rewind_sound_wait )
+         {
+            if( player.rewind_predicted_time >= 6.5f )
+            {
+               if( remaining <= 6.5f )
+               {
+                  audio_lock();
+                  audio_play_oneshot( &audio_rewind[3], 1.0f );
+                  audio_unlock();
+                  player.rewind_sound_wait = 0;
+               }
+            }
+            else if( player.rewind_predicted_time >= 2.5f )
+            {
+               if( remaining <= 2.5f )
+               {
+                  audio_lock();
+                  audio_play_oneshot( &audio_rewind[2], 1.0f );
+                  audio_unlock();
+                  player.rewind_sound_wait = 0;
+               }
+            }
+            else if( player.rewind_predicted_time >= 1.5f )
+            {
+               if( remaining <= 1.5f )
+               {
+                  audio_lock();
+                  audio_play_oneshot( &audio_rewind[1], 1.0f );
+                  audio_unlock();
+                  player.rewind_sound_wait = 0;
+               }
+            }
+
+
+         }
+         
+         int i0 = floorf( player.rewind_time ),
+             i1 = VG_MIN( i0+1, player.rewind_length-1 );
+         
+         struct rewind_frame *fr =  &player.rewind_buffer[i0],
+                             *fr1 = &player.rewind_buffer[i1];
+         
+         float sub = vg_fractf(player.rewind_time);
+
+         v3_lerp( fr->pos, fr1->pos, sub, override_pos );
+         override_angles[0] = vg_alerpf( fr->ang[0], fr1->ang[0], sub );
+         override_angles[1] = vg_lerpf ( fr->ang[1], fr1->ang[1], sub );
+
+         /* CAMERA POSITIONING: LAYER 1 */
+         float blend = (4.0f-player.rewind_time) * 0.25f,
+               c     = vg_clampf( blend, 0.0f, 1.0f );
+
+         camera_angles[0] = vg_alerpf(override_angles[0], player.angles[0], c);
+         camera_angles[1] = vg_lerpf (override_angles[1], player.angles[1], c);
+         v3_lerp( override_pos, player.camera_pos, c, camera_pos );
+      }
+   }
+
+   camera_update();
    player_audio();
 }
 
-static void draw_player(void)                                            /* 3 */
+VG_STATIC void draw_player( m4x3f cam )
 {
    if( player.is_dead )
       player_model_copy_ragdoll();
@@ -259,16 +558,16 @@ static void draw_player(void)                                            /* 3 */
    shader_viewchar_use();
    vg_tex2d_bind( &tex_characters, 0 );
    shader_viewchar_uTexMain( 0 );
-   shader_viewchar_uCamera( player.camera[3] );
-   shader_viewchar_uPv( vg_pv );
+   shader_viewchar_uCamera( cam[3] );
+   shader_viewchar_uPv( vg.pv );
    shader_link_standard_ub( _shader_viewchar.id, 2 );
    glUniformMatrix4x3fv( _uniform_viewchar_uTransforms, 
                          player.mdl.sk.bone_count,
                          0,
                          (float *)player.mdl.sk.final_mtx );
    
-   mesh_bind( &player.mdl.mesh );
-   mesh_draw( &player.mdl.mesh );
+   mesh_bind( &player.mdl.player_meshes[cl_playermdl_id] );
+   mesh_draw( &player.mdl.player_meshes[cl_playermdl_id] );
 }
 
 /* 
@@ -277,18 +576,21 @@ static void draw_player(void)                                            /* 3 */
  * -----------------------------------------------------------------------------
  */
 
-static float *player_get_pos(void)
+VG_STATIC float *player_get_pos(void)
 {
    return player.phys.rb.co;
 }
 
-static void player_kill(void)
+VG_STATIC void player_kill(void)
 {
-   player.is_dead = 1;
-   player_ragdoll_copy_model( player.phys.rb.v );
+   if( player.death_tick_allowance == 0 )
+   {
+      player.is_dead = 1;
+      player_ragdoll_copy_model( player.phys.rb.v );
+   }
 }
 
-static float *player_cam_pos(void)
+VG_STATIC float *player_cam_pos(void)
 {
    return player.camera_pos;
 }