X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skaterift.c;h=5f2f7066a3d6ca9475031c1d87535fb40626b52b;hb=5b06975b35952497d771db4171c7454123edfea1;hp=de702d78b974a5c52a95b75be745b5e5d48dc0d8;hpb=191bf91146eb7e3ac15fb18de6e7267d1cd686af;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skaterift.c b/skaterift.c index de702d7..5f2f706 100644 --- a/skaterift.c +++ b/skaterift.c @@ -96,7 +96,7 @@ VG_STATIC void vg_load(void) /* 'systems' are completely loaded now */ strcpy( world.world_name, "maps/mp_mtzero.mdl" ); - //strcpy( world.world_name, "maps/mp_gridmap.mdl" ); + strcpy( world.world_name, "maps/mp_gridmap.mdl" ); world_load(); vg_console_load_autos(); } @@ -158,29 +158,41 @@ VG_STATIC void present_view_with_post_processing(void) glBlendFunc(GL_ONE_MINUS_DST_ALPHA, GL_DST_ALPHA); glBlendEquation(GL_FUNC_ADD); - shader_blitblur_use(); - shader_blitblur_uTexMain( 0 ); - shader_blitblur_uTexMotion( 1 ); - shader_blitblur_uBlurStrength( cl_blur_strength / (vg.frame_delta*60.0f) ); - - v2f menu_blurring; - v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring ); - shader_blitblur_uOverrideDir( menu_blurring ); - - if( cl_view_id == 0 ) - render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); - else if( cl_view_id == 1 ) - render_fb_bind_texture( gpipeline.fb_main, 1, 0 ); + if( cl_blur ) + { + shader_blitblur_use(); + shader_blitblur_uTexMain( 0 ); + shader_blitblur_uTexMotion( 1 ); + shader_blitblur_uBlurStrength(cl_blur_strength / (vg.frame_delta*60.0f)); + + v2f menu_blurring; + v2_muls( (v2f){ 0.04f, 0.001f }, menu_opacity, menu_blurring ); + shader_blitblur_uOverrideDir( menu_blurring ); + + if( cl_view_id == 0 ) + render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); + else if( cl_view_id == 1 ) + render_fb_bind_texture( gpipeline.fb_main, 1, 0 ); + else + render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); + + render_fb_bind_texture( gpipeline.fb_main, 1, 1 ); + } else + { + shader_blit_use(); + shader_blit_uTexMain( 0 ); render_fb_bind_texture( gpipeline.fb_main, 0, 0 ); + } - render_fb_bind_texture( gpipeline.fb_main, 1, 1 ); render_fsquad(); } VG_STATIC void render_player_transparent(void) { - camera small_cam; + static camera small_cam; /* DOES NOT NEED TO BE STATIC BUT MINGW + SAIS OTHERWISE */ + m4x3_copy( main_camera.transform, small_cam.transform ); small_cam.fov = main_camera.fov;