X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=f790aefc2cd9373e828f0536c39a1f1b2029d9f8;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=fa9459ca3557dbe235f965d72d713906ec7a369c;hpb=3901e08513eb75b706b26aa51acfa20f80c1f81a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index fa9459c..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 @@ -411,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 ); @@ -460,7 +457,7 @@ VG_STATIC void skaterift_composite_maincamera(void){ vg_smoothstepf(global_skateshop.factive), &skaterift.cam ); if( skaterift.activity == k_skaterift_replay ){ - replay_get_camera( &skaterift.replay, &skaterift.cam ); + skaterift_get_replay_camera( &skaterift.cam ); } skaterift.cam.nearz = 0.1f; @@ -493,15 +490,34 @@ VG_STATIC void render_main_game(void){ 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 ){