X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_replay.c;h=1b339474dd593b61f95a46ce56cd2a6e56f4573f;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=319cf03a64943d53646c4c75fdff794dc33b9821;hpb=09fc72b08113fa157a3abb2ded6086babedd10cf;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.c b/player_replay.c
index 319cf03..1b33947 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -5,7 +5,7 @@
 #include "input.h"
 #include "gui.h"
 
-VG_STATIC void replay_clear( replay_buffer *replay ){
+static void replay_clear( replay_buffer *replay ){
    replay->head = NULL;
    replay->tail = NULL;
    replay->cursor_frame = NULL;
@@ -13,46 +13,26 @@ VG_STATIC void replay_clear( replay_buffer *replay ){
    replay->cursor = -99999.9;
 }
 
-replay_gamestate *replay_frame_gamestate( replay_frame *frame ){
+static 
+void * replay_frame_data( replay_frame *frame, enum replay_framedata type ){
    void *baseptr = frame;
-   return baseptr + vg_align8(sizeof(replay_frame));
+   return baseptr + frame->data_table[type][0];
 }
 
-void *replay_gamestate_subsystem_data( replay_gamestate *gs ){
-   void *baseptr = gs;
-   return baseptr + vg_align8(sizeof(replay_gamestate));
-}
+static u16
+replay_frame_calculate_data_offsets( u16 data_table[4][2] ){
+   u32 total = vg_align8( sizeof(replay_frame) );
+   for( u32 i=0; i<4; i++ ){
+      data_table[i][0] = total;
+      total += vg_align8(data_table[i][1]);
 
-u32 replay_frame_gamestate_total_size( u32 subsystem_gamestate_size ){
-   if( subsystem_gamestate_size ){
-      return vg_align8( sizeof(replay_gamestate) ) + 
-             vg_align8( subsystem_gamestate_size );
+      if( total > 0xffff )
+         vg_fatal_error( "Exceeded frame storage capacity\n" );
    }
-   else
-      return 0;
-}
-
-replay_sfx *replay_frame_sfx( replay_frame *frame, u32 index ){
-   void *gs = replay_frame_gamestate( frame );
-   u32 total_size = 
-      replay_frame_gamestate_total_size( frame->subsystem_gamestate_size );
-
-   replay_sfx *array = (gs + total_size);
-   return &array[index];
-}
-
-u32 _replay_frame_size( u32 subsystem_gamestate_size, u32 sfx_count ){
-   return vg_align8( sizeof( replay_frame ) ) + 
-          replay_frame_gamestate_total_size( subsystem_gamestate_size ) +
-          vg_align8( sfx_count * sizeof(replay_sfx) );
+   return total;
 }
 
-u32 replay_frame_size( replay_frame *frame ){
-   return _replay_frame_size( frame->subsystem_gamestate_size, 
-                              frame->sfx_count );
-}
-
-VG_STATIC void replay_tailpop( replay_buffer *replay ){
+static void replay_tailpop( replay_buffer *replay ){
    if( replay->cursor_frame == replay->tail )
       replay->cursor_frame = NULL;
    if( replay->statehead == replay->tail )
@@ -66,21 +46,26 @@ VG_STATIC void replay_tailpop( replay_buffer *replay ){
       replay->head = NULL;
 }
 
-VG_STATIC replay_frame *replay_newframe( replay_buffer *replay, 
-                                         u32 subsystem_gamestate_size, 
-                                         u32 sfx_count ){
-   replay_frame *frame = NULL;
-   if( replay->head ){
-      assert( replay->head );
+static replay_frame *replay_newframe( replay_buffer *replay, 
+                                         u16 animator_size,
+                                         u16 gamestate_size,
+                                         u16 sfx_count ){
+   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_internal_gamestate ][1] = 0;
+   if( gamestate_size ){
+      data_table[ k_replay_framedata_internal_gamestate ][1] = 
+         sizeof( replay_gamestate );
+   }
 
-      u32 headsize = replay_frame_size( replay->head ),
-          nextpos  = ((void *)replay->head - replay->data) + headsize,
-          nextsize = _replay_frame_size( subsystem_gamestate_size, sfx_count );
+   u32 nextsize = replay_frame_calculate_data_offsets( data_table );
 
-      if( nextsize > replay->size ){
-         vg_error( "Keyframe too big\n" );
-         return NULL;
-      }
+   replay_frame *frame = NULL;
+   if( replay->head ){
+      u32 headsize = replay->head->total_size,
+          nextpos  = ((void *)replay->head - replay->data) + headsize;
 
       if( nextpos + nextsize > replay->size ){
          nextpos = 0;
@@ -94,7 +79,6 @@ VG_STATIC replay_frame *replay_newframe( replay_buffer *replay,
       }
 
 check_again:;
-
       u32 tailpos = (void *)replay->tail - replay->data;
 
       if( tailpos >= nextpos ){
@@ -114,18 +98,22 @@ check_again:;
    else
       frame = replay->data;
 
-   frame->subsystem_gamestate_size = subsystem_gamestate_size;
-   frame->sfx_count = sfx_count;
+   for( u32 i=0; i<4; i++ ){
+      frame->data_table[i][0] = data_table[i][0];
+      frame->data_table[i][1] = data_table[i][1];
+   }
+
+   frame->total_size = nextsize;
    frame->l = replay->head;
    frame->r = NULL;
    replay->head = frame;
    if( !replay->tail ) replay->tail = frame;
-   if( subsystem_gamestate_size ) replay->statehead = frame;
+   if( gamestate_size ) replay->statehead = frame;
 
    return frame;
 }
 
-VG_STATIC void replay_seek( replay_buffer *replay, f64 t ){
+static void replay_seek( replay_buffer *replay, f64 t ){
    if( !replay->head ) return;
    assert( replay->tail );
 
@@ -169,19 +157,19 @@ VG_STATIC void replay_seek( replay_buffer *replay, f64 t ){
    replay->cursor = t;
 }
 
-VG_STATIC replay_frame *replay_find_recent_stateframe( replay_buffer *replay ){
+static replay_frame *replay_find_recent_stateframe( replay_buffer *replay ){
    replay_frame *frame = replay->cursor_frame;
    u32 i=4096;
    while( i --> 0 ){
       if( !frame ) return frame;
-      if( frame->subsystem_gamestate_size ) return frame;
+      if( frame->data_table[ k_replay_framedata_gamestate ][1] ) return frame;
       frame = frame->l;
    }
 
    return NULL;
 }
 
-VG_STATIC f32 replay_subframe_time( replay_buffer *replay ){
+static f32 replay_subframe_time( replay_buffer *replay ){
    replay_frame *frame = replay->cursor_frame;
    if( !frame ) return 0.0f;
    replay_frame *next = frame->r;
@@ -194,13 +182,13 @@ VG_STATIC f32 replay_subframe_time( replay_buffer *replay ){
       return 0.0f;
 }
 
-VG_STATIC void replay_get_frame_camera( replay_frame *frame, camera *cam ){
+static void replay_get_frame_camera( replay_frame *frame, camera *cam ){
    cam->fov = frame->cam_fov;
    v3_copy( frame->cam_pos, cam->pos );
    v3_copy( frame->cam_angles, cam->angles );
 }
 
-VG_STATIC void replay_get_camera( replay_buffer *replay, camera *cam ){
+static void replay_get_camera( replay_buffer *replay, camera *cam ){
    cam->nearz = 0.1f;
    cam->farz = 100.0f;
    if( replay->cursor_frame ){
@@ -229,7 +217,7 @@ struct replay_rb{
    v4f q;
 };
 
-VG_STATIC 
+static 
 void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
    f64 delta      = 9999999.9,
        statedelta = 9999999.9;
@@ -253,8 +241,7 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
 
    if( !save_frame ) return;
 
-   u32 gamestate_size = 0;
-
+   u16 gamestate_size = 0;
    if( save_state ){
       gamestate_size = (u32 []){ 
          [k_player_subsystem_walk ] = sizeof(struct player_walk_state),
@@ -264,12 +251,21 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
                                        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 ];
    
-   replay_frame *frame = replay_newframe( replay, gamestate_size, 0 );
+   replay_frame *frame = replay_newframe( replay,
+                                          animator_size, gamestate_size, 0 );
+   frame->system = localplayer.subsystem;
 
    if( save_state ){
-      replay_gamestate *gs = replay_frame_gamestate( frame );
-      gs->system = localplayer.subsystem;
+      replay_gamestate *gs = 
+         replay_frame_data( frame, k_replay_framedata_internal_gamestate );
 
       /* permanent block */
       memcpy( &gs->rb, &localplayer.rb, sizeof(rigidbody) );
@@ -277,13 +273,13 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
                sizeof(struct player_cam_controller) );
       v3_copy( localplayer.angles, gs->angles );
 
-      void *dst = replay_gamestate_subsystem_data( gs );
+      void *dst = replay_frame_data( frame, k_replay_framedata_gamestate );
 
       /* subsytem/dynamic block */
       if( localplayer.subsystem == k_player_subsystem_walk )
-         memcpy( dst, &localplayer._walk.state, gamestate_size );
+         memcpy( dst, &player_walk.state, gamestate_size );
       else if( localplayer.subsystem == k_player_subsystem_skate )
-         memcpy( dst, &localplayer._skate.state, gamestate_size );
+         memcpy( dst, &player_skate.state, gamestate_size );
       else if( localplayer.subsystem == k_player_subsystem_dead ){
          struct replay_rb *arr = dst;
          for( u32 i=0; i<localplayer.ragdoll.part_count; i ++ ){
@@ -298,54 +294,45 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
 
    replay->cursor = vg.time;
    replay->cursor_frame = frame;
-
-   player_pose *res = &frame->pose;
-   v3_zero( res->root_co );
-   q_identity( res->root_q );
-   res->type = k_player_pose_type_absolute;
-
-   struct skeleton *sk = &localplayer.playeravatar->sk;
-
-   memcpy( &frame->pose.board, &localplayer.pose.board, 
-            sizeof(localplayer.pose.board) );
    frame->time = vg.time;
-   v3_copy( localplayer.cam.pos, frame->cam_pos );
 
+   /* camera */
+   v3_copy( localplayer.cam.pos, frame->cam_pos );
    if( localplayer.gate_waiting ){
       m4x3_mulv( localplayer.gate_waiting->transport, 
                   frame->cam_pos, frame->cam_pos );
-
-      for( u32 i=1; i<sk->bone_count; i++ ){
-         struct skeleton_bone *sb = &sk->bones[i];
-         mdl_keyframe *kf = &res->keyframes[i-1];
-         m4x3f mtx;
-         m4x3_mul( localplayer.gate_waiting->transport, sk->final_mtx[i], mtx );
-         m4x3_decompose( mtx, kf->co, kf->q, kf->s );
-      }
    }
-   else
-      skeleton_decompose_mtx_absolute( sk, res->keyframes );
-
    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 );
+   }
 }
 
-VG_STATIC
+static
 void skaterift_restore_frame( replay_frame *frame ){
-   replay_gamestate *gs = replay_frame_gamestate( frame );
-   void *src = replay_gamestate_subsystem_data( gs );
-
-   /* TODO: Move this to subsystem bindings now that its variable */
-   if( gs->system == k_player_subsystem_walk ){
-      memcpy( &localplayer._walk.state, src,
-              frame->subsystem_gamestate_size );
+   replay_gamestate *gs = 
+      replay_frame_data( frame, k_replay_framedata_internal_gamestate );
+   void *src = replay_frame_data( frame, k_replay_framedata_gamestate );
+   u16 src_size = frame->data_table[ k_replay_framedata_gamestate ][1];
+   assert( src_size );
+
+   if(frame->system == k_player_subsystem_walk ){
+      memcpy( &player_walk.state, src, src_size );
    }
-   else if( gs->system == k_player_subsystem_skate ){
-      memcpy( &localplayer._skate.state, src,
-              frame->subsystem_gamestate_size );
+   else if( frame->system == k_player_subsystem_skate ){
+      memcpy( &player_skate.state, src, src_size );
    }
-   else if( gs->system == k_player_subsystem_dead ){
-      player__dead_transition( &localplayer );
+   else if( frame->system == k_player_subsystem_dead ){
+      player__dead_transition();
       struct replay_rb *arr = src;
 
       for( u32 i=0; i<localplayer.ragdoll.part_count; i ++ ){
@@ -362,7 +349,7 @@ void skaterift_restore_frame( replay_frame *frame ){
       }
    }
 
-   localplayer.subsystem = gs->system;
+   localplayer.subsystem = frame->system;
 
    memcpy( &localplayer.rb, &gs->rb, sizeof(rigidbody) );
    v3_copy( gs->angles, localplayer.angles );
@@ -385,7 +372,7 @@ void skaterift_restore_frame( replay_frame *frame ){
    vg.time = frame->time;
 }
 
-VG_STATIC void skaterift_replay_resume(void){
+static void skaterift_replay_resume(void){
    replay_frame *prev = replay_find_recent_stateframe(&skaterift.replay);
 
    if( prev ){
@@ -394,9 +381,13 @@ VG_STATIC void skaterift_replay_resume(void){
       skaterift.resume_begin = skaterift.replay.cursor;
       skaterift.resume_transition = 0.0f;
    }
+
+   gui_helper_clear();
 }
 
-VG_STATIC void skaterift_replay_pre_update(void){
+static void skaterift_replay_update_helpers(void);
+
+static void skaterift_replay_pre_update(void){
    if( skaterift.activity != k_skaterift_replay ) return;
 
    if( skaterift.replay_control == k_replay_control_resume ){
@@ -426,6 +417,8 @@ VG_STATIC void skaterift_replay_pre_update(void){
 
          if( skaterift.freecam )
             replay_get_camera( &skaterift.replay, &skaterift.replay_freecam );
+
+         skaterift_replay_update_helpers();
       }
 
       f32 target_speed = axis_state( k_sraxis_replay_h ) * 5.0;
@@ -453,15 +446,11 @@ VG_STATIC void skaterift_replay_pre_update(void){
             skaterift_restore_frame( skaterift.replay.statehead );
          else
             skaterift.activity = k_skaterift_default;
-         srinput.enabled = 0;
+         srinput.state = k_input_state_resume;
+         gui_helper_clear();
       }
 
-      gui_helper_action( button_display_string(k_srbind_replay_play), "play" );
-      gui_helper_action( axis_display_string(k_sraxis_replay_h), "scrub" );
       if( skaterift.freecam ){
-         gui_helper_action( button_display_string(k_srbind_replay_freecam), 
-                            "exit freecam" );
-
          camera *cam = &skaterift.replay_freecam;
          v3f angles;
          v3_copy( cam->angles, angles );
@@ -481,12 +470,9 @@ VG_STATIC void skaterift_replay_pre_update(void){
  
          v3f lookdir = { 0.0f, 0.0f, -1.0f },
              sidedir = { 1.0f, 0.0f,  0.0f };
-
-         m3x3f mtx;
-         m3x3_mul( cam->transform, localplayer.basis, mtx );
          
-         m3x3_mulv( mtx, lookdir, lookdir );
-         m3x3_mulv( mtx, sidedir, sidedir );
+         m3x3_mulv( cam->transform, lookdir, lookdir );
+         m3x3_mulv( cam->transform, sidedir, sidedir );
 
          v2f input;
          joystick_state( k_srjoystick_steer, input );
@@ -502,11 +488,6 @@ VG_STATIC void skaterift_replay_pre_update(void){
                      skaterift.freecam_v, vg.time_frame_delta, cam->pos );
       }
       else {
-         gui_helper_action( button_display_string(k_srbind_replay_resume), 
-                            "resume" );
-         gui_helper_action( button_display_string(k_srbind_replay_freecam), 
-                            "enter freecam" );
-
          if( button_down( k_srbind_replay_resume ) ){
             skaterift_replay_resume();
          }
@@ -514,7 +495,53 @@ VG_STATIC void skaterift_replay_pre_update(void){
    }
 }
 
-VG_STATIC void skaterift_get_replay_camera( camera *cam ){
+static void skaterift_replay_update_helpers(void){
+   skaterift.helper_resume->greyed = skaterift.freecam;
+
+   vg_str freecam_text;
+   vg_strnull( &freecam_text, skaterift.helper_freecam->text, 
+               GUI_HELPER_TEXT_LENGTH );
+   vg_strcat( &freecam_text, skaterift.freecam? "exit freecam": "freecam" );
+}
+
+static void skaterift_replay_post_render(void){
+   if( world_static.active_instance != k_world_purpose_client )
+      return;
+
+   /* capture the current resume frame at the very last point */
+   if( button_down( k_srbind_reset ) ){
+      if( skaterift.activity == k_skaterift_default ){
+         localplayer.rewinded_since_last_gate = 1;
+         skaterift.activity = k_skaterift_replay;
+         skaterift_record_frame( &skaterift.replay, 1 );
+         if( skaterift.replay.head ){
+            skaterift.replay.cursor = skaterift.replay.head->time;
+            skaterift.replay.cursor_frame = skaterift.replay.head;
+         }
+         skaterift.replay_control = k_replay_control_scrub;
+
+         gui_helper_clear();
+         vg_str text;
+
+         if( gui_new_helper( input_axis_list[k_sraxis_replay_h], &text ) )
+            vg_strcat( &text, "scrub" );
+
+         if( (skaterift.helper_resume = gui_new_helper( 
+                     input_button_list[k_srbind_replay_resume], &text )) )
+            vg_strcat( &text, "resume" );
+         
+         if( gui_new_helper( input_button_list[k_srbind_replay_play], &text ))
+            vg_strcat( &text, "playback" );
+
+         skaterift.helper_freecam = gui_new_helper(
+               input_button_list[k_srbind_replay_freecam], &text );
+
+         skaterift_replay_update_helpers();
+      }
+   }
+}
+
+static void skaterift_get_replay_camera( camera *cam ){
    if( skaterift.freecam ){
       cam->nearz = 0.1f;
       cam->farz = 100.0f;
@@ -527,7 +554,7 @@ VG_STATIC void skaterift_get_replay_camera( camera *cam ){
    }
 }
 
-VG_STATIC void skaterift_replay_debug_info(void){
+static void skaterift_replay_debug_info(void){
    player__debugtext( 2, "replay info" );
 
    replay_buffer *replay = &skaterift.replay;
@@ -540,10 +567,15 @@ VG_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++ ){
+         player__debugtext( 1, "[%u]: [%hu, %hu]\n", i,
+              replay->statehead->data_table[i][0],
+              replay->statehead->data_table[i][1] );
+      }
       u32 state = (void *)replay->statehead - replay->data;
       player__debugtext( 1, "gs @%u\n", state );
-      player__debugtext( 1, "gamestate_size: %u\n", 
-                         replay->statehead->subsystem_gamestate_size );
+      player__debugtext( 1, "gamestate_size: %hu\n", 
+           replay->statehead->data_table[k_replay_framedata_gamestate][1] );
    }
    else
       player__debugtext( 1, "gs @NULL\n" );
@@ -559,7 +591,7 @@ VG_STATIC void skaterift_replay_debug_info(void){
    player__debugtext( 1, "cursor: %.2fs / %.2fs\n", cur, len );
 }
 
-VG_STATIC void skaterift_replay_imgui(void){
+static void skaterift_replay_imgui(void){
    if( skaterift.activity != k_skaterift_replay ) return;
 
    replay_buffer *replay = &skaterift.replay;
@@ -617,17 +649,6 @@ VG_STATIC void skaterift_replay_imgui(void){
    snprintf( buffer, 128, "-%.2fs\n", len );
    ui_text( bar, buffer, 1, k_ui_align_middle_left, 0 );
    ui_text( bar, "0s", 1, k_ui_align_middle_right, 0 );
-
-#if 0
-   char buf[256];
-   snprintf( buf, 256, "scrub: %s\nresume: %s\nplay: %s\n", 
-               axis_display_string( k_sraxis_replay_h ),
-               button_display_string( k_srbind_replay_resume ),
-               button_display_string( k_srbind_replay_play ) );
-
-   ui_rect info = { 0, vg.window_y-bar[3]-128, 256, 128 };
-   ui_text( info, buf, 2,0,0 );
-#endif
 }
 
 #endif /* PLAYER_REPLAY_C */