qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2025-02-16 16:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restructured the fog code and took volfog out of experimental; r_volfog 1 may or may not work, without GL accel I cannot test it. Apparently, It may at very least have problems with voodoo1.

Browse source
This commit is contained in:
Eric Windisch 2000-02-29 05:51:29 +00:00
parent 5d66aa274c
commit b53e2c9edd
1 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
common/gl_rmain.c
View file

@ -103,15 +103,9 @@ cvar_t *r_novis;
cvar_t *r_netgraph; cvar_t *r_netgraph;
#endif #endif
// All the fog code was disabled for QuakeWold
// _reduced_ visability shouldn't be considered cheating :)
cvar_t *r_fog; cvar_t *r_fog;
cvar_t *r_volfog; cvar_t *r_volfog;
// Waterwarp should be completely disabled for release
// since we are too lazy to actually fix it ;)
cvar_t *r_waterwarp; cvar_t *r_waterwarp;
cvar_t *r_waterripple; cvar_t *r_waterripple;
cvar_t *gl_finish; cvar_t *gl_finish;
@ -123,6 +117,7 @@ cvar_t *gl_affinemodels;
cvar_t *gl_polyblend; cvar_t *gl_polyblend;
cvar_t *gl_playermip; cvar_t *gl_playermip;
cvar_t *gl_nocolors; cvar_t *gl_nocolors;
cvar_t *gl_keeptjunctions; cvar_t *gl_keeptjunctions;
cvar_t *gl_doubleeyes; cvar_t *gl_doubleeyes;
@ -981,7 +976,6 @@ R_Clear ( void ) {
gldepthmax = 1; gldepthmax = 1;
glDepthFunc (GL_LEQUAL); glDepthFunc (GL_LEQUAL);
} }
glDepthRange (gldepthmin, gldepthmax); glDepthRange (gldepthmin, gldepthmax);
} }
@ -1051,28 +1045,26 @@ R_RenderView ( void ) {
// render normal view // render normal view
#ifdef _EXPERIMENTAL_ /*** Render Volumetric Fog ***/
/*
// Fixme!!
// The volume fog will not work as is :)
if(r_volfog->value) if(r_volfog->value)
{ {
R_RenderScene ();
gl_Clear(GL_STENCIL_BUFFER_BIT); R_DrawViewModel ();
gl_ColorMask(GL_FALSE);
glClear(GL_STENCIL_BUFFER_BIT);
//glColorMask(GL_FALSE);
glStencilFunc(GL_ALWAYS, 1, 1); glStencilFunc(GL_ALWAYS, 1, 1);
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
//glEnable(GL_STENCIL_TEST); //glEnable(GL_STENCIL_TEST);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
gl_DepthFunc(GL_LESS); glDepthFunc(GL_LESS);
glFogi (GL_FOG_MODE, GL_EXP2); glFogi (GL_FOG_MODE, GL_EXP2);
glFogfv (GL_FOG_COLOR, colors); glFogfv (GL_FOG_COLOR, colors);
// fixme: GL_FOG_DENSITY should have r_volfog_density var // fixme: GL_FOG_DENSITY should have r_volfog_density var
glFogf (GL_FOG_DENSITY, 1); glFogf (GL_FOG_DENSITY, 1);
glEnable(GL_FOG); glEnable(GL_FOG);
//R_RenderScene ();
R_DrawWaterSurfaces(); R_DrawWaterSurfaces();
glDisable(GL_FOG); glDisable(GL_FOG);
@ -1080,23 +1072,31 @@ R_RenderView ( void ) {
glStencilMask(GL_FALSE); glStencilMask(GL_FALSE);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
} }
*/
#endif
if (r_fog->value) { // FIXME: would be nice if the user could select what fogmode... (r_fog_mode) /*** Depth fog code ***/
else if (r_fog->value)
{ // FIXME: would be nice if the user could select what fogmode... (r_fog_mode)
glFogi (GL_FOG_MODE, GL_EXP2); glFogi (GL_FOG_MODE, GL_EXP2);
glFogfv (GL_FOG_COLOR, colors); glFogfv (GL_FOG_COLOR, colors);
glFogf (GL_FOG_DENSITY, (GLfloat) r_fog->value); glFogf (GL_FOG_DENSITY, (GLfloat) r_fog->value);
glEnable(GL_FOG); glEnable(GL_FOG);
}
R_RenderScene (); R_RenderScene ();
R_DrawViewModel (); R_DrawViewModel ();
if(!r_volfog->value) {
R_DrawWaterSurfaces (); R_DrawWaterSurfaces ();
}
glDisable(GL_FOG); // More fog right here :) glDisable(GL_FOG);
}
/*** Regular rendering code ***/
else
{
R_RenderScene ();
R_DrawViewModel ();
R_DrawWaterSurfaces ();
}
R_PolyBlend (); R_PolyBlend ();