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

diff --git a/player_replay.c b/player_replay.c
index cd947dd..1b33947 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -64,16 +64,9 @@ static replay_frame *replay_newframe( replay_buffer *replay,
 
    replay_frame *frame = NULL;
    if( replay->head ){
-      assert( replay->head );
-
       u32 headsize = replay->head->total_size,
           nextpos  = ((void *)replay->head - replay->data) + headsize;
 
-      if( nextsize > replay->size ){
-         vg_error( "Keyframe too big\n" );
-         return NULL;
-      }
-
       if( nextpos + nextsize > replay->size ){
          nextpos = 0;
          
@@ -388,8 +381,12 @@ static void skaterift_replay_resume(void){
       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;
 
@@ -420,6 +417,8 @@ 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;
@@ -447,15 +446,11 @@ 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 );
@@ -475,12 +470,9 @@ 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 );
@@ -496,11 +488,6 @@ 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();
          }
@@ -508,6 +495,52 @@ static void skaterift_replay_pre_update(void){
    }
 }
 
+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;
@@ -616,17 +649,6 @@ 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 */