allow replays to pass through rifts

[carveJwlIkooP6JGAAIwe30JlM.git] / player_replay.c

diff --git a/player_replay.c b/player_replay.c
index 6a59e252ea9dab0d9580f22eb82e404828697e47..9fbbfcc6e7dd07c5ae9b2433071dd8b3154e061a 100644 (file)
--- a/player_replay.c
+++ b/player_replay.c
@@ -4,6 +4,7 @@
 #include "player_replay.h"
 #include "input.h"
 #include "gui.h"
+#include "freecam.h"
 
 static void replay_clear( replay_buffer *replay ){
    replay->head = NULL;
@@ -175,7 +176,7 @@ static f32 replay_subframe_time( replay_buffer *replay ){
    replay_frame *next = frame->r;
    if( next ){
       f64 l = next->time - frame->time,
-          t = (replay->cursor - frame->time) / l;
+          t = (l <= (1.0/128.0))? 0.0: (replay->cursor - frame->time) / l;
       return vg_clampf( t, 0.0f, 1.0f );
    }
    else 
@@ -217,8 +218,8 @@ struct replay_rb{
    v4f q;
 };
 
-static 
-void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
+static void skaterift_record_frame( replay_buffer *replay, 
+                                    int force_gamestate ){
    f64 delta      = 9999999.9,
        statedelta = 9999999.9;
 
@@ -301,8 +302,15 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){
    if( localplayer.gate_waiting ){
       m4x3_mulv( localplayer.gate_waiting->transport, 
                   frame->cam_pos, frame->cam_pos );
+
+      v3f v0;
+      v3_angles_vector( localplayer.cam.angles, v0 );
+      m3x3_mulv( localplayer.gate_waiting->transport, v0, v0 );
+      v3_angles( v0, frame->cam_angles );
    }
-   v3_copy( localplayer.cam.angles, frame->cam_angles );
+   else 
+      v3_copy( localplayer.cam.angles, frame->cam_angles );
+
    frame->cam_fov = localplayer.cam.fov;
 
    /* animator */
@@ -332,7 +340,7 @@ void skaterift_restore_frame( replay_frame *frame ){
       memcpy( &player_skate.state, src, src_size );
    }
    else if( frame->system == k_player_subsystem_dead ){
-      player__dead_transition();
+      player__dead_transition(0);
       struct replay_rb *arr = src;
 
       for( u32 i=0; i<localplayer.ragdoll.part_count; i ++ ){
@@ -451,41 +459,7 @@ static void skaterift_replay_pre_update(void){
       }
 
       if( skaterift.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 };
-         
-         m3x3_mulv( cam->transform, lookdir, lookdir );
-         m3x3_mulv( cam->transform, 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 );
+         //freecam_preupdate();
       }
       else {
          if( button_down( k_srbind_replay_resume ) ){
@@ -505,9 +479,13 @@ static void skaterift_replay_update_helpers(void){
 }
 
 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 ){
@@ -537,6 +515,7 @@ static void skaterift_replay_post_render(void){
    }
 }
 
+#if 0
 static void skaterift_get_replay_camera( camera *cam ){
    if( skaterift.freecam ){
       cam->nearz = 0.1f;
@@ -549,6 +528,7 @@ static void skaterift_get_replay_camera( camera *cam ){
       replay_get_camera( &skaterift.replay, &skaterift.cam );
    }
 }
+#endif
 
 static void skaterift_replay_debug_info(void){
    player__debugtext( 2, "replay info" );