X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_replay.c;h=62c2b2e582876f5bef13cd377f46d0a45f4ed40d;hb=3901e08513eb75b706b26aa51acfa20f80c1f81a;hp=ed0c6444b51fc0a684cf5f2e7e9442acf8ca5ea6;hpb=bf8478e3656ae729248a594a57d111f08bed41e0;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.c b/player_replay.c
index ed0c644..62c2b2e 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -3,6 +3,7 @@
 
 #include "player_replay.h"
 #include "input.h"
+#include "gui.h"
 
 VG_STATIC void replay_clear( replay_buffer *replay ){
    replay->head = NULL;
@@ -384,6 +385,17 @@ void skaterift_restore_frame( replay_frame *frame ){
    vg.time = frame->time;
 }
 
+VG_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;
+   }
+}
+
 VG_STATIC void skaterift_replay_pre_update(void){
    if( skaterift.activity != k_skaterift_replay ) return;
 
@@ -411,6 +423,8 @@ VG_STATIC void skaterift_replay_pre_update(void){
          skaterift.replay_control = k_replay_control_play;
 
       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;
@@ -419,7 +433,7 @@ VG_STATIC void skaterift_replay_pre_update(void){
          target_speed = 1.0;
 
       vg_slewf( &skaterift.track_velocity, target_speed, 
-                10.0f*vg.time_frame_delta );
+                18.0f*vg.time_frame_delta );
 
       if( fabsf( skaterift.track_velocity ) > 0.0001f ){
          f64 target = skaterift.replay.cursor;
@@ -429,14 +443,7 @@ VG_STATIC void skaterift_replay_pre_update(void){
       }
 
       if( button_down( k_srbind_replay_resume ) ){
-         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;
-         }
+         skaterift_replay_resume();
       }
       else if( button_down( k_srbind_mback ) ){
          if( skaterift.replay.statehead )
@@ -496,7 +503,7 @@ VG_STATIC void skaterift_replay_imgui(void){
    /* mainbar */
    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 */
@@ -504,21 +511,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 ) );
    }
 
@@ -526,7 +533,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 ) );
    }
 
@@ -539,11 +546,20 @@ VG_STATIC void skaterift_replay_imgui(void){
    ui_text( bar, buffer, 1, k_ui_align_middle_left, 0 );
    ui_text( bar, "0s", 1, k_ui_align_middle_right, 0 );
 
-   ui_rect info = { 0, vg.window_y-bar[3]-64, 128, 64 };
-   if( vg_input.display_input_method == k_input_method_controller )
-      ui_text( info, "scrub: <- LS ->\nresume:LB\nplay: A", 1,0,0 );
-   else
-      ui_text( info, "scrub: <- ->\nresume:R\nplay: space", 1,0,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
+
+   gui_helper_action( axis_display_string(k_sraxis_replay_h), "scrub" );
+   gui_helper_action( button_display_string(k_srbind_replay_resume), "resume" );
+   gui_helper_action( button_display_string(k_srbind_replay_play), "play" );
 }
 
 #endif /* PLAYER_REPLAY_C */