X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_replay.c;h=1b339474dd593b61f95a46ce56cd2a6e56f4573f;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=1215f62d3f13d893114226b73fd422ebe842bcb7;hpb=6c84fa207dec2cf8e92b3882492bdd2f92ee7afe;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.c b/player_replay.c
index 1215f62..1b33947 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -2,8 +2,10 @@
 #define PLAYER_REPLAY_C
 
 #include "player_replay.h"
+#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;
@@ -11,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) );
-}
-
-u32 replay_frame_size( replay_frame *frame ){
-   return _replay_frame_size( frame->subsystem_gamestate_size, 
-                              frame->sfx_count );
+   return total;
 }
 
-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 )
@@ -64,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;
@@ -92,7 +79,6 @@ VG_STATIC replay_frame *replay_newframe( replay_buffer *replay,
       }
 
 check_again:;
-
       u32 tailpos = (void *)replay->tail - replay->data;
 
       if( tailpos >= nextpos ){
@@ -112,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 );
 
@@ -167,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;
@@ -192,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 ){
@@ -222,80 +212,349 @@ VG_STATIC void replay_get_camera( replay_buffer *replay, camera *cam ){
    }
 }
 
-VG_STATIC void skaterift_replay_pre_update(void){
-   if( skaterift.activity != k_skaterift_replay ) return;
+struct replay_rb{
+   v3f co, v, w;
+   v4f q;
+};
+
+static 
+void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
+   f64 delta      = 9999999.9,
+       statedelta = 9999999.9;
+
+   if( replay->head )
+      delta = vg.time - replay->head->time;
+
+   if( replay->statehead )
+      statedelta = vg.time - replay->statehead->time;
+
+   const f64 k_replay_rate = 1.0/30.0,
+             k_gamestate_rate = 0.5;
+
+   int save_frame = 0,
+       save_state = 0;
 
-   f64 speed = 1.0;
-   f64 target = skaterift.replay.cursor;
+   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( vg_getkey( SDLK_9 ) ){
-      target -= vg.time_frame_delta * speed;
-      skaterift.replay_control = k_replay_control_scrub;
-      replay_seek( &skaterift.replay, target );
+   if( !save_frame ) return;
+
+   u16 gamestate_size = 0;
+   if( save_state ){
+      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)
+      }[ 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,
+                                          animator_size, gamestate_size, 0 );
+   frame->system = localplayer.subsystem;
+
+   if( save_state ){
+      replay_gamestate *gs = 
+         replay_frame_data( frame, k_replay_framedata_internal_gamestate );
+
+      /* permanent block */
+      memcpy( &gs->rb, &localplayer.rb, sizeof(rigidbody) );
+      memcpy( &gs->cam_control, &localplayer.cam_control, 
+               sizeof(struct player_cam_controller) );
+      v3_copy( localplayer.angles, gs->angles );
+
+      void *dst = replay_frame_data( frame, k_replay_framedata_gamestate );
+
+      /* subsytem/dynamic block */
+      if( localplayer.subsystem == k_player_subsystem_walk )
+         memcpy( dst, &player_walk.state, gamestate_size );
+      else if( localplayer.subsystem == k_player_subsystem_skate )
+         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 ++ ){
+            rigidbody *rb = &localplayer.ragdoll.parts[i].obj.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 );
+         }
+      }
    }
-   if( vg_getkey( SDLK_0 ) ){
-      target += vg.time_frame_delta * speed;
-      skaterift.replay_control = k_replay_control_scrub;
-      replay_seek( &skaterift.replay, target );
+
+   replay->cursor = vg.time;
+   replay->cursor_frame = frame;
+   frame->time = vg.time;
+
+   /* 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 );
+   }
+   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 );
    }
+}
 
-   if( vg_getkey( SDLK_7 ) )
-      skaterift.replay_control = k_replay_control_play;
+static
+void skaterift_restore_frame( replay_frame *frame ){
+   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( skaterift.replay_control == k_replay_control_play ){
-      target += vg.time_frame_delta;
-      replay_seek( &skaterift.replay, target );
+   if(frame->system == k_player_subsystem_walk ){
+      memcpy( &player_walk.state, src, src_size );
+   }
+   else if( frame->system == k_player_subsystem_skate ){
+      memcpy( &player_skate.state, src, src_size );
    }
+   else if( frame->system == k_player_subsystem_dead ){
+      player__dead_transition();
+      struct replay_rb *arr = src;
 
-   if( vg_getkey( SDLK_8 ) ){
-      replay_frame *prev = replay_find_recent_stateframe( &skaterift.replay );
+      for( u32 i=0; i<localplayer.ragdoll.part_count; i ++ ){
+         struct ragdoll_part *part = &localplayer.ragdoll.parts[i];
+         rigidbody *rb = &part->obj.rb;
 
-      if( prev ){
-         /* TODO: Make gamestate_apply function / swap ... */
-         replay_gamestate *gs = replay_frame_gamestate( prev );
-         void *src = replay_gamestate_subsystem_data( gs );
+         v3_copy( arr[i].co, rb->co );
+         v3_copy( arr[i].w, rb->w );
+         v3_copy( arr[i].v, rb->v );
+         v4_copy( arr[i].q, rb->q );
 
-         if( gs->system == k_player_subsystem_walk ){
-            memcpy( &localplayer._walk.state, src,
-                    prev->subsystem_gamestate_size );
+         v3_copy( arr[i].co, part->prev_co );
+         v4_copy( arr[i].q, part->prev_q );
+      }
+   }
+
+   localplayer.subsystem = frame->system;
+
+   memcpy( &localplayer.rb, &gs->rb, sizeof(rigidbody) );
+   v3_copy( gs->angles, localplayer.angles );
+
+   v3_copy( frame->cam_pos, localplayer.cam.pos );
+   v3_copy( frame->cam_angles, localplayer.cam.angles );
+   localplayer.cam.fov = frame->cam_fov;
+
+   memcpy( &localplayer.cam_control, &gs->cam_control, 
+            sizeof(struct player_cam_controller) );
+
+   /* chop end off replay */
+   frame->r = NULL;
+   skaterift.replay.statehead = frame;
+   skaterift.replay.head = frame;
+   skaterift.replay.cursor_frame = frame;
+   skaterift.replay.cursor = frame->time;
+   skaterift.replay_control = k_replay_control_scrub;
+   skaterift.activity = k_skaterift_default;
+   vg.time = frame->time;
+}
+
+static void skaterift_replay_resume(void){
+   replay_frame *prev = replay_find_recent_stateframe(&skaterift.replay);
+
+   if( prev ){
+      skaterift.replay_control = k_replay_control_resume;
+      skaterift.resume_target = prev;
+      skaterift.resume_begin = skaterift.replay.cursor;
+      skaterift.resume_transition = 0.0f;
+   }
+
+   gui_helper_clear();
+}
+
+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 ){
+      if( skaterift.replay.cursor_frame == skaterift.resume_target ||
+          skaterift.replay.cursor_frame == NULL ){
+         skaterift_restore_frame( skaterift.resume_target );
+      }
+      else {
+         vg_slewf( &skaterift.resume_transition, 1.0f, 
+                   vg.time_frame_delta * (1.0f/1.0f) );
+
+         if( skaterift.resume_transition >= 1.0f )
+            skaterift_restore_frame( skaterift.resume_target );
+         else {
+            f64 target = vg_lerp( skaterift.resume_begin, 
+                              skaterift.resume_target->time, 
+                              vg_smoothstepf( skaterift.resume_transition ) );
+            replay_seek( &skaterift.replay, target );
          }
-         else if( gs->system == k_player_subsystem_skate ){
-            memcpy( &localplayer._skate.state, src,
-                    prev->subsystem_gamestate_size );
+      }
+   }
+   else {
+      if( button_down( k_srbind_replay_play ) )
+         skaterift.replay_control = k_replay_control_play;
+      if( button_down( k_srbind_replay_freecam ) ){
+         skaterift.freecam = skaterift.freecam ^ 0x1;
+
+         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;
+      if( button_press( k_srbind_reset ) )
+         target_speed += -2.0;
+
+      if( fabsf(target_speed) > 0.01f )
+         skaterift.replay_control = k_replay_control_scrub;
+
+      if( skaterift.replay_control == k_replay_control_play )
+         target_speed = 1.0;
+
+      vg_slewf( &skaterift.track_velocity, target_speed, 
+                18.0f*vg.time_frame_delta );
+
+      if( fabsf( skaterift.track_velocity ) > 0.0001f ){
+         f64 target = skaterift.replay.cursor;
+         target += skaterift.track_velocity * vg.time_frame_delta;
+
+         replay_seek( &skaterift.replay, target );
+      }
+
+      if( button_down( k_srbind_mback ) ){
+         if( skaterift.replay.statehead )
+            skaterift_restore_frame( skaterift.replay.statehead );
+         else
+            skaterift.activity = k_skaterift_default;
+         srinput.state = k_input_state_resume;
+         gui_helper_clear();
+      }
+
+      if( skaterift.freecam ){
+         camera *cam = &skaterift.replay_freecam;
+         v3f angles;
+         v3_copy( cam->angles, angles );
+         player_look( angles, 1.0f );
+
+         f32 decay = vg_maxf(0.0f,1.0f-vg.time_frame_delta*10.0f);
+
+         v3f d;
+         v3_sub( angles, cam->angles, d );
+         v3_muladds( skaterift.freecam_w, d, 20.0f, skaterift.freecam_w );
+         v3_muls( skaterift.freecam_w, decay, skaterift.freecam_w );
+         v3_muladds( cam->angles, skaterift.freecam_w, vg.time_frame_delta,
+                     cam->angles );
+         cam->angles[1] = vg_clampf( cam->angles[1], -VG_PIf*0.5f,VG_PIf*0.5f);
+
+         camera_update_transform( cam );
+ 
+         v3f lookdir = { 0.0f, 0.0f, -1.0f },
+             sidedir = { 1.0f, 0.0f,  0.0f };
+         
+         m3x3_mulv( cam->transform, lookdir, lookdir );
+         m3x3_mulv( cam->transform, sidedir, sidedir );
+
+         v2f input;
+         joystick_state( k_srjoystick_steer, input );
+         v2_muls( input, vg.time_frame_delta*6.0f*20.0f, input );
+         
+         v3_muladds( skaterift.freecam_v, lookdir, -input[1], 
+                     skaterift.freecam_v );
+         v3_muladds( skaterift.freecam_v, sidedir, input[0], 
+                     skaterift.freecam_v );
+
+         v3_muls( skaterift.freecam_v, decay, skaterift.freecam_v );
+         v3_muladds( cam->pos,
+                     skaterift.freecam_v, vg.time_frame_delta, cam->pos );
+      }
+      else {
+         if( button_down( k_srbind_replay_resume ) ){
+            skaterift_replay_resume();
          }
-         else if( gs->system == k_player_subsystem_dead ){
-            player__dead_transition( &localplayer );
-            memcpy( &localplayer.ragdoll, src, 
-                    prev->subsystem_gamestate_size );
+      }
+   }
+}
+
+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;
 
-         localplayer.subsystem = gs->system;
+         gui_helper_clear();
+         vg_str text;
 
-         memcpy( &localplayer.rb, &gs->rb, sizeof(rigidbody) );
-         v3_copy( gs->angles, localplayer.angles );
+         if( gui_new_helper( input_axis_list[k_sraxis_replay_h], &text ) )
+            vg_strcat( &text, "scrub" );
 
-         v3_copy( prev->cam_pos, localplayer.cam.pos );
-         v3_copy( prev->cam_angles, localplayer.cam.angles );
-         localplayer.cam.fov = prev->cam_fov;
+         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" );
 
-         memcpy( &localplayer.cam_control, &gs->cam_control, 
-                  sizeof(struct player_cam_controller) );
+         skaterift.helper_freecam = gui_new_helper(
+               input_button_list[k_srbind_replay_freecam], &text );
 
-         /* chop end off replay */
-         prev->r = NULL;
-         skaterift.replay.statehead = prev;
-         skaterift.replay.head = prev;
-         skaterift.replay.cursor_frame = prev;
-         skaterift.replay.cursor = prev->time;
-         skaterift.replay_control = k_replay_control_scrub;
-         skaterift.activity = k_skaterift_default;
-         vg.time = prev->time;
-         return;
+         skaterift_replay_update_helpers();
       }
    }
 }
 
-VG_STATIC void skaterift_replay_debug_info(void){
+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 );
+   }
+}
+
+static void skaterift_replay_debug_info(void){
    player__debugtext( 2, "replay info" );
 
    replay_buffer *replay = &skaterift.replay;
@@ -308,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" );
@@ -327,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;
@@ -341,9 +605,9 @@ VG_STATIC void skaterift_replay_imgui(void){
    char buffer[ 128 ];
 
    /* mainbar */
-   ui_px height = 20,
+   ui_px height = 32,
          cwidth = 2;
-   ui_rect bar = { 0, vg.window_y - height, vg.window_x, height };
+   ui_rect bar = { 0, 0, vg.window_x, height };
    ui_fill( bar, ui_colour( k_ui_bg ) );
 
    /* cursor frame block */
@@ -351,21 +615,21 @@ VG_STATIC void skaterift_replay_imgui(void){
       if( replay->cursor_frame->r ){
          f64 l = (replay->cursor_frame->r->time-replay->cursor_frame->time)/len,
              s = (replay->cursor_frame->time - start) / len;
-         ui_rect box = { s*(f64)vg.window_x, bar[1]-2, 
+         ui_rect box = { s*(f64)vg.window_x, 0, 
                          VG_MAX(4,(ui_px)(l*vg.window_x)), bar[3]+2 };
          ui_fill( box, ui_colour( k_ui_bg+4 ) );
       }
    }
 
    /* cursor */
-   ui_rect cusor = { cur * (f64)vg.window_x - (cwidth/2), bar[1], 
+   ui_rect cusor = { cur * (f64)vg.window_x - (cwidth/2), 0, 
                      cwidth, bar[3] };
    ui_fill( cusor, ui_colour( k_ui_bg+7 ) );
 
    /* latest state marker */
    if( replay->statehead ){
       f64 t = (replay->statehead->time - start) / len;
-      ui_rect tag = { t*(f64)vg.window_x, bar[1]-8, 2, bar[3]+8 };
+      ui_rect tag = { t*(f64)vg.window_x, 0, 2, bar[3]+8 };
       ui_fill( tag, ui_colour( k_ui_green+k_ui_brighter ) );
    }
 
@@ -373,7 +637,7 @@ VG_STATIC void skaterift_replay_imgui(void){
    replay_frame *prev = replay_find_recent_stateframe( replay );
    if( prev ){
       f64 t = (prev->time - start) / len;
-      ui_rect tag = { t*(f64)vg.window_x, bar[1]-8, 2, bar[3]+8 };
+      ui_rect tag = { t*(f64)vg.window_x, 0, 2, bar[3]+8 };
       ui_fill( tag, ui_colour( k_ui_yellow+k_ui_brighter ) );
    }