fixed r_drawentities 0 which was forgetting to enlarge the farclip based on the world...

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index c6e6ce2e7222df2c40d5de7ea4ffba5999907478..3ccc5a77e3928341b1a1279ec62b9a323ba0725a 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -21,51 +21,52 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
 
 #include "quakedef.h"
 

-entity_render_t        *currentrenderentity;
+entity_render_t *currentrenderentity;

 
 

-int                    r_framecount;           // used for dlight push checking
+// used for dlight push checking and other things
+int r_framecount;

 
 

-mplane_t       frustum[4];
+mplane_t frustum[4];

 
 

-int                    c_brush_polys, c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
+int c_brush_polys, c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;

 
 

-qboolean       envmap;                         // true during envmap command capture
+// true during envmap command capture
+qboolean envmap;
+
+float r_farclip;

 
 

-//

 // view origin
 // view origin

-//
-vec3_t vup;
-vec3_t vpn;
-vec3_t vright;
-vec3_t r_origin;
+vec3_t r_origin;
+vec3_t vpn;
+vec3_t vright;
+vec3_t vup;

 
 //
 // screen size info
 //
 
 //
 // screen size info
 //

-refdef_t       r_refdef;
-
-mleaf_t                *r_viewleaf, *r_oldviewleaf;
-
-unsigned short d_lightstylevalue[256]; // 8.8 fraction of base light value
-
-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_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 gl_fogenable = {0, "gl_fogenable", "0"};
-cvar_t gl_fogdensity = {0, "gl_fogdensity", "0.25"};
-cvar_t gl_fogred = {0, "gl_fogred","0.3"};
-cvar_t gl_foggreen = {0, "gl_foggreen","0.3"};
-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", "0"};
+refdef_t r_refdef;
+
+mleaf_t *r_viewleaf, *r_oldviewleaf;
+
+// 8.8 fraction of base light value
+unsigned short d_lightstylevalue[256];
+
+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_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 gl_fogenable = {0, "gl_fogenable", "0"};
+cvar_t gl_fogdensity = {0, "gl_fogdensity", "0.25"};
+cvar_t gl_fogred = {0, "gl_fogred","0.3"};
+cvar_t gl_foggreen = {0, "gl_foggreen","0.3"};
+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_multitexture = {0, "r_multitexture", "1"};
 
 
 cvar_t r_multitexture = {0, "r_multitexture", "1"};
 


@@ -79,8 +80,8 @@ For program optimization
 qboolean intimerefresh = 0;
 static void R_TimeRefresh_f (void)
 {
 qboolean intimerefresh = 0;
 static void R_TimeRefresh_f (void)
 {

-       int                     i;
-       float           start, stop, time;
+       int i;
+       float start, stop, time;

 
        intimerefresh = 1;
        start = Sys_DoubleTime ();
 
        intimerefresh = 1;
        start = Sys_DoubleTime ();


@@ -241,13 +242,49 @@ void GL_Main_Init(void)
        Cvar_RegisterVariable (&r_dynamic);
        Cvar_RegisterVariable (&r_waterripple);
        Cvar_RegisterVariable (&r_fullbright);
        Cvar_RegisterVariable (&r_dynamic);
        Cvar_RegisterVariable (&r_waterripple);
        Cvar_RegisterVariable (&r_fullbright);

-       Cvar_RegisterVariable (&r_ser);

        Cvar_RegisterVariable (&r_multitexture);
        if (gamemode == GAME_NEHAHRA)
                Cvar_SetValue("r_fullbrights", 0);
        R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
 }
 
        Cvar_RegisterVariable (&r_multitexture);
        if (gamemode == GAME_NEHAHRA)
                Cvar_SetValue("r_fullbrights", 0);
        R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
 }
 

+vec3_t r_farclip_origin;
+vec3_t r_farclip_direction;
+vec_t r_farclip_directiondist;
+vec_t r_farclip_meshfarclip;
+int r_farclip_directionbit0;
+int r_farclip_directionbit1;
+int r_farclip_directionbit2;
+
+// start a farclip measuring session
+void R_FarClip_Start(vec3_t origin, vec3_t direction, vec_t startfarclip)
+{
+       VectorCopy(origin, r_farclip_origin);
+       VectorCopy(direction, r_farclip_direction);
+       r_farclip_directiondist = DotProduct(r_farclip_origin, r_farclip_direction);
+       r_farclip_directionbit0 = r_farclip_direction[0] < 0;
+       r_farclip_directionbit1 = r_farclip_direction[1] < 0;
+       r_farclip_directionbit2 = r_farclip_direction[2] < 0;
+       r_farclip_meshfarclip = r_farclip_directiondist + startfarclip;
+}
+
+// enlarge farclip to accomodate box
+void R_FarClip_Box(vec3_t mins, vec3_t maxs)
+{
+       float d;
+       d = (r_farclip_directionbit0 ? mins[0] : maxs[0]) * r_farclip_direction[0]
+         + (r_farclip_directionbit1 ? mins[1] : maxs[1]) * r_farclip_direction[1]
+         + (r_farclip_directionbit2 ? mins[2] : maxs[2]) * r_farclip_direction[2];
+       if (r_farclip_meshfarclip < d)
+               r_farclip_meshfarclip = d;
+}
+
+// return farclip value
+float R_FarClip_Finish(void)
+{
+       return r_farclip_meshfarclip - r_farclip_directiondist;
+}
+

 /*
 ===============
 R_NewMap
 /*
 ===============
 R_NewMap


@@ -256,15 +293,17 @@ R_NewMap
 void CL_ParseEntityLump(char *entitystring);
 void R_NewMap (void)
 {
 void CL_ParseEntityLump(char *entitystring);
 void R_NewMap (void)
 {

-       int             i;
+       int i;

 
 

-       for (i=0 ; i<256 ; i++)
+       for (i = 0;i < 256;i++)

                d_lightstylevalue[i] = 264;             // normal light value
 
        r_viewleaf = NULL;
        if (cl.worldmodel->entities)
                CL_ParseEntityLump(cl.worldmodel->entities);
        R_Modules_NewMap();
                d_lightstylevalue[i] = 264;             // normal light value
 
        r_viewleaf = NULL;
        if (cl.worldmodel->entities)
                CL_ParseEntityLump(cl.worldmodel->entities);
        R_Modules_NewMap();

+
+       r_farclip = 64.0f;

 }
 
 extern void R_Textures_Init(void);
 }
 
 extern void R_Textures_Init(void);


@@ -278,7 +317,6 @@ extern void R_Crosshairs_Init(void);
 extern void R_Light_Init(void);
 extern void R_Particles_Init(void);
 extern void R_Explosion_Init(void);
 extern void R_Light_Init(void);
 extern void R_Particles_Init(void);
 extern void R_Explosion_Init(void);

-extern void R_Clip_Init(void);

 extern void ui_init(void);
 extern void gl_backend_init(void);
 
 extern void ui_init(void);
 extern void gl_backend_init(void);
 


@@ -288,7 +326,6 @@ void Render_Init(void)
        R_Textures_Init();
        Mod_RenderInit();
        gl_backend_init();
        R_Textures_Init();
        Mod_RenderInit();
        gl_backend_init();

-       R_Clip_Init();

        GL_Draw_Init();
        GL_Main_Init();
        GL_Models_Init();
        GL_Draw_Init();
        GL_Main_Init();
        GL_Models_Init();


@@ -310,16 +347,6 @@ GL_Init
 extern char *ENGINE_EXTENSIONS;
 void GL_Init (void)
 {
 extern char *ENGINE_EXTENSIONS;
 void GL_Init (void)
 {

-       gl_vendor = glGetString (GL_VENDOR);
-       Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
-       gl_renderer = glGetString (GL_RENDERER);
-       Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
-       gl_version = glGetString (GL_VERSION);
-       Con_Printf ("GL_VERSION: %s\n", gl_version);
-       gl_extensions = glGetString (GL_EXTENSIONS);
-       Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-

        VID_CheckExtensions();
 
        // LordHavoc: report supported extensions
        VID_CheckExtensions();
 
        // LordHavoc: report supported extensions


@@ -332,15 +359,12 @@ void GL_Init (void)
 
 //==================================================================================
 
 
 //==================================================================================
 

-void R_Entity_Callback(void *data, void *junk)
-{
-       ((entity_render_t *)data)->visframe = r_framecount;
-}
-

 static void R_MarkEntities (void)
 {
 static void R_MarkEntities (void)
 {

-       int             i;
-       vec3_t  v;
+       int i;
+       vec3_t v;
+
+       R_FarClip_Box(cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);

 
        if (!r_drawentities.integer)
                return;
 
        if (!r_drawentities.integer)
                return;


@@ -383,21 +407,21 @@ static void R_MarkEntities (void)
                        continue;
 
                R_LerpAnimation(currentrenderentity);
                        continue;
 
                R_LerpAnimation(currentrenderentity);

-               if (r_ser.integer)
-                       currentrenderentity->model->SERAddEntity();
-               else
-                       currentrenderentity->visframe = r_framecount;
+               currentrenderentity->visframe = r_framecount;
+
+               R_FarClip_Box(currentrenderentity->mins, currentrenderentity->maxs);

        }
 }
 
 // only used if skyrendermasked, and normally returns false
 int R_DrawBModelSky (void)
 {
        }
 }
 
 // only used if skyrendermasked, and normally returns false
 int R_DrawBModelSky (void)
 {

-       int             i, sky = false;
+       int i, sky;

 
        if (!r_drawentities.integer)
                return false;
 
 
        if (!r_drawentities.integer)
                return false;
 

+       sky = false;

        for (i = 0;i < r_refdef.numentities;i++)
        {
                currentrenderentity = r_refdef.entities[i];
        for (i = 0;i < r_refdef.numentities;i++)
        {
                currentrenderentity = r_refdef.entities[i];


@@ -412,7 +436,7 @@ int R_DrawBModelSky (void)
 
 void R_DrawModels (void)
 {
 
 void R_DrawModels (void)
 {

-       int             i;
+       int i;

 
        if (!r_drawentities.integer)
                return;
 
        if (!r_drawentities.integer)
                return;


@@ -446,7 +470,7 @@ void R_DrawViewModel (void)
 
 static void R_SetFrustum (void)
 {
 
 static void R_SetFrustum (void)
 {

-       int             i;
+       int i;

 
        // LordHavoc: note to all quake engine coders, the special case for 90
        // degrees assumed a square view (wrong), so I removed it, Quake2 has it
 
        // LordHavoc: note to all quake engine coders, the special case for 90
        // degrees assumed a square view (wrong), so I removed it, Quake2 has it


@@ -460,8 +484,7 @@ static void R_SetFrustum (void)
        // rotate VPN down by FOV_X/2 degrees
        RotatePointAroundVector( frustum[3].normal, vright, vpn, -( 90 - r_refdef.fov_y / 2 ) );
 
        // rotate VPN down by FOV_X/2 degrees
        RotatePointAroundVector( frustum[3].normal, vright, vpn, -( 90 - r_refdef.fov_y / 2 ) );
 

-
-       for (i=0 ; i<4 ; i++)
+       for (i = 0;i < 4;i++)

        {
                frustum[i].type = PLANE_ANYZ;
                frustum[i].dist = DotProduct (r_origin, frustum[i].normal);
        {
                frustum[i].type = PLANE_ANYZ;
                frustum[i].dist = DotProduct (r_origin, frustum[i].normal);


@@ -515,7 +538,7 @@ static void R_BlendView(void)
        memset(&m, 0, sizeof(m));
        m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        memset(&m, 0, sizeof(m));
        m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;

-       m.blendfunc2 = GL_ONE;
+       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;

        m.depthdisable = true; // magic
        m.numtriangles = 1;
        m.numverts = 3;
        m.depthdisable = true; // magic
        m.numtriangles = 1;
        m.numverts = 3;


@@ -560,11 +583,9 @@ void R_RenderView (void)
        R_SetFrustum();
        R_SetupFog();
        R_SkyStartFrame();
        R_SetFrustum();
        R_SetupFog();
        R_SkyStartFrame();

-       if (r_ser.integer)
-               R_Clip_StartFrame();

        R_BuildLightList();
 
        R_BuildLightList();
 

-       R_Mesh_Start();
+       R_FarClip_Start(r_origin, vpn, 768.0f);

 
        R_TimeReport("setup");
 
 
        R_TimeReport("setup");
 


@@ -574,15 +595,13 @@ void R_RenderView (void)
        R_MarkEntities();
        R_TimeReport("markentity");
 
        R_MarkEntities();
        R_TimeReport("markentity");
 

-       if (r_ser.integer)
-       {
-               R_Clip_EndFrame();
-               R_TimeReport("hiddensurf");
-       }
-

        R_MarkWorldLights();
        R_TimeReport("marklights");
 
        R_MarkWorldLights();
        R_TimeReport("marklights");
 

+       r_farclip = R_FarClip_Finish() + 256.0f;
+
+       R_Mesh_Start(r_farclip);
+

        if (skyrendermasked)
        {
                if (R_DrawBModelSky())
        if (skyrendermasked)
        {
                if (R_DrawBModelSky())


@@ -637,6 +656,9 @@ void R_RenderView (void)
        R_BlendView();
        R_TimeReport("blendview");
 
        R_BlendView();
        R_TimeReport("blendview");
 

+       R_DrawCrosshair();
+       R_TimeReport("crosshair");
+

        // render any queued meshs
        R_Mesh_Finish();
        R_TimeReport("meshfinish");
        // render any queued meshs
        R_Mesh_Finish();
        R_TimeReport("meshfinish");