-#ifndef PLAYER_REPLAY_C
-#define PLAYER_REPLAY_C
-
+#include "skaterift.h"
+#include "player.h"
#include "player_replay.h"
#include "input.h"
#include "gui.h"
#include "freecam.h"
-static void replay_clear( replay_buffer *replay ){
+#include "player_walk.h"
+#include "player_skate.h"
+#include "player_dead.h"
+#include "player_glide.h"
+
+struct replay_globals player_replay;
+
+void replay_clear( replay_buffer *replay )
+{
replay->head = NULL;
replay->tail = NULL;
replay->cursor_frame = NULL;
replay->cursor = -99999.9;
}
-static
-void * replay_frame_data( replay_frame *frame, enum replay_framedata type ){
+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; i<k_replay_framedata_rows; i++ ){
data_table[i][0] = total;
total += vg_align8(data_table[i][1]);
static replay_frame *replay_newframe( replay_buffer *replay,
u16 animator_size,
u16 gamestate_size,
- u16 sfx_count ){
- u16 data_table[4][2];
+ u16 sfx_count,
+ bool save_glider ){
+ u16 data_table[ k_replay_framedata_rows ][2];
data_table[ k_replay_framedata_animator ][1] = animator_size;
data_table[ k_replay_framedata_gamestate ][1] = gamestate_size;
data_table[ k_replay_framedata_sfx ][1] = sfx_count*sizeof(struct net_sfx);
sizeof( replay_gamestate );
}
+ data_table[ k_replay_framedata_glider ][1] = 0;
+ if( save_glider ){
+ data_table[ k_replay_framedata_glider ][1] =
+ sizeof(struct replay_glider_data);
+ }
+
u32 nextsize = replay_frame_calculate_data_offsets( data_table );
replay_frame *frame = NULL;
else
frame = replay->data;
- for( u32 i=0; i<4; i++ ){
+ for( u32 i=0; i<k_replay_framedata_rows; i++ ){
frame->data_table[i][0] = data_table[i][0];
frame->data_table[i][1] = data_table[i][1];
}
}
}
-static int replay_seek( replay_buffer *replay, f64 t ){
+int replay_seek( replay_buffer *replay, f64 t )
+{
if( !replay->head ) return 0;
- assert( replay->tail );
if( t < replay->tail->time ) t = replay->tail->time;
if( t > replay->head->time ) t = replay->head->time;
return 0;
}
-static replay_frame *replay_find_recent_stateframe( replay_buffer *replay ){
+replay_frame *replay_find_recent_stateframe( replay_buffer *replay )
+{
replay_frame *frame = replay->cursor_frame;
u32 i=4096;
while( i --> 0 ){
return NULL;
}
-static f32 replay_subframe_time( replay_buffer *replay ){
+f32 replay_subframe_time( replay_buffer *replay )
+{
replay_frame *frame = replay->cursor_frame;
if( !frame ) return 0.0f;
replay_frame *next = frame->r;
return 0.0f;
}
-static void replay_get_frame_camera( replay_frame *frame, camera *cam ){
+void replay_get_frame_camera( replay_frame *frame, vg_camera *cam )
+{
cam->fov = frame->cam_fov;
v3_copy( frame->cam_pos, cam->pos );
v3_copy( frame->cam_angles, cam->angles );
}
-static void replay_get_camera( replay_buffer *replay, camera *cam ){
+void replay_get_camera( replay_buffer *replay, vg_camera *cam )
+{
cam->nearz = 0.1f;
cam->farz = 100.0f;
if( replay->cursor_frame ){
replay_frame *next = replay->cursor_frame->r;
if( next ){
- camera temp;
+ vg_camera temp;
replay_get_frame_camera( replay->cursor_frame, cam );
replay_get_frame_camera( next, &temp );
- camera_lerp( cam, &temp, replay_subframe_time( replay ), cam );
+ vg_camera_lerp( cam, &temp, replay_subframe_time( replay ), cam );
}
else {
replay_get_frame_camera( replay->cursor_frame, cam );
v4f q;
};
-static void skaterift_record_frame( replay_buffer *replay,
- int force_gamestate ){
+void skaterift_record_frame( replay_buffer *replay, int force_gamestate )
+{
f64 delta = 9999999.9,
statedelta = 9999999.9;
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;
[k_player_subsystem_skate] = sizeof(struct player_skate_state),
[k_player_subsystem_dead ] = localplayer.ragdoll.part_count *
sizeof(struct replay_rb),
- [k_player_subsystem_glide] = 0,
+ [k_player_subsystem_glide] = sizeof(struct replay_rb),
}[ localplayer.subsystem ];
}
replay_frame *frame = replay_newframe( replay,
animator_size, gamestate_size,
- localplayer.local_sfx_buffer_count );
+ localplayer.local_sfx_buffer_count,
+ save_glider );
frame->system = localplayer.subsystem;
if( save_state ){
replay_gamestate *gs =
replay_frame_data( frame, k_replay_framedata_internal_gamestate );
+ gs->current_run_version = world_static.current_run_version;
+
/* 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 );
- gs->have_glider = localplayer.have_glider;
void *dst = replay_frame_data( frame, k_replay_framedata_gamestate );
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;
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 );
- }
- else if( localplayer.subsystem == k_player_subsystem_glide ){
- memcpy( dst, &player_glide.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 ),
replay_frame_data( frame, k_replay_framedata_internal_gamestate );
void *src = replay_frame_data( frame, k_replay_framedata_gamestate );
u16 src_size = frame->data_table[ k_replay_framedata_gamestate ][1];
- assert( src_size );
+ world_static.current_run_version = gs->current_run_version;
if(frame->system == k_player_subsystem_walk ){
memcpy( &player_walk.state, src, src_size );
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;
- localplayer.have_glider = gs->have_glider;
+
+ /* 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 );
/* 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;
+ player_replay.local.statehead = frame;
+ player_replay.local.head = frame;
+ player_replay.local.cursor_frame = frame;
+ player_replay.local.cursor = frame->time;
+ player_replay.replay_control = k_replay_control_scrub;
skaterift.activity = k_skaterift_default;
vg.time = frame->time;
}
static void skaterift_replay_resume(void){
- replay_frame *prev = replay_find_recent_stateframe(&skaterift.replay);
+ replay_frame *prev = replay_find_recent_stateframe(&player_replay.local);
if( prev ){
- skaterift.replay_control = k_replay_control_resume;
- skaterift.resume_target = prev;
- skaterift.resume_begin = skaterift.replay.cursor;
- skaterift.resume_transition = 0.0f;
+ player_replay.replay_control = k_replay_control_resume;
+ player_replay.resume_target = prev;
+ player_replay.resume_begin = player_replay.local.cursor;
+ player_replay.resume_transition = 0.0f;
}
gui_helper_clear();
static void skaterift_replay_update_helpers(void);
-static void skaterift_replay_pre_update(void){
+void skaterift_replay_pre_update(void)
+{
if( skaterift.activity != k_skaterift_replay ) return;
- 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 );
+ if( player_replay.replay_control == k_replay_control_resume )
+ {
+ if( player_replay.local.cursor_frame == player_replay.resume_target ||
+ player_replay.local.cursor_frame == NULL )
+ {
+ skaterift_restore_frame( player_replay.resume_target );
}
- else {
- vg_slewf( &skaterift.resume_transition, 1.0f,
+ else
+ {
+ vg_slewf( &player_replay.resume_transition, 1.0f,
vg.time_frame_delta * (1.0f/1.0f) );
- if( skaterift.resume_transition >= 1.0f )
- skaterift_restore_frame( skaterift.resume_target );
+ if( player_replay.resume_transition >= 1.0f )
+ skaterift_restore_frame( player_replay.resume_target );
else {
- f64 target = vg_lerp( skaterift.resume_begin,
- skaterift.resume_target->time,
- vg_smoothstepf( skaterift.resume_transition ) );
- if( replay_seek( &skaterift.replay, target ) )
- skaterift.track_velocity = 1.0f;
+ f64 target = vg_lerp( player_replay.resume_begin,
+ player_replay.resume_target->time,
+ vg_smoothstepf( player_replay.resume_transition ) );
+ if( replay_seek( &player_replay.local, target ) )
+ player_replay.track_velocity = 1.0f;
else
- skaterift.track_velocity = 0.0f;
+ player_replay.track_velocity = 0.0f;
}
}
}
else {
if( button_down( k_srbind_replay_play ) )
- skaterift.replay_control = k_replay_control_play;
+ player_replay.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 );
+ player_replay.freecam = player_replay.freecam ^ 0x1;
+ if( player_replay.freecam )
+ replay_get_camera( &player_replay.local,
+ &player_replay.replay_freecam );
skaterift_replay_update_helpers();
}
target_speed += -2.0;
if( fabsf(target_speed) > 0.01f )
- skaterift.replay_control = k_replay_control_scrub;
+ player_replay.replay_control = k_replay_control_scrub;
- if( skaterift.replay_control == k_replay_control_play )
+ if( player_replay.replay_control == k_replay_control_play )
target_speed = 1.0;
- vg_slewf( &skaterift.track_velocity, target_speed,
+ vg_slewf( &player_replay.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( fabsf( player_replay.track_velocity ) > 0.0001f )
+ {
+ f64 target = player_replay.local.cursor;
+ target += player_replay.track_velocity * vg.time_frame_delta;
- if( !replay_seek( &skaterift.replay, target ) )
- skaterift.track_velocity = 0.0f;
+ if( !replay_seek( &player_replay.local, target ) )
+ player_replay.track_velocity = 0.0f;
}
- if( button_down( k_srbind_mback ) ){
- if( skaterift.replay.statehead )
- skaterift_restore_frame( skaterift.replay.statehead );
+ if( button_down( k_srbind_mback ) )
+ {
+ if( player_replay.local.statehead )
+ skaterift_restore_frame( player_replay.local.statehead );
else
skaterift.activity = k_skaterift_default;
srinput.state = k_input_state_resume;
gui_helper_clear();
}
- if( skaterift.freecam ){
+ if( player_replay.freecam ){
//freecam_preupdate();
}
else {
}
static void skaterift_replay_update_helpers(void){
- skaterift.helper_resume->greyed = skaterift.freecam;
+ player_replay.helper_resume->greyed = player_replay.freecam;
vg_str freecam_text;
- vg_strnull( &freecam_text, skaterift.helper_freecam->text,
+ vg_strnull( &freecam_text, player_replay.helper_freecam->text,
GUI_HELPER_TEXT_LENGTH );
- vg_strcat( &freecam_text, skaterift.freecam? "exit freecam": "freecam" );
+ vg_strcat( &freecam_text, player_replay.freecam? "exit freecam": "freecam" );
}
-static void skaterift_replay_post_render(void){
+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 ) ){
- if( skaterift.activity == k_skaterift_default ){
+ 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 ){
- skaterift.replay.cursor = skaterift.replay.head->time;
- skaterift.replay.cursor_frame = skaterift.replay.head;
+ skaterift_record_frame( &player_replay.local, 1 );
+ if( player_replay.local.head )
+ {
+ player_replay.local.cursor = player_replay.local.head->time;
+ player_replay.local.cursor_frame = player_replay.local.head;
}
- skaterift.replay_control = k_replay_control_scrub;
+ player_replay.replay_control = k_replay_control_scrub;
gui_helper_clear();
vg_str text;
if( gui_new_helper( input_axis_list[k_sraxis_replay_h], &text ) )
vg_strcat( &text, "scrub" );
- if( (skaterift.helper_resume = gui_new_helper(
+ if( (player_replay.helper_resume = gui_new_helper(
input_button_list[k_srbind_replay_resume], &text )) )
vg_strcat( &text, "resume" );
if( gui_new_helper( input_button_list[k_srbind_replay_play], &text ))
vg_strcat( &text, "playback" );
- skaterift.helper_freecam = gui_new_helper(
+ player_replay.helper_freecam = gui_new_helper(
input_button_list[k_srbind_replay_freecam], &text );
skaterift_replay_update_helpers();
}
}
-#if 0
-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 );
- }
-}
-#endif
-
-static void skaterift_replay_debug_info(void){
+void skaterift_replay_debug_info(void)
+{
player__debugtext( 2, "replay info" );
-
- replay_buffer *replay = &skaterift.replay;
+ replay_buffer *replay = &player_replay.local;
u32 head = 0,
tail = 0;
player__debugtext( 1, "head @%u | tail @%u\n", head, tail );
if( replay->statehead ){
- for( u32 i=0; i<4; i++ ){
+ for( u32 i=0; i<k_replay_framedata_rows; i++ ){
player__debugtext( 1, "[%u]: [%hu, %hu]\n", i,
replay->statehead->data_table[i][0],
replay->statehead->data_table[i][1] );
player__debugtext( 1, "cursor: %.2fs / %.2fs\n", cur, len );
}
-static void skaterift_replay_imgui(void){
+void skaterift_replay_imgui(void)
+{
if( skaterift.activity != k_skaterift_replay ) return;
- replay_buffer *replay = &skaterift.replay;
+ replay_buffer *replay = &player_replay.local;
f64 start = replay->cursor,
end = replay->cursor;
if( replay->tail ) start = replay->tail->time;
ui_text( bar, buffer, 1, k_ui_align_middle_left, 0 );
ui_text( bar, "0s", 1, k_ui_align_middle_right, 0 );
}
-
-#endif /* PLAYER_REPLAY_C */
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff