disable hidden surface removal by default

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index ceae807bf46b4b2efd07296d5b2d92b576459c1b..c834478f02d32aa6a0aba99b9270fc07f0b110d3 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-//static qboolean      r_cache_thrash;         // compatability
-
 entity_render_t        *currentrenderentity;
 
 int                    r_framecount;           // used for dlight push checking
@@ -33,10 +31,6 @@ int                  c_brush_polys, c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_
 
 qboolean       envmap;                         // true during envmap command capture
 
-// LordHavoc: moved all code related to particles into r_part.c
-//int                  particletexture;        // little dot for particles
-//int                  playertextures;         // up to 16 color translated skins
-
 //
 // view origin
 //
@@ -45,9 +39,6 @@ vec3_t        vpn;
 vec3_t vright;
 vec3_t r_origin;
 
-//float        r_world_matrix[16];
-//float        r_base_world_matrix[16];
-
 //
 // screen size info
 //
@@ -57,19 +48,15 @@ mleaf_t             *r_viewleaf, *r_oldviewleaf;
 
 unsigned short d_lightstylevalue[256]; // 8.8 fraction of base light value
 
-//cvar_t       r_norefresh = {0, "r_norefresh","0"};
 cvar_t r_drawentities = {0, "r_drawentities","1"};
 cvar_t r_drawviewmodel = {0, "r_drawviewmodel","1"};
 cvar_t r_speeds = {0, "r_speeds","0"};
 cvar_t r_fullbright = {0, "r_fullbright","0"};
-//cvar_t       r_lightmap = {0, "r_lightmap","0"};
 cvar_t r_wateralpha = {CVAR_SAVE, "r_wateralpha","1"};
 cvar_t r_dynamic = {CVAR_SAVE, "r_dynamic","1"};
 cvar_t r_waterripple = {CVAR_SAVE, "r_waterripple","0"};
 cvar_t r_fullbrights = {CVAR_SAVE, "r_fullbrights", "1"};
 
-//cvar_t       r_dynamicbothsides = {CVAR_SAVE, "r_dynamicbothsides", "1"}; // LordHavoc: can disable dynamic lighting of backfaces, but quake maps are weird so it doesn't always work right...
-
 cvar_t gl_fogenable = {0, "gl_fogenable", "0"};
 cvar_t gl_fogdensity = {0, "gl_fogdensity", "0.25"};
 cvar_t gl_fogred = {0, "gl_fogred","0.3"};
@@ -78,8 +65,7 @@ cvar_t        gl_fogblue = {0, "gl_fogblue","0.3"};
 cvar_t gl_fogstart = {0, "gl_fogstart", "0"};
 cvar_t gl_fogend = {0, "gl_fogend","0"};
 
-cvar_t r_ser = {CVAR_SAVE, "r_ser", "1"};
-//cvar_t       gl_viewmodeldepthhack = {0, "gl_viewmodeldepthhack", "1"};
+cvar_t r_ser = {CVAR_SAVE, "r_ser", "0"};
 
 cvar_t r_multitexture = {0, "r_multitexture", "1"};
 
@@ -98,15 +84,13 @@ static void R_TimeRefresh_f (void)
 
        intimerefresh = 1;
        start = Sys_DoubleTime ();
-       glDrawBuffer (GL_FRONT);
        for (i = 0;i < 128;i++)
        {
                r_refdef.viewangles[0] = 0;
                r_refdef.viewangles[1] = i/128.0*360.0;
                r_refdef.viewangles[2] = 0;
-               R_RenderView();
+               CL_UpdateScreen();
        }
-       glDrawBuffer  (GL_BACK);
 
        stop = Sys_DoubleTime ();
        intimerefresh = 0;
@@ -252,15 +236,12 @@ void GL_Main_Init(void)
        Cvar_RegisterVariable (&r_drawentities);
        Cvar_RegisterVariable (&r_drawviewmodel);
        Cvar_RegisterVariable (&r_speeds);
-//     Cvar_RegisterVariable (&r_dynamicwater);
-//     Cvar_RegisterVariable (&r_dynamicbothsides);
        Cvar_RegisterVariable (&r_fullbrights);
        Cvar_RegisterVariable (&r_wateralpha);
        Cvar_RegisterVariable (&r_dynamic);
        Cvar_RegisterVariable (&r_waterripple);
        Cvar_RegisterVariable (&r_fullbright);
        Cvar_RegisterVariable (&r_ser);
-//     Cvar_RegisterVariable (&gl_viewmodeldepthhack);
        Cvar_RegisterVariable (&r_multitexture);
        if (gamemode == GAME_NEHAHRA)
                Cvar_SetValue("r_fullbrights", 0);
@@ -339,17 +320,13 @@ void GL_Init (void)
        gl_extensions = glGetString (GL_EXTENSIONS);
        Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
 
-//     Con_Printf ("%s %s\n", gl_renderer, gl_version);
-
        VID_CheckExtensions();
 
        // LordHavoc: report supported extensions
        Con_Printf ("\nengine extensions: %s\n", ENGINE_EXTENSIONS);
 
-       glCullFace(GL_FRONT);
-       glEnable(GL_TEXTURE_2D);
-
-//     glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+       qglCullFace(GL_FRONT);
+       qglEnable(GL_TEXTURE_2D);
 }
 
 
@@ -464,18 +441,7 @@ void R_DrawViewModel (void)
 
        R_LerpAnimation(currentrenderentity);
 
-       // hack the depth range to prevent view model from poking into walls
-//     if (gl_viewmodeldepthhack.integer)
-//     {
-//             R_Mesh_Render();
-//             glDepthRange (gldepthmin, gldepthmin + 0.3*(gldepthmax-gldepthmin));
-//     }
        currentrenderentity->model->Draw();
-//     if (gl_viewmodeldepthhack.integer)
-//     {
-//             R_Mesh_Render();
-//             glDepthRange (gldepthmin, gldepthmax);
-//     }
 }
 
 static void R_SetFrustum (void)
@@ -532,8 +498,6 @@ static void R_SetupFrame (void)
        r_oldviewleaf = r_viewleaf;
        r_viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel);
 
-//     r_cache_thrash = false;
-
        R_AnimateLight ();
 }
 
@@ -577,30 +541,6 @@ static void R_BlendView(void)
        tvxyz[2][1] = tvxyz[0][1] + vright[1] * r;
        tvxyz[2][2] = tvxyz[0][2] + vright[2] * r;
        R_Mesh_Draw(&m);
-
-       /*
-       glMatrixMode(GL_PROJECTION);
-       glLoadIdentity ();
-       glOrtho  (0, 1, 1, 0, -99999, 99999);
-       glMatrixMode(GL_MODELVIEW);
-       glLoadIdentity ();
-       glDisable (GL_DEPTH_TEST);
-       glDisable (GL_CULL_FACE);
-       glDisable(GL_TEXTURE_2D);
-       glEnable(GL_BLEND);
-       glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       glBegin (GL_TRIANGLES);
-       glColor4f (r_refdef.viewblend[0] * overbrightscale, r_refdef.viewblend[1] * overbrightscale, r_refdef.viewblend[2] * overbrightscale, r_refdef.viewblend[3]);
-       glVertex2f (-5, -5);
-       glVertex2f (10, -5);
-       glVertex2f (-5, 10);
-       glEnd ();
-
-       glEnable (GL_CULL_FACE);
-       glEnable (GL_DEPTH_TEST);
-       glDisable(GL_BLEND);
-       glEnable(GL_TEXTURE_2D);
-       */
 }
 
 /*
@@ -663,7 +603,6 @@ void R_RenderView (void)
 
        R_DrawSurfaces(SHADERSTAGE_SKY);
        R_DrawSurfaces(SHADERSTAGE_NORMAL);
-       R_DrawSurfaces(SHADERSTAGE_FOG);
        R_TimeReport("surfdraw");
 
        if (r_drawportals.integer)
@@ -704,7 +643,5 @@ void R_RenderView (void)
        // render any queued meshs
        R_Mesh_Finish();
        R_TimeReport("meshfinish");
-
-       //Mem_CheckSentinelsGlobal();
-       //R_TimeReport("memtest");
 }
+