X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=f790aefc2cd9373e828f0536c39a1f1b2029d9f8;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=64fb65a2055522ca7f3d2d37b6944c14f10a5d45;hpb=8b783ef3705f88f0f67ef6cd8113f79ccb25ec20;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/skaterift.c b/skaterift.c
index 64fb65a..f790aef 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -13,8 +13,11 @@
 
 #if 1
 
-#define SR_NETWORKED
-#define VG_DEVWINDOW
+//#define SR_NETWORKED
+
+#ifndef VG_RELEASE
+ #define VG_DEVWINDOW
+#endif
 
 /* 
  *     system headers
@@ -169,7 +172,7 @@ VG_STATIC void vg_load(void){
    vg_loader_step( load_playermodels, NULL );
   
    /* player setup */
-   u32 bytes = (1024*1024*1)/2;
+   u32 bytes = 1024*1024*10;
    skaterift.replay.data = vg_linear_alloc( vg_mem.rtmemory, bytes );
    skaterift.replay.size = bytes;
    replay_clear( &skaterift.replay );
@@ -282,15 +285,8 @@ VG_STATIC void vg_pre_update(void){
    if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ) 
       target = 0;
 
-   vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * 6.0f );
+   vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
    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_record_replay_frame( &localplayer, &skaterift.replay, 1 );
-      }
-   }
    
    player__pre_update( &localplayer );
    global_skateshop_preupdate();
@@ -365,6 +361,24 @@ VG_STATIC void present_view_with_post_processing(void){
                                      (vg.time_frame_delta*60.0) );
       shader_blitblur_uInverseRatio( inverse );
 
+      inverse[0] -= 0.0001f;
+      inverse[1] -= 0.0001f;
+      shader_blitblur_uClampUv( inverse );
+
+      static f64 effect_time = 133.0;
+      effect_time += vg.time_frame_delta;
+      shader_blitblur_uTime( effect_time );
+
+      f32 glitch_strength = 0.0f;
+      if( skaterift.activity == k_skaterift_replay ){
+         glitch_strength = 0.005f;
+         if( skaterift.replay_control == k_replay_control_play )
+            glitch_strength = 0.005f;
+         else 
+            glitch_strength += 0.005f*skaterift.track_velocity;
+      }
+      shader_blitblur_uGlitchStrength( glitch_strength );
+
       v2f override;
       if( skaterift.activity == k_skaterift_menu )
          v2_muls( (v2f){ 0.04f, 0.001f }, 1.0f-skaterift.time_rate, override );
@@ -400,16 +414,10 @@ VG_STATIC void render_player_transparent(void){
    camera_finalize( &small_cam );
 
    /* Draw player to window buffer and blend background ontop */
-   glBindFramebuffer( GL_FRAMEBUFFER, 0 );
-   glViewport( 0,0, vg.window_x, vg.window_y );
    player__render( &small_cam, &localplayer );
 }
 
 VG_STATIC void render_scene(void){
-   render_fb_bind( gpipeline.fb_main, 1 );
-   glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
-   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
-
    /* Draw world */
    glEnable( GL_DEPTH_TEST );
 
@@ -449,10 +457,7 @@ VG_STATIC void skaterift_composite_maincamera(void){
                 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_get_replay_camera( &skaterift.cam );
    }
 
    skaterift.cam.nearz = 0.1f;
@@ -480,19 +485,51 @@ VG_STATIC void render_main_game(void){
       player__animate_from_replay( &localplayer, &skaterift.replay );
    }
    else
-      player_record_replay_frame( &localplayer, &skaterift.replay, 0 );
+      skaterift_record_frame( &skaterift.replay, 0 );
    player__pre_render( &localplayer );
 
    skaterift_composite_maincamera();
 
-   render_scene();
+   /* --------------------------------------------------------------------- */
 
+   /* variable res target */
+   render_fb_bind( gpipeline.fb_main, 1 );
+   glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
+   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT );
+
+   render_scene();
    glEnable( GL_DEPTH_TEST );
 
-   render_player_transparent();
+   /* full res target */
+   glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+   glViewport( 0,0, vg.window_x, vg.window_y );
+
+   render_player_transparent(); /* needs to read the depth buffer before we fuck
+                                   it up with the oblique rendering inside the
+                                   portals */
+
+   //world_render_challenges( localplayer.viewable_world );
+
+   /* continue with variable rate */
    render_scene_gate_subview();
 
+   /* composite */
    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 );
+         if( skaterift.replay.head ){
+            skaterift.replay.cursor = skaterift.replay.head->time;
+            skaterift.replay.cursor_frame = skaterift.replay.head;
+         }
+         skaterift.replay_control = k_replay_control_scrub;
+      }
+   }
 }
 
 VG_STATIC void vg_render(void){