X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_replay.c;h=ed0c6444b51fc0a684cf5f2e7e9442acf8ca5ea6;hb=bf8478e3656ae729248a594a57d111f08bed41e0;hp=79db8daf4d7a10ac55d0ff15faa31a310e02d02e;hpb=0399d5a0a2e1818c3d4951f42abc1132f7e26421;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.c b/player_replay.c
index 79db8da..ed0c644 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -2,6 +2,7 @@
 #define PLAYER_REPLAY_C
 
 #include "player_replay.h"
+#include "input.h"
 
 VG_STATIC void replay_clear( replay_buffer *replay ){
    replay->head = NULL;
@@ -303,12 +304,27 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
    res->type = k_player_animation_type_absolute;
 
    struct skeleton *sk = &localplayer.playeravatar->sk;
-   skeleton_decompose_mtx_absolute( sk, res->pose );
 
    memcpy( &frame->board_pose, &localplayer.board_pose, 
             sizeof(localplayer.board_pose) );
    frame->time = vg.time;
    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->pose[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->pose );
+
    v3_copy( localplayer.cam.angles, frame->cam_angles );
    frame->cam_fov = localplayer.cam.fov;
 }
@@ -356,49 +372,78 @@ void skaterift_restore_frame( replay_frame *frame ){
 
    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;
 }
 
 VG_STATIC void skaterift_replay_pre_update(void){
    if( skaterift.activity != k_skaterift_replay ) return;
 
-   f64 speed = 1.0;
-   f64 target = skaterift.replay.cursor;
-
-   if( vg_getkey( SDLK_9 ) ){
-      target -= vg.time_frame_delta * speed;
-      skaterift.replay_control = k_replay_control_scrub;
-      replay_seek( &skaterift.replay, target );
-   }
-   if( vg_getkey( SDLK_0 ) ){
-      target += vg.time_frame_delta * speed;
-      skaterift.replay_control = k_replay_control_scrub;
-      replay_seek( &skaterift.replay, target );
+   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( button_down( k_srbind_replay_play ) )
+         skaterift.replay_control = k_replay_control_play;
 
-   if( vg_getkey( SDLK_7 ) )
-      skaterift.replay_control = k_replay_control_play;
+      f32 target_speed = axis_state( k_sraxis_replay_h ) * 5.0;
 
-   if( skaterift.replay_control == k_replay_control_play ){
-      target += vg.time_frame_delta;
-      replay_seek( &skaterift.replay, target );
-   }
+      if( fabsf(target_speed) > 0.01f )
+         skaterift.replay_control = k_replay_control_scrub;
 
-   if( vg_getkey( SDLK_8 ) ){
-      replay_frame *prev = replay_find_recent_stateframe( &skaterift.replay );
+      if( skaterift.replay_control == k_replay_control_play )
+         target_speed = 1.0;
 
-      if( prev ){
-         skaterift_restore_frame( prev );
+      vg_slewf( &skaterift.track_velocity, target_speed, 
+                10.0f*vg.time_frame_delta );
 
-         /* 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;
+      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_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;
+         }
+      }
+      else if( button_down( k_srbind_mback ) ){
+         if( skaterift.replay.statehead )
+            skaterift_restore_frame( skaterift.replay.statehead );
+         else
+            skaterift.activity = k_skaterift_default;
+         srinput.enabled = 0;
       }
    }
 }
@@ -449,7 +494,7 @@ 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_fill( bar, ui_colour( k_ui_bg ) );
@@ -493,6 +538,12 @@ 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 );
+
+   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 );
 }
 
 #endif /* PLAYER_REPLAY_C */