X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=player_replay.c;h=6fea7d91338c5805fe7dae536877fe6c3ab47845;hb=76315944e5a98838163e0aba8601ed3522f0724d;hp=12f7f6b830a046559591cda15af319950b766582;hpb=2dbc6f4022802b89c934ba78e7085cc7ee81799b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.c b/player_replay.c
index 12f7f6b..6fea7d9 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -54,7 +54,7 @@ static replay_frame *replay_newframe( replay_buffer *replay,
    u16 data_table[4][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] = 
@@ -114,8 +114,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 +143,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 +162,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 +199,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 +241,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;
 
@@ -261,7 +284,8 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
    }[ localplayer.subsystem ];
    
    replay_frame *frame = replay_newframe( replay,
-                                          animator_size, gamestate_size, 0 );
+                                          animator_size, gamestate_size, 
+                                          localplayer.local_sfx_buffer_count );
    frame->system = localplayer.subsystem;
 
    if( save_state ){
@@ -302,8 +326,15 @@ 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 */
@@ -316,6 +347,13 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
    else if( localplayer.subsystem == k_player_subsystem_dead ){
       memcpy( dst, &player_dead.animator, 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
@@ -333,7 +371,7 @@ void skaterift_restore_frame( replay_frame *frame ){
       memcpy( &player_skate.state, src, src_size );
    }
    else if( frame->system == k_player_subsystem_dead ){
-      player__dead_transition();
+      player__dead_transition(0);
       struct replay_rb *arr = src;
 
       for( u32 i=0; i<localplayer.ragdoll.part_count; i ++ ){
@@ -406,7 +444,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 +480,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 ) ){