X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_replay.c;h=f5a2ab9327ab03c9b7c0705c89596316d758d4ba;hb=888e62fcd8f9777cee774fbb8fab2e52660303a7;hp=1b339474dd593b61f95a46ce56cd2a6e56f4573f;hpb=cab063a27c067f6b5387305fe358c94fc7793f45;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_replay.c b/player_replay.c index 1b33947..f5a2ab9 100644 --- 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; @@ -15,14 +16,18 @@ static void replay_clear( replay_buffer *replay ){ static void * replay_frame_data( replay_frame *frame, enum replay_framedata type ){ + if( frame->data_table[type][1] == 0 ) + return NULL; + void *baseptr = frame; return baseptr + frame->data_table[type][0]; } -static u16 -replay_frame_calculate_data_offsets( u16 data_table[4][2] ){ +static u16 replay_frame_calculate_data_offsets( + u16 data_table[k_replay_framedata_rows][2] ){ + u32 total = vg_align8( sizeof(replay_frame) ); - for( u32 i=0; i<4; i++ ){ + for( u32 i=0; idata; - for( u32 i=0; i<4; i++ ){ + for( u32 i=0; idata_table[i][0] = data_table[i][0]; frame->data_table[i][1] = data_table[i][1]; } @@ -113,8 +125,19 @@ check_again:; return frame; } -static void replay_seek( replay_buffer *replay, f64 t ){ - if( !replay->head ) return; +static void replay_emit_frame_sounds( replay_frame *frame ){ + void *baseptr = frame; + u16 *inf = frame->data_table[k_replay_framedata_sfx]; + struct net_sfx *buffer = baseptr + inf[0]; + u32 count = inf[1] / sizeof(struct net_sfx); + + for( u32 i=0; ihead ) return 0; assert( replay->tail ); if( t < replay->tail->time ) t = replay->tail->time; @@ -131,13 +154,18 @@ static void replay_seek( replay_buffer *replay, f64 t ){ } f64 dir = t - replay->cursor; - if( dir == 0.0 ) return; + if( dir == 0.0 ) return 0; dir = vg_signf( dir ); + u32 i=4096; while( i --> 0 ){ - if( dir < 0.0 ) - if( t > replay->cursor_frame->time ) break; + if( dir < 0.0 ){ + if( t > replay->cursor_frame->time ) { + replay->cursor = t; + return 1; + } + } replay_frame *next; if( dir > 0.0 ) next = replay->cursor_frame->r; @@ -145,16 +173,23 @@ static void replay_seek( replay_buffer *replay, f64 t ){ if( !next ) break; - if( dir > 0.0 ) - if( t < next->time ) break; + if( dir > 0.0 ){ + if( t < next->time ){ + replay->cursor = t; + return 1; + } + } + + replay_emit_frame_sounds( next ); replay->cursor_frame = next; replay->cursor = next->time; - if( !i ) return; + if( !i ) return 1; } replay->cursor = t; + return 0; } static replay_frame *replay_find_recent_stateframe( replay_buffer *replay ){ @@ -175,7 +210,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 +252,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; @@ -232,35 +267,40 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){ k_gamestate_rate = 0.5; int save_frame = 0, - save_state = 0; + save_state = 0, + save_glider = 0; if( force_gamestate ) save_state = 1; if( statedelta > k_gamestate_rate ) save_state = 1; if( delta > k_replay_rate ) save_frame = 1; if( save_state ) save_frame = 1; + if( localplayer.have_glider || localplayer.glider_orphan || + localplayer.subsystem == k_player_subsystem_glide ){ + save_glider = 1; + } + if( !save_frame ) return; u16 gamestate_size = 0; if( save_state ){ + /* TODO: have as part of system struct */ gamestate_size = (u32 []){ [k_player_subsystem_walk ] = sizeof(struct player_walk_state), [k_player_subsystem_drive] = 0, [k_player_subsystem_skate] = sizeof(struct player_skate_state), [k_player_subsystem_dead ] = localplayer.ragdoll.part_count * - sizeof(struct replay_rb) + sizeof(struct replay_rb), + [k_player_subsystem_glide] = sizeof(struct replay_rb), }[ localplayer.subsystem ]; } - u16 animator_size = (u16 []){ - [k_player_subsystem_walk ] = sizeof(struct player_walk_animator), - [k_player_subsystem_drive] = 0, - [k_player_subsystem_skate] = sizeof(struct player_skate_animator), - [k_player_subsystem_dead ] = sizeof(struct player_dead_animator) - }[ localplayer.subsystem ]; + u16 animator_size = player_subsystems[localplayer.subsystem]->animator_size; replay_frame *frame = replay_newframe( replay, - animator_size, gamestate_size, 0 ); + animator_size, gamestate_size, + localplayer.local_sfx_buffer_count, + save_glider ); frame->system = localplayer.subsystem; if( save_state ){ @@ -269,6 +309,7 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){ /* permanent block */ memcpy( &gs->rb, &localplayer.rb, sizeof(rigidbody) ); + memcpy( &gs->glider_rb, &player_glide.rb, sizeof(rigidbody) ); memcpy( &gs->cam_control, &localplayer.cam_control, sizeof(struct player_cam_controller) ); v3_copy( localplayer.angles, gs->angles ); @@ -283,13 +324,32 @@ void skaterift_record_frame( replay_buffer *replay, int force_gamestate ){ else if( localplayer.subsystem == k_player_subsystem_dead ){ struct replay_rb *arr = dst; for( u32 i=0; ico, arr[i].co ); v3_copy( rb->w, arr[i].w ); v3_copy( rb->v, arr[i].v ); v4_copy( rb->q, arr[i].q ); } } + else if( localplayer.subsystem == k_player_subsystem_glide ){ + struct replay_rb *arr = dst; + rigidbody *rb = &player_glide.rb; + v3_copy( rb->co, arr[0].co ); + v3_copy( rb->w, arr[0].w ); + v3_copy( rb->v, arr[0].v ); + v4_copy( rb->q, arr[0].q ); + } + } + + if( save_glider ){ + struct replay_glider_data *inf = + replay_frame_data( frame, k_replay_framedata_glider ); + + inf->have_glider = localplayer.have_glider; + inf->glider_orphan = localplayer.glider_orphan; + inf->t = player_glide.t; + v3_copy( player_glide.rb.co, inf->co ); + v4_copy( player_glide.rb.q, inf->q ); } replay->cursor = vg.time; @@ -301,20 +361,28 @@ 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 */ - void *dst = replay_frame_data( frame, k_replay_framedata_animator ); - - if( localplayer.subsystem == k_player_subsystem_walk ) - memcpy( dst, &player_walk.animator, animator_size ); - else if( localplayer.subsystem == k_player_subsystem_skate ) - memcpy( dst, &player_skate.animator, animator_size ); - else if( localplayer.subsystem == k_player_subsystem_dead ){ - memcpy( dst, &player_dead.animator, animator_size ); - } + void *dst = replay_frame_data( frame, k_replay_framedata_animator ), + *src = player_subsystems[localplayer.subsystem]->animator_data; + memcpy( dst, src, animator_size ); + + /* sound effects */ + memcpy( replay_frame_data( frame, k_replay_framedata_sfx ), + localplayer.local_sfx_buffer, + sizeof(struct net_sfx)*localplayer.local_sfx_buffer_count ); + + localplayer.local_sfx_buffer_count = 0; } static @@ -332,12 +400,12 @@ 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; iobj.rb; + rigidbody *rb = &part->rb; v3_copy( arr[i].co, rb->co ); v3_copy( arr[i].w, rb->w ); @@ -346,12 +414,38 @@ void skaterift_restore_frame( replay_frame *frame ){ v3_copy( arr[i].co, part->prev_co ); v4_copy( arr[i].q, part->prev_q ); + rb_update_matrices( rb ); } } + else if( frame->system == k_player_subsystem_glide ){ + struct replay_rb *arr = src; + rigidbody *rb = &player_glide.rb; + v3_copy( arr[0].co, rb->co ); + v3_copy( arr[0].w, rb->w ); + v3_copy( arr[0].v, rb->v ); + v4_copy( arr[0].q, rb->q ); + rb_update_matrices( rb ); + } localplayer.subsystem = frame->system; + /* restore the seperated glider data if we have it */ + if( frame->data_table[ k_replay_framedata_glider ][1] ){ + struct replay_glider_data *inf = + replay_frame_data( frame, k_replay_framedata_glider ); + + localplayer.have_glider = inf->have_glider; + localplayer.glider_orphan = inf->glider_orphan; + player_glide.t = inf->t; + } + else { + localplayer.have_glider = 0; + localplayer.glider_orphan = 0; + player_glide.t = 0.0f; + } + memcpy( &localplayer.rb, &gs->rb, sizeof(rigidbody) ); + memcpy( &player_glide.rb, &gs->glider_rb, sizeof(rigidbody) ); v3_copy( gs->angles, localplayer.angles ); v3_copy( frame->cam_pos, localplayer.cam.pos ); @@ -405,7 +499,10 @@ static void skaterift_replay_pre_update(void){ f64 target = vg_lerp( skaterift.resume_begin, skaterift.resume_target->time, vg_smoothstepf( skaterift.resume_transition ) ); - replay_seek( &skaterift.replay, target ); + if( replay_seek( &skaterift.replay, target ) ) + skaterift.track_velocity = 1.0f; + else + skaterift.track_velocity = 0.0f; } } } @@ -438,7 +535,8 @@ static void skaterift_replay_pre_update(void){ f64 target = skaterift.replay.cursor; target += skaterift.track_velocity * vg.time_frame_delta; - replay_seek( &skaterift.replay, target ); + if( !replay_seek( &skaterift.replay, target ) ) + skaterift.track_velocity = 0.0f; } if( button_down( k_srbind_mback ) ){ @@ -451,41 +549,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,8 +569,10 @@ static void skaterift_replay_update_helpers(void){ } static void skaterift_replay_post_render(void){ +#ifndef SR_ALLOW_REWIND_HUB if( world_static.active_instance != k_world_purpose_client ) return; +#endif /* capture the current resume frame at the very last point */ if( button_down( k_srbind_reset ) ){ @@ -541,19 +607,6 @@ static void skaterift_replay_post_render(void){ } } -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 ); - } -} - static void skaterift_replay_debug_info(void){ player__debugtext( 2, "replay info" ); @@ -567,7 +620,7 @@ static void skaterift_replay_debug_info(void){ player__debugtext( 1, "head @%u | tail @%u\n", head, tail ); if( replay->statehead ){ - for( u32 i=0; i<4; i++ ){ + for( u32 i=0; istatehead->data_table[i][0], replay->statehead->data_table[i][1] );