X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=player_replay.c;h=f5a2ab9327ab03c9b7c0705c89596316d758d4ba;hb=888e62fcd8f9777cee774fbb8fab2e52660303a7;hp=c1bf7b4d785e4a0e00326c9a1e91e16c9716ac41;hpb=08b11851edbca3f8951b6023554169cc67aa4f22;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.c b/player_replay.c
index c1bf7b4..f5a2ab9 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -16,14 +16,18 @@ static void replay_clear( replay_buffer *replay ){
 
 static 
 void * replay_frame_data( replay_frame *frame, enum replay_framedata type ){
+   if( frame->data_table[type][1] == 0 )
+      return NULL;
+
    void *baseptr = frame;
    return baseptr + frame->data_table[type][0];
 }
 
-static u16
-replay_frame_calculate_data_offsets( u16 data_table[4][2] ){
+static u16 replay_frame_calculate_data_offsets( 
+      u16 data_table[k_replay_framedata_rows][2] ){
+
    u32 total = vg_align8( sizeof(replay_frame) );
-   for( u32 i=0; i<4; i++ ){
+   for( u32 i=0; i<k_replay_framedata_rows; i++ ){
       data_table[i][0] = total;
       total += vg_align8(data_table[i][1]);
 
@@ -50,17 +54,24 @@ static void replay_tailpop( replay_buffer *replay ){
 static replay_frame *replay_newframe( replay_buffer *replay, 
                                          u16 animator_size,
                                          u16 gamestate_size,
-                                         u16 sfx_count ){
-   u16 data_table[4][2];
+                                         u16 sfx_count,
+                                         bool save_glider ){
+   u16 data_table[ k_replay_framedata_rows ][2];
    data_table[ k_replay_framedata_animator ][1]  = animator_size;
    data_table[ k_replay_framedata_gamestate ][1] = gamestate_size;
-   data_table[ k_replay_framedata_sfx ][1]       = 0;
+   data_table[ k_replay_framedata_sfx ][1] = sfx_count*sizeof(struct net_sfx);
    data_table[ k_replay_framedata_internal_gamestate ][1] = 0;
    if( gamestate_size ){
       data_table[ k_replay_framedata_internal_gamestate ][1] = 
          sizeof( replay_gamestate );
    }
 
+   data_table[ k_replay_framedata_glider ][1] = 0;
+   if( save_glider ){
+      data_table[ k_replay_framedata_glider ][1] = 
+         sizeof(struct replay_glider_data);
+   }
+
    u32 nextsize = replay_frame_calculate_data_offsets( data_table );
 
    replay_frame *frame = NULL;
@@ -99,7 +110,7 @@ check_again:;
    else
       frame = replay->data;
 
-   for( u32 i=0; i<4; i++ ){
+   for( u32 i=0; i<k_replay_framedata_rows; i++ ){
       frame->data_table[i][0] = data_table[i][0];
       frame->data_table[i][1] = data_table[i][1];
    }
@@ -114,8 +125,19 @@ check_again:;
    return frame;
 }
 
-static void replay_seek( replay_buffer *replay, f64 t ){
-   if( !replay->head ) return;
+static void replay_emit_frame_sounds( replay_frame *frame ){
+   void *baseptr = frame;
+   u16 *inf = frame->data_table[k_replay_framedata_sfx];
+   struct net_sfx *buffer = baseptr + inf[0];
+   u32 count = inf[1] / sizeof(struct net_sfx);
+
+   for( u32 i=0; i<count; i ++ ){
+      net_sfx_play( buffer + i );
+   }
+}
+
+static int replay_seek( replay_buffer *replay, f64 t ){
+   if( !replay->head ) return 0;
    assert( replay->tail );
 
    if( t < replay->tail->time ) t = replay->tail->time;
@@ -132,13 +154,18 @@ static void replay_seek( replay_buffer *replay, f64 t ){
    }
 
    f64 dir = t - replay->cursor;
-   if( dir == 0.0 ) return;
+   if( dir == 0.0 ) return 0;
    dir = vg_signf( dir );
+
    
    u32 i=4096;
    while( i --> 0 ){
-      if( dir < 0.0 )
-         if( t > replay->cursor_frame->time ) break;
+      if( dir < 0.0 ){
+         if( t > replay->cursor_frame->time ) {
+            replay->cursor = t;
+            return 1;
+         }
+      }
 
       replay_frame *next;
       if( dir > 0.0 ) next = replay->cursor_frame->r;
@@ -146,16 +173,23 @@ static void replay_seek( replay_buffer *replay, f64 t ){
 
       if( !next ) break;
 
-      if( dir > 0.0 )
-         if( t < next->time ) break;
+      if( dir > 0.0 ){
+         if( t < next->time ){
+            replay->cursor = t;
+            return 1;
+         }
+      }
+
+      replay_emit_frame_sounds( next );
 
       replay->cursor_frame = next;
       replay->cursor = next->time;
 
-      if( !i ) return;
+      if( !i ) return 1;
    }
 
    replay->cursor = t;
+   return 0;
 }
 
 static replay_frame *replay_find_recent_stateframe( replay_buffer *replay ){
@@ -176,7 +210,7 @@ static f32 replay_subframe_time( replay_buffer *replay ){
    replay_frame *next = frame->r;
    if( next ){
       f64 l = next->time - frame->time,
-          t = (replay->cursor - frame->time) / l;
+          t = (l <= (1.0/128.0))? 0.0: (replay->cursor - frame->time) / l;
       return vg_clampf( t, 0.0f, 1.0f );
    }
    else 
@@ -218,8 +252,8 @@ struct replay_rb{
    v4f q;
 };
 
-static 
-void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
+static void skaterift_record_frame( replay_buffer *replay, 
+                                    int force_gamestate ){
    f64 delta      = 9999999.9,
        statedelta = 9999999.9;
 
@@ -233,35 +267,40 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
              k_gamestate_rate = 0.5;
 
    int save_frame = 0,
-       save_state = 0;
+       save_state = 0,
+       save_glider = 0;
 
    if( force_gamestate ) save_state = 1;
    if( statedelta > k_gamestate_rate ) save_state = 1;
    if( delta > k_replay_rate ) save_frame = 1;
    if( save_state ) save_frame = 1;
 
+   if( localplayer.have_glider || localplayer.glider_orphan ||
+       localplayer.subsystem == k_player_subsystem_glide ){
+      save_glider = 1;
+   }
+
    if( !save_frame ) return;
 
    u16 gamestate_size = 0;
    if( save_state ){
+      /* TODO: have as part of system struct */
       gamestate_size = (u32 []){ 
          [k_player_subsystem_walk ] = sizeof(struct player_walk_state),
          [k_player_subsystem_drive] = 0,
          [k_player_subsystem_skate] = sizeof(struct player_skate_state),
          [k_player_subsystem_dead ] = localplayer.ragdoll.part_count * 
-                                       sizeof(struct replay_rb)
+                                       sizeof(struct replay_rb),
+         [k_player_subsystem_glide] = sizeof(struct replay_rb),
       }[ localplayer.subsystem ];
    }
 
-   u16 animator_size = (u16 []){
-      [k_player_subsystem_walk ] = sizeof(struct player_walk_animator),
-      [k_player_subsystem_drive] = 0,
-      [k_player_subsystem_skate] = sizeof(struct player_skate_animator),
-      [k_player_subsystem_dead ] = sizeof(struct player_dead_animator)
-   }[ localplayer.subsystem ];
+   u16 animator_size = player_subsystems[localplayer.subsystem]->animator_size;
    
    replay_frame *frame = replay_newframe( replay,
-                                          animator_size, gamestate_size, 0 );
+                                          animator_size, gamestate_size, 
+                                          localplayer.local_sfx_buffer_count,
+                                          save_glider );
    frame->system = localplayer.subsystem;
 
    if( save_state ){
@@ -270,6 +309,7 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
 
       /* permanent block */
       memcpy( &gs->rb, &localplayer.rb, sizeof(rigidbody) );
+      memcpy( &gs->glider_rb, &player_glide.rb, sizeof(rigidbody) );
       memcpy( &gs->cam_control, &localplayer.cam_control, 
                sizeof(struct player_cam_controller) );
       v3_copy( localplayer.angles, gs->angles );
@@ -284,13 +324,32 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
       else if( localplayer.subsystem == k_player_subsystem_dead ){
          struct replay_rb *arr = dst;
          for( u32 i=0; i<localplayer.ragdoll.part_count; i ++ ){
-            rigidbody *rb = &localplayer.ragdoll.parts[i].obj.rb;
+            rigidbody *rb = &localplayer.ragdoll.parts[i].rb;
             v3_copy( rb->co, arr[i].co );
             v3_copy( rb->w, arr[i].w );
             v3_copy( rb->v, arr[i].v );
             v4_copy( rb->q, arr[i].q );
          }
       }
+      else if( localplayer.subsystem == k_player_subsystem_glide ){
+         struct replay_rb *arr = dst;
+         rigidbody *rb = &player_glide.rb;
+         v3_copy( rb->co, arr[0].co );
+         v3_copy( rb->w, arr[0].w );
+         v3_copy( rb->v, arr[0].v );
+         v4_copy( rb->q, arr[0].q );
+      }
+   }
+
+   if( save_glider ){
+      struct replay_glider_data *inf = 
+         replay_frame_data( frame, k_replay_framedata_glider );
+
+      inf->have_glider   = localplayer.have_glider;
+      inf->glider_orphan = localplayer.glider_orphan;
+      inf->t             = player_glide.t;
+      v3_copy( player_glide.rb.co, inf->co );
+      v4_copy( player_glide.rb.q,  inf->q );
    }
 
    replay->cursor = vg.time;
@@ -302,20 +361,28 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
    if( localplayer.gate_waiting ){
       m4x3_mulv( localplayer.gate_waiting->transport, 
                   frame->cam_pos, frame->cam_pos );
+
+      v3f v0;
+      v3_angles_vector( localplayer.cam.angles, v0 );
+      m3x3_mulv( localplayer.gate_waiting->transport, v0, v0 );
+      v3_angles( v0, frame->cam_angles );
    }
-   v3_copy( localplayer.cam.angles, frame->cam_angles );
+   else 
+      v3_copy( localplayer.cam.angles, frame->cam_angles );
+
    frame->cam_fov = localplayer.cam.fov;
 
    /* animator */
-   void *dst = replay_frame_data( frame, k_replay_framedata_animator );
-
-   if( localplayer.subsystem == k_player_subsystem_walk )
-      memcpy( dst, &player_walk.animator, animator_size );
-   else if( localplayer.subsystem == k_player_subsystem_skate )
-      memcpy( dst, &player_skate.animator, animator_size );
-   else if( localplayer.subsystem == k_player_subsystem_dead ){
-      memcpy( dst, &player_dead.animator, animator_size );
-   }
+   void *dst = replay_frame_data( frame, k_replay_framedata_animator ),
+        *src = player_subsystems[localplayer.subsystem]->animator_data;
+   memcpy( dst, src, animator_size );
+
+   /* sound effects */
+   memcpy( replay_frame_data( frame, k_replay_framedata_sfx ),
+           localplayer.local_sfx_buffer,
+           sizeof(struct net_sfx)*localplayer.local_sfx_buffer_count );
+
+   localplayer.local_sfx_buffer_count = 0;
 }
 
 static
@@ -338,7 +405,7 @@ void skaterift_restore_frame( replay_frame *frame ){
 
       for( u32 i=0; i<localplayer.ragdoll.part_count; i ++ ){
          struct ragdoll_part *part = &localplayer.ragdoll.parts[i];
-         rigidbody *rb = &part->obj.rb;
+         rigidbody *rb = &part->rb;
 
          v3_copy( arr[i].co, rb->co );
          v3_copy( arr[i].w, rb->w );
@@ -347,12 +414,38 @@ void skaterift_restore_frame( replay_frame *frame ){
 
          v3_copy( arr[i].co, part->prev_co );
          v4_copy( arr[i].q, part->prev_q );
+         rb_update_matrices( rb );
       }
    }
+   else if( frame->system == k_player_subsystem_glide ){
+      struct replay_rb *arr = src;
+      rigidbody *rb = &player_glide.rb;
+      v3_copy( arr[0].co, rb->co );
+      v3_copy( arr[0].w, rb->w );
+      v3_copy( arr[0].v, rb->v );
+      v4_copy( arr[0].q, rb->q );
+      rb_update_matrices( rb );
+   }
 
    localplayer.subsystem = frame->system;
 
+   /* restore the seperated glider data if we have it */
+   if( frame->data_table[ k_replay_framedata_glider ][1] ){
+      struct replay_glider_data *inf = 
+         replay_frame_data( frame, k_replay_framedata_glider );
+
+      localplayer.have_glider   = inf->have_glider;
+      localplayer.glider_orphan = inf->glider_orphan;
+      player_glide.t            = inf->t;
+   }
+   else {
+      localplayer.have_glider = 0;
+      localplayer.glider_orphan = 0;
+      player_glide.t = 0.0f;
+   }
+
    memcpy( &localplayer.rb, &gs->rb, sizeof(rigidbody) );
+   memcpy( &player_glide.rb, &gs->glider_rb, sizeof(rigidbody) );
    v3_copy( gs->angles, localplayer.angles );
 
    v3_copy( frame->cam_pos, localplayer.cam.pos );
@@ -406,7 +499,10 @@ static void skaterift_replay_pre_update(void){
             f64 target = vg_lerp( skaterift.resume_begin, 
                               skaterift.resume_target->time, 
                               vg_smoothstepf( skaterift.resume_transition ) );
-            replay_seek( &skaterift.replay, target );
+            if( replay_seek( &skaterift.replay, target ) )
+               skaterift.track_velocity = 1.0f;
+            else
+               skaterift.track_velocity = 0.0f;
          }
       }
    }
@@ -439,7 +535,8 @@ static void skaterift_replay_pre_update(void){
          f64 target = skaterift.replay.cursor;
          target += skaterift.track_velocity * vg.time_frame_delta;
 
-         replay_seek( &skaterift.replay, target );
+         if( !replay_seek( &skaterift.replay, target ) )
+            skaterift.track_velocity = 0.0f;
       }
 
       if( button_down( k_srbind_mback ) ){
@@ -472,8 +569,10 @@ static void skaterift_replay_update_helpers(void){
 }
 
 static void skaterift_replay_post_render(void){
+#ifndef SR_ALLOW_REWIND_HUB
    if( world_static.active_instance != k_world_purpose_client )
       return;
+#endif
 
    /* capture the current resume frame at the very last point */
    if( button_down( k_srbind_reset ) ){
@@ -508,21 +607,6 @@ static void skaterift_replay_post_render(void){
    }
 }
 
-#if 0
-static void skaterift_get_replay_camera( camera *cam ){
-   if( skaterift.freecam ){
-      cam->nearz = 0.1f;
-      cam->farz = 100.0f;
-      v3_copy( skaterift.replay_freecam.pos, cam->pos );
-      v3_copy( skaterift.replay_freecam.angles, cam->angles );
-      cam->fov = skaterift.replay_freecam.fov;
-   }
-   else{
-      replay_get_camera( &skaterift.replay, &skaterift.cam );
-   }
-}
-#endif
-
 static void skaterift_replay_debug_info(void){
    player__debugtext( 2, "replay info" );
 
@@ -536,7 +620,7 @@ static void skaterift_replay_debug_info(void){
    player__debugtext( 1, "head @%u | tail @%u\n", head, tail );
 
    if( replay->statehead ){
-      for( u32 i=0; i<4; i++ ){
+      for( u32 i=0; i<k_replay_framedata_rows; i++ ){
          player__debugtext( 1, "[%u]: [%hu, %hu]\n", i,
               replay->statehead->data_table[i][0],
               replay->statehead->data_table[i][1] );