qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup the r_fog/r_volfog/r_wateralpha code a little, removing the #if 0ed code

This commit is contained in:
Bill Currie 2000-04-25 04:08:12 +00:00
parent 98e7670d66
commit 9fd7079be9
1 changed files with 26 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
common/gl_rmain.c
View File

@ -1066,39 +1066,7 @@ R_RenderView ( void ) {
R_Clear ();
// render normal view
/*** Render Volumetric Fog ***/
#if 0
if(r_volfog->value)
{
R_RenderScene ();
R_DrawViewModel ();
glClear(GL_STENCIL_BUFFER_BIT);
//glColorMask(GL_FALSE);
glStencilFunc(GL_ALWAYS, 1, 1);
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
//glEnable(GL_STENCIL_TEST);
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LESS);
glFogi (GL_FOG_MODE, GL_EXP2);
glFogfv (GL_FOG_COLOR, colors);
// fixme: GL_FOG_DENSITY should have r_volfog_density var
glFogf (GL_FOG_DENSITY, r_volfog->value);
glEnable(GL_FOG);
R_DrawWaterSurfaces();
glDisable(GL_FOG);
glStencilFunc(GL_EQUAL, 1, 1);
glStencilMask(GL_FALSE);
glDisable(GL_DEPTH_TEST);
}
/*** Depth fog code ***/
else if (r_fog->value)
{ // FIXME: would be nice if the user could select what fogmode... (r_fog_mode)
if (r_fog->value) {
glFogi (GL_FOG_MODE, GL_EXP2);
glFogfv (GL_FOG_COLOR, colors);
glFogf (GL_FOG_DENSITY, (GLfloat) r_fog->value);
@ -1108,31 +1076,15 @@ R_RenderView ( void ) {
// glFogf (GL_FOG_END, 1500.0);
// glFogf (GL_FOG_DENSITY, 0.2);
glEnable (GL_FOG);
R_RenderScene ();
R_DrawViewModel ();
R_DrawWaterSurfaces ();
glDisable(GL_FOG);
}
/*** Regular rendering code ***/
else
#endif
{
if (r_fog->value) {
glFogi (GL_FOG_MODE, GL_EXP2);
glFogfv (GL_FOG_COLOR, colors);
glFogf (GL_FOG_DENSITY, (GLfloat) r_fog->value);
glEnable (GL_FOG);
}
R_RenderScene ();
R_DrawViewModel ();
if (r_wateralpha->value<1.0 || r_volfog->value) {
glClear(GL_STENCIL_BUFFER_BIT);
//glColorMask(GL_FALSE);
glStencilFunc(GL_ALWAYS, 1, 1);
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
//glEnable(GL_STENCIL_TEST);
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LESS);
}
@ -1151,7 +1103,6 @@ else
glStencilMask(GL_FALSE);
glDisable(GL_DEPTH_TEST);
}
}
R_PolyBlend ();