seperate gamestate and animator memory (BREAKS: SMOOTHED UPPER YAW)

[carveJwlIkooP6JGAAIwe30JlM.git] / player_replay.c

diff --git a/player_replay.c b/player_replay.c
index 62c2b2e582876f5bef13cd377f46d0a45f4ed40d..319cf03a64943d53646c4c75fdff794dc33b9821 100644 (file)
--- a/player_replay.c
+++ b/player_replay.c
@@ -299,15 +299,15 @@ 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;
 
-   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 );
 
@@ -317,14 +317,14 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
 
       for( u32 i=1; i<sk->bone_count; i++ ){
          struct skeleton_bone *sb = &sk->bones[i];
-         mdl_keyframe *kf = &res->pose[i-1];
+         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->pose );
+      skeleton_decompose_mtx_absolute( sk, res->keyframes );
 
    v3_copy( localplayer.cam.angles, frame->cam_angles );
    frame->cam_fov = localplayer.cam.fov;
@@ -421,6 +421,12 @@ VG_STATIC void skaterift_replay_pre_update(void){
    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 );
+      }
 
       f32 target_speed = axis_state( k_sraxis_replay_h ) * 5.0;
       if( button_press( k_srbind_reset ) )
@@ -442,16 +448,82 @@ VG_STATIC void skaterift_replay_pre_update(void){
          replay_seek( &skaterift.replay, target );
       }
 
-      if( button_down( k_srbind_replay_resume ) ){
-         skaterift_replay_resume();
-      }
-      else if( button_down( k_srbind_mback ) ){
+      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( 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 );
    }
 }
 
@@ -556,10 +628,6 @@ VG_STATIC void skaterift_replay_imgui(void){
    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 */