projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render fix, menu
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index 742bd5905150399a50ecf64a30843647938fa890..acb0a2e7af66df6ada950ee5a0df795c011eaf7b 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-353,7
+353,6
@@
VG_STATIC void render_main_game(void)
render_scene();
render_scene();
- if( menu.active ) menu_render_bg();
glEnable( GL_DEPTH_TEST );
render_player_transparent();
glEnable( GL_DEPTH_TEST );
render_player_transparent();
@@
-361,8
+360,10
@@
VG_STATIC void render_main_game(void)
present_view_with_post_processing();
present_view_with_post_processing();
- if( menu.active ) menu_render_fg();
-
+ if( menu.active ){
+ glClear( GL_DEPTH_BUFFER_BIT );
+ menu_render();
+ }
/* =========== End Frame =========== */
}
/* =========== End Frame =========== */
}
@@
-377,6
+378,7
@@
VG_STATIC void vg_render(void)
glViewport( 0,0, vg.window_x, vg.window_y );
glDisable( GL_DEPTH_TEST );
glViewport( 0,0, vg.window_x, vg.window_y );
glDisable( GL_DEPTH_TEST );
+ glDisable( GL_BLEND );
glClearColor( 1.0f, 0.0f, 0.0f, 0.0f );
glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );
glClearColor( 1.0f, 0.0f, 0.0f, 0.0f );
glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT );