X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=player_replay.c;h=319cf03a64943d53646c4c75fdff794dc33b9821;hb=09fc72b08113fa157a3abb2ded6086babedd10cf;hp=47da357c4ede76fbd3ae0454a69ec649bd5a14ba;hpb=cba8a468e166156dd8cab3358da369b1df76eb8b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_replay.c b/player_replay.c
index 47da357..319cf03 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -2,6 +2,8 @@
 #define PLAYER_REPLAY_C
 
 #include "player_replay.h"
+#include "input.h"
+#include "gui.h"
 
 VG_STATIC void replay_clear( replay_buffer *replay ){
    replay->head = NULL;
@@ -297,18 +299,33 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
    replay->cursor = vg.time;
    replay->cursor_frame = frame;
 
-   player_animation *res = &frame->anim;
+   player_pose *res = &frame->pose;
    v3_zero( res->root_co );
    q_identity( res->root_q );
-   res->type = k_player_animation_type_absolute;
+   res->type = k_player_pose_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) );
+   memcpy( &frame->pose.board, &localplayer.pose.board, 
+            sizeof(localplayer.pose.board) );
    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->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;
 }
@@ -368,12 +385,20 @@ 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;
 
-   f64 speed = vg.time_frame_delta * 1.0;
-   f64 target = skaterift.replay.cursor;
-
    if( skaterift.replay_control == k_replay_control_resume ){
       if( skaterift.replay.cursor_frame == skaterift.resume_target ||
           skaterift.replay.cursor_frame == NULL ){
@@ -386,7 +411,7 @@ VG_STATIC void skaterift_replay_pre_update(void){
          if( skaterift.resume_transition >= 1.0f )
             skaterift_restore_frame( skaterift.resume_target );
          else {
-            target = vg_lerp( skaterift.resume_begin, 
+            f64 target = vg_lerp( skaterift.resume_begin, 
                               skaterift.resume_target->time, 
                               vg_smoothstepf( skaterift.resume_transition ) );
             replay_seek( &skaterift.replay, target );
@@ -394,38 +419,114 @@ VG_STATIC void skaterift_replay_pre_update(void){
       }
    }
    else {
-      if( vg_getkey( SDLK_9 ) ){
-         target -= speed;
-         skaterift.replay_control = k_replay_control_scrub;
-         replay_seek( &skaterift.replay, target );
+      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 );
       }
-      if( vg_getkey( SDLK_0 ) ){
-         target += speed;
+
+      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;
-         replay_seek( &skaterift.replay, target );
-      }
 
-      if( vg_getkey( SDLK_7 ) )
-         skaterift.replay_control = k_replay_control_play;
+      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;
 
-      if( skaterift.replay_control == k_replay_control_play ){
-         target += vg.time_frame_delta;
          replay_seek( &skaterift.replay, target );
       }
 
-      if( vg_getkey( SDLK_8 ) ){
-         replay_frame *prev = replay_find_recent_stateframe(&skaterift.replay);
+      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;
+      }
+
+      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 );
+         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 };
+
+         m3x3f mtx;
+         m3x3_mul( cam->transform, localplayer.basis, mtx );
+         
+         m3x3_mulv( mtx, lookdir, lookdir );
+         m3x3_mulv( mtx, 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 {
+         gui_helper_action( button_display_string(k_srbind_replay_resume), 
+                            "resume" );
+         gui_helper_action( button_display_string(k_srbind_replay_freecam), 
+                            "enter freecam" );
 
-         if( prev ){
-            skaterift.replay_control = k_replay_control_resume;
-            skaterift.resume_target = prev;
-            skaterift.resume_begin = skaterift.replay.cursor;
-            skaterift.resume_transition = 0.0f;
+         if( button_down( k_srbind_replay_resume ) ){
+            skaterift_replay_resume();
          }
       }
    }
 }
 
+VG_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 );
+   }
+}
+
 VG_STATIC void skaterift_replay_debug_info(void){
    player__debugtext( 2, "replay info" );
 
@@ -472,9 +573,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 */
@@ -482,21 +583,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 ) );
    }
 
@@ -504,7 +605,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 ) );
    }
 
@@ -516,6 +617,17 @@ 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 */