X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=skaterift.c;h=20b686b282b3719c5ac0a9771fa4420040f6d878;hb=cba8a468e166156dd8cab3358da369b1df76eb8b;hp=8df2f8a098ef0a6f93f67cda440154cd10483696;hpb=2dd61c7f0185ec525658ca398801f46e6adccf23;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 8df2f8a..20b686b 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -284,15 +284,10 @@ VG_STATIC void vg_pre_update(void){
 
    vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * 6.0f );
    vg.time_rate = vg_smoothstepf( skaterift.time_rate );
-
-   if( button_down( k_srbind_reset ) ){
-      if( skaterift.activity == k_skaterift_default ){
-         skaterift.activity = k_skaterift_replay;
-      }
-   }
    
    player__pre_update( &localplayer );
    global_skateshop_preupdate();
+   skaterift_replay_pre_update();
 
    world_update( world_current_instance(), localplayer.rb.co );
    audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
@@ -446,6 +441,13 @@ VG_STATIC void skaterift_composite_maincamera(void){
    camera_lerp( &localplayer.cam, &global_skateshop.cam, 
                 vg_smoothstepf(global_skateshop.factive), &skaterift.cam );
 
+   if( skaterift.activity == k_skaterift_replay ){
+      camera temp;
+      replay_get_camera( &skaterift.replay, &temp );
+      camera_lerp( &skaterift.cam, &temp, 1.0f-skaterift.time_rate,
+                   &skaterift.cam );
+   }
+
    skaterift.cam.nearz = 0.1f;
    skaterift.cam.farz  = 2100.0f;
 
@@ -466,7 +468,14 @@ VG_STATIC void skaterift_composite_maincamera(void){
 }
 
 VG_STATIC void render_main_game(void){
+   player__animate( &localplayer );
+   if( skaterift.activity == k_skaterift_replay ){
+      player__animate_from_replay( &localplayer, &skaterift.replay );
+   }
+   else
+      skaterift_record_frame( &skaterift.replay, 0 );
    player__pre_render( &localplayer );
+
    skaterift_composite_maincamera();
 
    render_scene();
@@ -477,6 +486,14 @@ VG_STATIC void render_main_game(void){
    render_scene_gate_subview();
 
    present_view_with_post_processing();
+
+   /* capture the current resume frame at the very last point */
+   if( button_down( k_srbind_reset ) ){
+      if( skaterift.activity == k_skaterift_default ){
+         skaterift.activity = k_skaterift_replay;
+         skaterift_record_frame( &skaterift.replay, 1 );
+      }
+   }
 }
 
 VG_STATIC void vg_render(void){
@@ -517,7 +534,7 @@ VG_STATIC void vg_gui(void){
    player__im_gui( &localplayer );
    world_instance *world = world_current_instance();
 
-   replay_imgui( &localplayer );
+   skaterift_replay_imgui();
    workshop_form_gui();
    render_view_framebuffer_ui();
 }