]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rmain.c
view.c, cl_parse.c, cl_main.c, gl_rmain.c - trying to remove all uses of origin,...
[xonotic/darkplaces.git] / gl_rmain.c
index 6e24c18335e2cdde148ee909d8989ffa4a4bf493..6c7432050f96407e4920550dde6bbe006bc52926 100644 (file)
@@ -51,13 +51,14 @@ unsigned short d_lightstylevalue[256];
 
 cvar_t r_drawentities = {0, "r_drawentities","1"};
 cvar_t r_drawviewmodel = {0, "r_drawviewmodel","1"};
-cvar_t r_shadows = {CVAR_SAVE, "r_shadows", "1"};
-cvar_t r_staticworldlights = {0, "r_staticworldlights", "0"};
+cvar_t r_shadows = {CVAR_SAVE, "r_shadows", "0"};
+cvar_t r_shadow_staticworldlights = {0, "r_shadow_staticworldlights", "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_fullbrights = {CVAR_SAVE, "r_fullbrights", "1"};
+cvar_t r_shadow_cull = {0, "r_shadow_cull", "1"};
 
 cvar_t gl_fogenable = {0, "gl_fogenable", "0"};
 cvar_t gl_fogdensity = {0, "gl_fogdensity", "0.25"};
@@ -221,14 +222,15 @@ void GL_Main_Init(void)
        Cvar_RegisterVariable (&r_drawentities);
        Cvar_RegisterVariable (&r_drawviewmodel);
        Cvar_RegisterVariable (&r_shadows);
-       Cvar_RegisterVariable (&r_staticworldlights);
+       Cvar_RegisterVariable (&r_shadow_staticworldlights);
        Cvar_RegisterVariable (&r_speeds);
        Cvar_RegisterVariable (&r_fullbrights);
        Cvar_RegisterVariable (&r_wateralpha);
        Cvar_RegisterVariable (&r_dynamic);
        Cvar_RegisterVariable (&r_fullbright);
        Cvar_RegisterVariable (&r_textureunits);
-       if (gamemode == GAME_NEHAHRA)
+       Cvar_RegisterVariable (&r_shadow_cull);
+       if (gamemode == GAME_NEHAHRA || gamemode == GAME_NEXIUZ)
                Cvar_SetValue("r_fullbrights", 0);
        R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
 }
@@ -381,6 +383,8 @@ int PVS_CullBox(const vec3_t mins, const vec3_t maxs)
 {
        int stackpos, sides;
        mnode_t *node, *stack[4096];
+       if (cl.worldmodel == NULL)
+               return false;
        stackpos = 0;
        stack[stackpos++] = cl.worldmodel->nodes;
        while (stackpos)
@@ -403,6 +407,36 @@ int PVS_CullBox(const vec3_t mins, const vec3_t maxs)
        return true;
 }
 
+int VIS_CullBox(const vec3_t mins, const vec3_t maxs)
+{
+       int stackpos, sides;
+       mnode_t *node, *stack[4096];
+       if (R_CullBox(mins, maxs))
+               return true;
+       if (cl.worldmodel == NULL)
+               return false;
+       stackpos = 0;
+       stack[stackpos++] = cl.worldmodel->nodes;
+       while (stackpos)
+       {
+               node = stack[--stackpos];
+               if (node->contents < 0)
+               {
+                       if (((mleaf_t *)node)->visframe == r_framecount)
+                               return false;
+               }
+               else
+               {
+                       sides = BoxOnPlaneSide(mins, maxs, node->plane);
+                       if (sides & 2 && stackpos < 4096)
+                               stack[stackpos++] = node->children[1];
+                       if (sides & 1 && stackpos < 4096)
+                               stack[stackpos++] = node->children[0];
+               }
+       }
+       return true;
+}
+
 int R_CullSphere(const vec3_t origin, vec_t radius)
 {
        return (DotProduct(frustum[0].normal, origin) + radius < frustum[0].dist
@@ -416,6 +450,8 @@ int PVS_CullSphere(const vec3_t origin, vec_t radius)
        int stackpos;
        mnode_t *node, *stack[4096];
        float dist;
+       if (cl.worldmodel == NULL)
+               return false;
        stackpos = 0;
        stack[stackpos++] = cl.worldmodel->nodes;
        while (stackpos)
@@ -438,13 +474,43 @@ int PVS_CullSphere(const vec3_t origin, vec_t radius)
        return true;
 }
 
+int VIS_CullSphere(const vec3_t origin, vec_t radius)
+{
+       int stackpos;
+       mnode_t *node, *stack[4096];
+       float dist;
+       if (R_CullSphere(origin, radius))
+               return true;
+       if (cl.worldmodel == NULL)
+               return false;
+       stackpos = 0;
+       stack[stackpos++] = cl.worldmodel->nodes;
+       while (stackpos)
+       {
+               node = stack[--stackpos];
+               if (node->contents < 0)
+               {
+                       if (((mleaf_t *)node)->visframe == r_framecount)
+                               return false;
+               }
+               else
+               {
+                       dist = PlaneDiff(origin, node->plane);
+                       if (dist <= radius)
+                               stack[stackpos++] = node->children[1];
+                       if (dist >= -radius)
+                               stack[stackpos++] = node->children[0];
+               }
+       }
+       return true;
+}
+
 
 //==================================================================================
 
 static void R_MarkEntities (void)
 {
        int i;
-       vec3_t v;
        entity_render_t *ent;
 
        ent = &cl_entities[0].render;
@@ -461,32 +527,15 @@ static void R_MarkEntities (void)
        {
                ent = r_refdef.entities[i];
                Mod_CheckLoaded(ent->model);
-
-               // move view-relative models to where they should be
-               if (ent->flags & RENDER_VIEWMODEL)
-               {
-                       // remove flag so it will not be repeated incase RelinkEntities is not called again for a while
-                       ent->flags -= RENDER_VIEWMODEL;
-                       // transform origin
-                       VectorCopy(ent->origin, v);
-                       ent->origin[0] = v[0] * vpn[0] + v[1] * vright[0] + v[2] * vup[0] + r_origin[0];
-                       ent->origin[1] = v[0] * vpn[1] + v[1] * vright[1] + v[2] * vup[1] + r_origin[1];
-                       ent->origin[2] = v[0] * vpn[2] + v[1] * vright[2] + v[2] * vup[2] + r_origin[2];
-                       // adjust angles
-                       VectorAdd(ent->angles, r_refdef.viewangles, ent->angles);
-               }
-
-               VectorCopy(ent->angles, v);
-               if (!ent->model || ent->model->type != mod_brush)
-                       v[0] = -v[0];
-               Matrix4x4_CreateFromQuakeEntity(&ent->matrix, ent->origin[0], ent->origin[1], ent->origin[2], v[0], v[1], v[2], ent->scale);
-               Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix);
+               // some of the renderer still relies on origin...
+               Matrix4x4_OriginFromMatrix(&ent->matrix, ent->origin);
+               // some of the renderer still relies on scale...
+               ent->scale = Matrix4x4_ScaleFromMatrix(&ent->matrix);
                R_LerpAnimation(ent);
                R_UpdateEntLights(ent);
-               if (!R_CullSphere(ent->origin, ent->model->radius * ent->scale)
-                && !PVS_CullSphere(ent->origin, ent->model->radius * ent->scale)
-                && !R_CullBox(ent->mins, ent->maxs)
-                && !PVS_CullBox(ent->mins, ent->maxs))
+               if ((chase_active.integer || !(ent->flags & RENDER_EXTERIORMODEL))
+                && !VIS_CullSphere(ent->origin, (ent->model != NULL ? ent->model->radius : 16) * ent->scale)
+                && !VIS_CullBox(ent->mins, ent->maxs))
                {
                        ent->visframe = r_framecount;
                        R_FarClip_Box(ent->mins, ent->maxs);
@@ -521,6 +570,7 @@ int R_DrawBrushModelsSky (void)
 R_DrawViewModel
 =============
 */
+/*
 void R_DrawViewModel (void)
 {
        entity_render_t *ent;
@@ -537,6 +587,7 @@ void R_DrawViewModel (void)
        R_UpdateEntLights(ent);
        ent->model->Draw(ent);
 }
+*/
 
 void R_DrawNoModel(entity_render_t *ent);
 void R_DrawModels ()
@@ -547,7 +598,6 @@ void R_DrawModels ()
        if (!r_drawentities.integer)
                return;
 
-       R_DrawViewModel();
        for (i = 0;i < r_refdef.numentities;i++)
        {
                ent = r_refdef.entities[i];
@@ -575,218 +625,335 @@ void R_DrawFakeShadows (void)
        for (i = 0;i < r_refdef.numentities;i++)
        {
                ent = r_refdef.entities[i];
-               if (ent->model && ent->model->DrawFakeShadow)
+               if ((ent->flags & RENDER_SHADOW) && ent->model && ent->model->DrawFakeShadow)
                        ent->model->DrawFakeShadow(ent);
        }
 }
 
 #include "r_shadow.h"
 
-void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float lightradius)
+int shadowframecount = 0;
+
+int Light_CullBox(const vec3_t mins, const vec3_t maxs)
 {
-       int i;
-       vec3_t p, p2, temp, relativelightorigin;
-       float dist, projectdistance;
-       // rough checks
-       if (ent->model && ent->model->DrawShadowVolume)
+       int stackpos, sides;
+       mnode_t *node, *stack[4096];
+       if (cl.worldmodel == NULL)
+               return false;
+       stackpos = 0;
+       stack[stackpos++] = cl.worldmodel->nodes;
+       while (stackpos)
        {
-               temp[0] = bound(ent->mins[0], lightorigin[0], ent->maxs[0]) - lightorigin[0];
-               temp[1] = bound(ent->mins[1], lightorigin[1], ent->maxs[1]) - lightorigin[1];
-               temp[2] = bound(ent->mins[2], lightorigin[2], ent->maxs[2]) - lightorigin[2];
-               dist = DotProduct(temp, temp);
-               if (dist < lightradius * lightradius)
+               node = stack[--stackpos];
+               if (node->contents < 0)
                {
-                       projectdistance = lightradius - sqrt(dist);
-                       {
-#if 0
-                       int d0, d1, d2, d3;
-                       // calculate projected bounding box and decide if it is on-screen
-                       d0 = false;
-                       d1 = false;
-                       d2 = false;
-                       d3 = false;
-                       for (i = 0;i < 8;i++)
-                       {
-                               p[0] = i & 1 ? ent->maxs[0] : ent->mins[0];
-                               p[1] = i & 2 ? ent->maxs[1] : ent->mins[1];
-                               p[2] = i & 4 ? ent->maxs[2] : ent->mins[2];
-                               VectorSubtract(p, lightorigin, temp);
-                               dist = projectdistance / sqrt(DotProduct(temp, temp));
-                               VectorMA(p, dist, temp, p2);
-                               if (!d0 && (DotProduct(p , frustum[0].normal) < frustum[0].dist || DotProduct(p2, frustum[0].normal) < frustum[0].dist))
-                                       d0 = true;
-                               if (!d1 && (DotProduct(p , frustum[1].normal) < frustum[1].dist || DotProduct(p2, frustum[1].normal) < frustum[1].dist))
-                                       d1 = true;
-                               if (!d2 && (DotProduct(p , frustum[2].normal) < frustum[2].dist || DotProduct(p2, frustum[2].normal) < frustum[2].dist))
-                                       d2 = true;
-                               if (!d3 && (DotProduct(p , frustum[3].normal) < frustum[3].dist || DotProduct(p2, frustum[3].normal) < frustum[3].dist))
-                                       d3 = true;
-                       }
-                       if (d0 && d1 && d2 && d3)
-#else
-                       vec3_t mins, maxs;
-                       // calculate projected bounding box and decide if it is on-screen
-                       VectorCopy(ent->mins, mins);
-                       VectorCopy(ent->maxs, maxs);
-                       for (i = 0;i < 8;i++)
-                       {
-                               p[0] = i & 1 ? ent->maxs[0] : ent->mins[0];
-                               p[1] = i & 2 ? ent->maxs[1] : ent->mins[1];
-                               p[2] = i & 4 ? ent->maxs[2] : ent->mins[2];
-                               VectorSubtract(p, lightorigin, temp);
-                               dist = projectdistance / sqrt(DotProduct(temp, temp));
-                               VectorMA(p, dist, temp, p2);
-                               if (mins[0] > p2[0]) mins[0] = p2[0];if (maxs[0] < p2[0]) maxs[0] = p2[0];
-                               if (mins[1] > p2[1]) mins[1] = p2[1];if (maxs[1] < p2[1]) maxs[1] = p2[1];
-                               if (mins[2] > p2[2]) mins[2] = p2[2];if (maxs[2] < p2[2]) maxs[2] = p2[2];
-                       }
-                       if (!R_CullBox(mins, maxs))
-#endif
-                       {
-                               Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin);
-                               ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius);
-                       }
-                       }
+                       if (((mleaf_t *)node)->worldnodeframe == shadowframecount)
+                               return false;
+               }
+               else
+               {
+                       sides = BoxOnPlaneSide(mins, maxs, node->plane);
+                       if (sides & 2 && stackpos < 4096)
+                               stack[stackpos++] = node->children[1];
+                       if (sides & 1 && stackpos < 4096)
+                               stack[stackpos++] = node->children[0];
                }
        }
+       return true;
 }
 
-void R_DrawWorldLightShadowVolume(mlight_t *sl)
+int LightAndVis_CullBox(const vec3_t mins, const vec3_t maxs)
 {
-       shadowmesh_t *mesh;
-       R_Mesh_Matrix(&cl_entities[0].render.matrix);
-       for (mesh = sl->shadowvolume;mesh;mesh = mesh->next)
+       int stackpos, sides;
+       mnode_t *node, *stack[4096];
+       if (R_CullBox(mins, maxs))
+               return true;
+       if (cl.worldmodel == NULL)
+               return false;
+       stackpos = 0;
+       stack[stackpos++] = cl.worldmodel->nodes;
+       while (stackpos)
        {
-               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-               R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
+               node = stack[--stackpos];
+               if (node->contents < 0)
+               {
+                       if (((mleaf_t *)node)->visframe == r_framecount && ((mleaf_t *)node)->worldnodeframe == shadowframecount)
+                               return false;
+               }
+               else
+               {
+                       sides = BoxOnPlaneSide(mins, maxs, node->plane);
+                       if (sides & 2 && stackpos < 4096)
+                               stack[stackpos++] = node->children[1];
+                       if (sides & 1 && stackpos < 4096)
+                               stack[stackpos++] = node->children[0];
+               }
        }
+       return true;
 }
 
-#define SHADOWSPHERE_SEGMENTS 16
-
-shadowmesh_t *shadowsphere;
-void R_CreateShadowSphere(void)
+int LightAndVis_CullPointCloud(int numpoints, const float *points)
 {
-       int i, j;
-       vec3_t angles, angles2, angles3, angles4;
-       float verts[12];
-       shadowsphere = Mod_ShadowMesh_Begin(zonemempool);
-       for (i = 0;i < SHADOWSPHERE_SEGMENTS / 2;i++)
+       int i;
+       const float *p;
+       int stackpos, sides;
+       mnode_t *node, *stack[4096];
+       //if (R_CullBox(mins, maxs))
+       //      return true;
+       if (cl.worldmodel == NULL)
+               return false;
+       stackpos = 0;
+       stack[stackpos++] = cl.worldmodel->nodes;
+       while (stackpos)
        {
-               for (j = 0;j < SHADOWSPHERE_SEGMENTS;j++)
+               node = stack[--stackpos];
+               if (node->contents < 0)
                {
-                       angles[0] = (i * 360.0f / SHADOWSPHERE_SEGMENTS) + 90.0f;
-                       angles[1] = j * 360.0f / SHADOWSPHERE_SEGMENTS;
-                       angles[2] = 0;
-                       VectorCopy(angles, angles2);
-                       VectorCopy(angles, angles3);
-                       VectorCopy(angles, angles4);
-                       angles2[1] += 360.0f / SHADOWSPHERE_SEGMENTS;
-                       angles3[0] += 360.0f / SHADOWSPHERE_SEGMENTS;
-                       angles3[1] += 360.0f / SHADOWSPHERE_SEGMENTS;
-                       angles4[0] += 360.0f / SHADOWSPHERE_SEGMENTS;
-                       AngleVectorsFLU(angles, verts, NULL, NULL);
-                       AngleVectorsFLU(angles2, verts + 9, NULL, NULL);
-                       AngleVectorsFLU(angles3, verts + 6, NULL, NULL);
-                       AngleVectorsFLU(angles4, verts + 3, NULL, NULL);
-                       VectorScale(&verts[0], 1.0f, &verts[0]);
-                       VectorScale(&verts[3], 1.0f, &verts[3]);
-                       VectorScale(&verts[6], 1.0f, &verts[6]);
-                       VectorScale(&verts[9], 1.0f, &verts[9]);
-                       Mod_ShadowMesh_AddPolygon(zonemempool, shadowsphere, 4, verts);
+                       if (((mleaf_t *)node)->visframe == r_framecount && ((mleaf_t *)node)->worldnodeframe == shadowframecount)
+                               return false;
+               }
+               else
+               {
+                       sides = 0;
+                       for (i = 0, p = points;i < numpoints && sides != 3;i++, p += 3)
+                       {
+                               if (DotProduct(p, node->plane->normal) < node->plane->dist)
+                                       sides |= 1;
+                               else
+                                       sides |= 2;
+                       }
+                       if (sides & 2 && stackpos < 4096)
+                               stack[stackpos++] = node->children[1];
+                       if (sides & 1 && stackpos < 4096)
+                               stack[stackpos++] = node->children[0];
                }
        }
-       shadowsphere = Mod_ShadowMesh_Finish(zonemempool, shadowsphere);
+       return true;
 }
 
 
-void R_DrawShadowSphere(vec3_t origin, float cullradius, float lightradius)
+void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float cullradius, float lightradius, vec3_t lightmins, vec3_t lightmaxs, vec3_t clipmins, vec3_t clipmaxs)
 {
-       shadowmesh_t *mesh;
-       matrix4x4_t matrix;
-       if (!shadowsphere)
-               R_CreateShadowSphere();
-       Matrix4x4_CreateScale(&matrix, lightradius);
-       Matrix4x4_ConcatTranslate(&matrix, origin[0], origin[1], origin[2]);
-       R_Mesh_Matrix(&matrix);
-       for (mesh = shadowsphere;mesh;mesh = mesh->next)
+       vec3_t relativelightorigin;
+       #if 0
+       int i;
+       vec3_t temp;
+       float dist, projectdistance;
+       float points[16][3];
+       #endif
+       // rough checks
+       if (!(ent->flags & RENDER_SHADOW) || ent->model == NULL || ent->model->DrawShadowVolume == NULL)
+               return;
+       if (r_shadow_cull.integer)
        {
-               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-               R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
+               if (ent->maxs[0] < lightmins[0] || ent->mins[0] > lightmaxs[0]
+                || ent->maxs[1] < lightmins[1] || ent->mins[1] > lightmaxs[1]
+                || ent->maxs[2] < lightmins[2] || ent->mins[2] > lightmaxs[2]
+                || Light_CullBox(ent->mins, ent->maxs))
+                       return;
        }
-       Matrix4x4_CreateScale(&matrix, -cullradius);
-       Matrix4x4_ConcatTranslate(&matrix, origin[0], origin[1], origin[2]);
-       R_Mesh_Matrix(&matrix);
-       for (mesh = shadowsphere;mesh;mesh = mesh->next)
+       #if 0
+       if (r_shadow_cull.integer)
        {
-               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-               R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
+               projectdistance = cullradius;
+               // calculate projected bounding box and decide if it is on-screen
+               for (i = 0;i < 8;i++)
+               {
+                       temp[0] = i & 1 ? ent->model->normalmaxs[0] : ent->model->normalmins[0];
+                       temp[1] = i & 2 ? ent->model->normalmaxs[1] : ent->model->normalmins[1];
+                       temp[2] = i & 4 ? ent->model->normalmaxs[2] : ent->model->normalmins[2];
+                       Matrix4x4_Transform(&ent->matrix, temp, points[i]);
+                       VectorSubtract(points[i], lightorigin, temp);
+                       dist = projectdistance / sqrt(DotProduct(temp, temp));
+                       VectorMA(points[i], dist, temp, points[i+8]);
+               }
+               if (LightAndVis_CullPointCloud(16, points[0]))
+                       return;
+               /*
+               for (i = 0;i < 8;i++)
+               {
+                       p2[0] = i & 1 ? ent->model->normalmaxs[0] : ent->model->normalmins[0];
+                       p2[1] = i & 2 ? ent->model->normalmaxs[1] : ent->model->normalmins[1];
+                       p2[2] = i & 4 ? ent->model->normalmaxs[2] : ent->model->normalmins[2];
+                       Matrix4x4_Transform(&ent->matrix, p2, p);
+                       VectorSubtract(p, lightorigin, temp);
+                       dist = projectdistance / sqrt(DotProduct(temp, temp));
+                       VectorMA(p, dist, temp, p2);
+                       if (i)
+                       {
+                               if (mins[0] > p[0]) mins[0] = p[0];if (maxs[0] < p[0]) maxs[0] = p[0];
+                               if (mins[1] > p[1]) mins[1] = p[1];if (maxs[1] < p[1]) maxs[1] = p[1];
+                               if (mins[2] > p[2]) mins[2] = p[2];if (maxs[2] < p[2]) maxs[2] = p[2];
+                       }
+                       else
+                       {
+                               VectorCopy(p, mins);
+                               VectorCopy(p, maxs);
+                       }
+                       if (mins[0] > p2[0]) mins[0] = p2[0];if (maxs[0] < p2[0]) maxs[0] = p2[0];
+                       if (mins[1] > p2[1]) mins[1] = p2[1];if (maxs[1] < p2[1]) maxs[1] = p2[1];
+                       if (mins[2] > p2[2]) mins[2] = p2[2];if (maxs[2] < p2[2]) maxs[2] = p2[2];
+               }
+               if (mins[0] >= clipmaxs[0] || maxs[0] <= clipmins[0]
+                || mins[1] >= clipmaxs[1] || maxs[1] <= clipmins[1]
+                || mins[2] >= clipmaxs[2] || maxs[2] <= clipmins[2]
+                || LightAndVis_CullBox(mins, maxs))
+                       return;
+               */
        }
+       #endif
+       Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin);
+       ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius);
 }
 
+void R_Shadow_DrawWorldLightShadowVolume(matrix4x4_t *matrix, worldlight_t *light);
+
+extern void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, msurface_t **surflist, int numsurfaces, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz);
 void R_ShadowVolumeLighting (int visiblevolumes)
 {
        int i;
        entity_render_t *ent;
        int lnum;
        float f, lightradius, cullradius;
-       vec3_t relativelightorigin, relativeeyeorigin, lightcolor;
-       mlight_t *sl;
+       vec3_t relativelightorigin, relativeeyeorigin, lightcolor, clipmins, clipmaxs;
+       worldlight_t *wl;
        rdlight_t *rd;
        rmeshstate_t m;
+       mleaf_t *leaf;
+       matrix4x4_t matrix;
+       matrix4x4_t matrix_worldtofilter, matrix_worldtoattenuationxyz, matrix_worldtoattenuationz;
+       matrix4x4_t matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz;
 
        if (visiblevolumes)
        {
                memset(&m, 0, sizeof(m));
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ONE;
+               if (r_shadow_realtime.integer >= 3)
+                       m.depthdisable = true;
                R_Mesh_State(&m);
+               qglDisable(GL_CULL_FACE);
                GL_Color(0.0 * r_colorscale, 0.0125 * r_colorscale, 0.1 * r_colorscale, 1);
        }
        else
                R_Shadow_Stage_Begin();
-       for (lnum = 0, sl = cl.worldmodel->lights;lnum < cl.worldmodel->numlights;lnum++, sl++)
+       shadowframecount++;
+       for (lnum = 0, wl = r_shadow_worldlightchain;wl;wl = wl->next, lnum++)
        {
-               if (d_lightstylevalue[sl->style] <= 0)
+               if (d_lightstylevalue[wl->style] <= 0)
                        continue;
-               if (r_light_debuglight.integer >= 0 && lnum != r_light_debuglight.integer)
+               if (R_CullBox(wl->mins, wl->maxs))
+               //if (R_CullSphere(wl->origin, cullradius))
                        continue;
-               cullradius = sl->cullradius;
-               lightradius = sl->lightradius;
-               if (R_CullBox(sl->mins, sl->maxs) || PVS_CullBox(sl->mins, sl->maxs) || R_CullSphere(sl->origin, cullradius) || PVS_CullSphere(sl->origin, cullradius))
+               //if (R_CullBox(wl->mins, wl->maxs) || R_CullSphere(wl->origin, lightradius))
+               //      continue;
+               //if (VIS_CullBox(wl->mins, wl->maxs) || VIS_CullSphere(wl->origin, lightradius))
+               //      continue;
+               if (r_shadow_debuglight.integer >= 0 && lnum != r_shadow_debuglight.integer)
                        continue;
 
-               f = d_lightstylevalue[sl->style] * (1.0f / 32768.0f);
-               VectorScale(sl->light, f, lightcolor);
+               cullradius = wl->cullradius;
+               lightradius = wl->lightradius;
 
-               if (!visiblevolumes)
-                       R_Shadow_Stage_ShadowVolumes();
-               R_DrawShadowSphere(sl->origin, cullradius, lightradius * 2);
-               if (sl->shadowvolume && r_staticworldlights.integer)
-                       R_DrawWorldLightShadowVolume(sl);
-               else
-                       R_TestAndDrawShadowVolume(&cl_entities[0].render, sl->origin, cullradius);
-               if (r_drawentities.integer)
+               if (cl.worldmodel != NULL)
                {
-                       for (i = 0;i < r_refdef.numentities;i++)
+                       for (i = 0;i < wl->numleafs;i++)
+                               if (wl->leafs[i]->visframe == r_framecount)
+                                       break;
+                       if (i == wl->numleafs)
+                               continue;
+                       leaf = wl->leafs[i++];
+                       VectorCopy(leaf->mins, clipmins);
+                       VectorCopy(leaf->maxs, clipmaxs);
+                       for (;i < wl->numleafs;i++)
                        {
-                               ent = r_refdef.entities[i];
-                               if (ent->maxs[0] >= sl->mins[0] && ent->mins[0] <= sl->maxs[0]
-                                && ent->maxs[1] >= sl->mins[1] && ent->mins[1] <= sl->maxs[1]
-                                && ent->maxs[2] >= sl->mins[2] && ent->mins[2] <= sl->maxs[2])
-                                       R_TestAndDrawShadowVolume(r_refdef.entities[i], sl->origin, cullradius);
+                               leaf = wl->leafs[i];
+                               if (leaf->visframe == r_framecount)
+                               {
+                                       if (clipmins[0] > leaf->mins[0]) clipmins[0] = leaf->mins[0];
+                                       if (clipmaxs[0] < leaf->maxs[0]) clipmaxs[0] = leaf->maxs[0];
+                                       if (clipmins[1] > leaf->mins[1]) clipmins[1] = leaf->mins[1];
+                                       if (clipmaxs[1] < leaf->maxs[1]) clipmaxs[1] = leaf->maxs[1];
+                                       if (clipmins[2] > leaf->mins[2]) clipmins[2] = leaf->mins[2];
+                                       if (clipmaxs[2] < leaf->maxs[2]) clipmaxs[2] = leaf->maxs[2];
+                               }
                        }
+                       if (clipmins[0] < wl->mins[0]) clipmins[0] = wl->mins[0];
+                       if (clipmaxs[0] > wl->maxs[0]) clipmaxs[0] = wl->maxs[0];
+                       if (clipmins[1] < wl->mins[1]) clipmins[1] = wl->mins[1];
+                       if (clipmaxs[1] > wl->maxs[1]) clipmaxs[1] = wl->maxs[1];
+                       if (clipmins[2] < wl->mins[2]) clipmins[2] = wl->mins[2];
+                       if (clipmaxs[2] > wl->maxs[2]) clipmaxs[2] = wl->maxs[2];
+               }
+               else
+               {
+                       VectorCopy(wl->mins, clipmins);
+                       VectorCopy(wl->maxs, clipmaxs);
+               }
+
+               //if (R_Shadow_ScissorForBBoxAndSphere(clipmins, clipmaxs, wl->origin, wl->cullradius))
+               if (R_CullBox(clipmins, clipmaxs) || R_Shadow_ScissorForBBox(clipmins, clipmaxs))
+                       continue;
+
+               // mark the leafs we care about so only things in those leafs will matter
+               if (cl.worldmodel != NULL)
+                       for (i = 0;i < wl->numleafs;i++)
+                               wl->leafs[i]->worldnodeframe = shadowframecount;
+
+               f = d_lightstylevalue[wl->style] * (1.0f / 256.0f);
+               VectorScale(wl->light, f, lightcolor);
+               if (wl->selected)
+               {
+                       f = 2 + sin(realtime * M_PI * 4.0);
+                       VectorScale(lightcolor, f, lightcolor);
+               }
+
+               if (wl->castshadows)
+               {
+                       if (!visiblevolumes)
+                               R_Shadow_Stage_ShadowVolumes();
+                       ent = &cl_entities[0].render;
+                       if (wl->shadowvolume && r_shadow_staticworldlights.integer)
+                               R_Shadow_DrawWorldLightShadowVolume(&ent->matrix, wl);
+                       else
+                               R_TestAndDrawShadowVolume(ent, wl->origin, cullradius, lightradius, wl->mins, wl->maxs, clipmins, clipmaxs);
+                       if (r_drawentities.integer)
+                               for (i = 0;i < r_refdef.numentities;i++)
+                                       R_TestAndDrawShadowVolume(r_refdef.entities[i], wl->origin, cullradius, lightradius, wl->mins, wl->maxs, clipmins, clipmaxs);
                }
 
                if (!visiblevolumes)
                {
-                       R_Shadow_Stage_Light();
+                       if (wl->castshadows)
+                               R_Shadow_Stage_LightWithShadows();
+                       else
+                               R_Shadow_Stage_LightWithoutShadows();
+
+                       // calculate world to filter matrix
+                       Matrix4x4_CreateFromQuakeEntity(&matrix, wl->origin[0], wl->origin[1], wl->origin[2], wl->angles[0], wl->angles[1], wl->angles[2], lightradius);
+                       Matrix4x4_Invert_Simple(&matrix_worldtofilter, &matrix);
+                       // calculate world to attenuationxyz/xy matrix
+                       Matrix4x4_CreateFromQuakeEntity(&matrix, 0.5, 0.5, 0.5, 0, 0, 0, 0.5);
+                       Matrix4x4_Concat(&matrix_worldtoattenuationxyz, &matrix, &matrix_worldtofilter);
+                       // calculate world to attenuationz matrix
+                       matrix.m[0][0] = 0;matrix.m[0][1] = 0;matrix.m[0][2] = 0.5;matrix.m[0][3] = 0.5;
+                       matrix.m[1][0] = 0;matrix.m[1][1] = 0;matrix.m[1][2] = 0  ;matrix.m[1][3] = 0.5;
+                       matrix.m[2][0] = 0;matrix.m[2][1] = 0;matrix.m[2][2] = 0  ;matrix.m[2][3] = 0.5;
+                       matrix.m[3][0] = 0;matrix.m[3][1] = 0;matrix.m[3][2] = 0  ;matrix.m[3][3] = 1;
+                       Matrix4x4_Concat(&matrix_worldtoattenuationz, &matrix, &matrix_worldtofilter);
+
                        ent = &cl_entities[0].render;
                        if (ent->model && ent->model->DrawLight)
                        {
-                               Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
+                               Matrix4x4_Transform(&ent->inversematrix, wl->origin, relativelightorigin);
                                Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
-                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius, sl->distbias, sl->subtract, lightcolor);
+                               Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix);
+                               Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix);
+                               Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix);
+                               if (wl->numsurfaces)
+                                       R_Model_Brush_DrawLightForSurfaceList(ent, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, wl->surfaces, wl->numsurfaces, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz);
+                               else
+                                       ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz);
                        }
                        if (r_drawentities.integer)
                        {
@@ -794,122 +961,137 @@ void R_ShadowVolumeLighting (int visiblevolumes)
                                {
                                        ent = r_refdef.entities[i];
                                        if (ent->visframe == r_framecount && ent->model && ent->model->DrawLight
-                                        && ent->maxs[0] >= sl->mins[0] && ent->mins[0] <= sl->maxs[0]
-                                        && ent->maxs[1] >= sl->mins[1] && ent->mins[1] <= sl->maxs[1]
-                                        && ent->maxs[2] >= sl->mins[2] && ent->mins[2] <= sl->maxs[2])
+                                        && ent->maxs[0] >= clipmins[0] && ent->mins[0] <= clipmaxs[0]
+                                        && ent->maxs[1] >= clipmins[1] && ent->mins[1] <= clipmaxs[1]
+                                        && ent->maxs[2] >= clipmins[2] && ent->mins[2] <= clipmaxs[2]
+                                        && !(ent->effects & EF_ADDITIVE) && ent->alpha == 1)
                                        {
-                                               Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
+                                               Matrix4x4_Transform(&ent->inversematrix, wl->origin, relativelightorigin);
                                                Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
-                                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius, sl->distbias, sl->subtract, lightcolor);
+                                               Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix);
+                                               Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix);
+                                               Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix);
+                                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz);
                                        }
                                }
                        }
-
-                       R_Shadow_Stage_EraseShadowVolumes();
-                       R_DrawShadowSphere(sl->origin, cullradius, lightradius * 2);
-                       if (sl->shadowvolume && r_staticworldlights.integer)
-                               R_DrawWorldLightShadowVolume(sl);
-                       else
-                               R_TestAndDrawShadowVolume(&cl_entities[0].render, sl->origin, cullradius);
-                       if (r_drawentities.integer)
-                       {
-                               for (i = 0;i < r_refdef.numentities;i++)
-                               {
-                                       ent = r_refdef.entities[i];
-                                       if (ent->maxs[0] >= sl->mins[0] && ent->mins[0] <= sl->maxs[0]
-                                        && ent->maxs[1] >= sl->mins[1] && ent->mins[1] <= sl->maxs[1]
-                                        && ent->maxs[2] >= sl->mins[2] && ent->mins[2] <= sl->maxs[2])
-                                               R_TestAndDrawShadowVolume(r_refdef.entities[i], sl->origin, cullradius);
-                               }
-                       }
                }
        }
        for (lnum = 0, rd = r_dlight;lnum < r_numdlights;lnum++, rd++)
        {
-               cullradius = rd->cullradius;
                lightradius = rd->cullradius;
-               if (R_CullSphere(rd->origin, cullradius) || PVS_CullSphere(rd->origin, cullradius))
+               clipmins[0] = rd->origin[0] - lightradius;
+               clipmins[1] = rd->origin[1] - lightradius;
+               clipmins[2] = rd->origin[2] - lightradius;
+               clipmaxs[0] = rd->origin[0] + lightradius;
+               clipmaxs[1] = rd->origin[1] + lightradius;
+               clipmaxs[2] = rd->origin[2] + lightradius;
+               if (VIS_CullBox(clipmins, clipmaxs))
                        continue;
 
-               VectorScale(rd->light, 4.0f, lightcolor);
+               //if (R_Shadow_ScissorForBBoxAndSphere(clipmins, clipmaxs, rd->origin, cullradius))
+               if (R_Shadow_ScissorForBBox(clipmins, clipmaxs))
+                       continue;
 
                if (!visiblevolumes)
                        R_Shadow_Stage_ShadowVolumes();
-               R_TestAndDrawShadowVolume(&cl_entities[0].render, rd->origin, cullradius);
+
+               cullradius = RadiusFromBoundsAndOrigin(clipmins, clipmaxs, rd->origin);
+               VectorScale(rd->light, (1.0f / 4096.0f), lightcolor);
+
+               ent = &cl_entities[0].render;
+               R_TestAndDrawShadowVolume(ent, rd->origin, cullradius, lightradius, clipmins, clipmaxs, clipmins, clipmaxs);
                if (r_drawentities.integer)
                {
                        for (i = 0;i < r_refdef.numentities;i++)
                        {
                                ent = r_refdef.entities[i];
                                if (ent != rd->ent)
-                                       R_TestAndDrawShadowVolume(ent, rd->origin, cullradius);
+                                       R_TestAndDrawShadowVolume(ent, rd->origin, cullradius, lightradius, clipmins, clipmaxs, clipmins, clipmaxs);
                        }
                }
 
                if (!visiblevolumes)
                {
-                       R_Shadow_Stage_Light();
+                       R_Shadow_Stage_LightWithShadows();
+
+                       // calculate world to filter matrix
+                       Matrix4x4_CreateFromQuakeEntity(&matrix, rd->origin[0], rd->origin[1], rd->origin[2], 0, 0, 0, lightradius);
+                       Matrix4x4_Invert_Simple(&matrix_worldtofilter, &matrix);
+                       // calculate world to attenuationxyz/xy matrix
+                       Matrix4x4_CreateFromQuakeEntity(&matrix, 0.5, 0.5, 0.5, 0, 0, 0, 0.5);
+                       Matrix4x4_Concat(&matrix_worldtoattenuationxyz, &matrix, &matrix_worldtofilter);
+                       // calculate world to attenuationz matrix
+                       matrix.m[0][0] = 0;matrix.m[0][1] = 0;matrix.m[0][2] = 0.5;matrix.m[0][3] = 0.5;
+                       matrix.m[1][0] = 0;matrix.m[1][1] = 0;matrix.m[1][2] = 0  ;matrix.m[1][3] = 0.5;
+                       matrix.m[2][0] = 0;matrix.m[2][1] = 0;matrix.m[2][2] = 0  ;matrix.m[2][3] = 0.5;
+                       matrix.m[3][0] = 0;matrix.m[3][1] = 0;matrix.m[3][2] = 0  ;matrix.m[3][3] = 1;
+                       Matrix4x4_Concat(&matrix_worldtoattenuationz, &matrix, &matrix_worldtofilter);
+
                        ent = &cl_entities[0].render;
                        if (ent->model && ent->model->DrawLight)
                        {
                                Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin);
                                Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
-                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, cullradius, LIGHTOFFSET, rd->subtract, lightcolor);
+                               Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix);
+                               Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix);
+                               Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix);
+                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz);
                        }
                        if (r_drawentities.integer)
                        {
                                for (i = 0;i < r_refdef.numentities;i++)
                                {
                                        ent = r_refdef.entities[i];
-                                       if (ent->visframe == r_framecount && ent->model && ent->model->DrawLight)
+                                       if (ent->visframe == r_framecount && ent->model && ent->model->DrawLight
+                                        && ent->maxs[0] >= clipmins[0] && ent->mins[0] <= clipmaxs[0]
+                                        && ent->maxs[1] >= clipmins[1] && ent->mins[1] <= clipmaxs[1]
+                                        && ent->maxs[2] >= clipmins[2] && ent->mins[2] <= clipmaxs[2]
+                                        && !(ent->effects & EF_ADDITIVE) && ent->alpha == 1)
                                        {
                                                Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin);
                                                Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
-                                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, cullradius, LIGHTOFFSET, rd->subtract, lightcolor);
+                                               Matrix4x4_Concat(&matrix_modeltofilter, &matrix_worldtofilter, &ent->matrix);
+                                               Matrix4x4_Concat(&matrix_modeltoattenuationxyz, &matrix_worldtoattenuationxyz, &ent->matrix);
+                                               Matrix4x4_Concat(&matrix_modeltoattenuationz, &matrix_worldtoattenuationz, &ent->matrix);
+                                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor, &matrix_modeltofilter, &matrix_modeltoattenuationxyz, &matrix_modeltoattenuationz);
                                        }
                                }
                        }
-
-                       R_Shadow_Stage_EraseShadowVolumes();
-                       R_TestAndDrawShadowVolume(&cl_entities[0].render, rd->origin, cullradius);
-                       if (r_drawentities.integer)
-                       {
-                               for (i = 0;i < r_refdef.numentities;i++)
-                               {
-                                       ent = r_refdef.entities[i];
-                                       if (ent != rd->ent)
-                                               R_TestAndDrawShadowVolume(ent, rd->origin, cullradius);
-                               }
-                       }
                }
        }
 
        if (!visiblevolumes)
                R_Shadow_Stage_End();
+       qglEnable(GL_CULL_FACE);
+       qglDisable(GL_SCISSOR_TEST);
 }
 
 static void R_SetFrustum (void)
 {
-       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
        // disabled as well.
+
        // rotate VPN right by FOV_X/2 degrees
        RotatePointAroundVector( frustum[0].normal, vup, vpn, -(90-r_refdef.fov_x / 2 ) );
+       frustum[0].dist = DotProduct (r_origin, frustum[0].normal);
+       PlaneClassify(&frustum[0]);
+
        // rotate VPN left by FOV_X/2 degrees
        RotatePointAroundVector( frustum[1].normal, vup, vpn, 90-r_refdef.fov_x / 2 );
+       frustum[1].dist = DotProduct (r_origin, frustum[1].normal);
+       PlaneClassify(&frustum[1]);
+
        // rotate VPN up by FOV_X/2 degrees
        RotatePointAroundVector( frustum[2].normal, vright, vpn, 90-r_refdef.fov_y / 2 );
+       frustum[2].dist = DotProduct (r_origin, frustum[2].normal);
+       PlaneClassify(&frustum[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++)
-       {
-               frustum[i].type = PLANE_ANYZ;
-               frustum[i].dist = DotProduct (r_origin, frustum[i].normal);
-               PlaneClassify(&frustum[i]);
-       }
+       frustum[3].dist = DotProduct (r_origin, frustum[3].normal);
+       PlaneClassify(&frustum[3]);
 }
 
 /*
@@ -976,12 +1158,39 @@ R_RenderView
 r_refdef must be set before the first call
 ================
 */
+extern void R_DrawLightningBeams (void);
 void R_RenderView (void)
 {
        entity_render_t *world;
        if (!r_refdef.entities/* || !cl.worldmodel*/)
                return; //Host_Error ("R_RenderView: NULL worldmodel");
 
+       if (r_shadow_realtime.integer == 1)
+       {
+               if (!gl_texturecubemap)
+               {
+                       Con_Printf("Cubemap texture support not detected, turning off r_shadow_realtime\n");
+                       Cvar_SetValueQuick(&r_shadow_realtime, 0);
+               }
+               else if (!gl_dot3arb)
+               {
+                       Con_Printf("Bumpmapping support not detected, turning off r_shadow_realtime\n");
+                       Cvar_SetValueQuick(&r_shadow_realtime, 0);
+               }
+               else if (!gl_stencil)
+               {
+                       Con_Printf("Stencil not enabled, turning off r_shadow_realtime, please type vid_stencil 1;vid_bitsperpixel 32;vid_restart and try again\n");
+                       Cvar_SetValueQuick(&r_shadow_realtime, 0);
+               }
+               else if (!gl_combine.integer)
+               {
+                       Con_Printf("Combine disabled, please turn on gl_combine, turning off r_shadow_realtime\n");
+                       Cvar_SetValueQuick(&r_shadow_realtime, 0);
+               }
+       }
+
+       R_Shadow_UpdateLightingMode();
+
        world = &cl_entities[0].render;
 
        // FIXME: move to client
@@ -996,43 +1205,26 @@ void R_RenderView (void)
        R_BuildLightList();
        R_TimeReport("setup");
 
+       R_WorldVisibility(world);
+       R_TimeReport("worldvis");
+
        R_FarClip_Start(r_origin, vpn, 768.0f);
        R_MarkEntities();
-       r_farclip = R_FarClip_Finish() + 16384.0f;//256.0f;
+       r_farclip = R_FarClip_Finish() + 256.0f;
        R_TimeReport("markentity");
 
        GL_SetupView_ViewPort(r_refdef.x, r_refdef.y, r_refdef.width, r_refdef.height);
-       //GL_SetupView_Mode_Perspective(r_refdef.fov_x, r_refdef.fov_y, 1.0f, r_farclip);
-       GL_SetupView_Mode_PerspectiveInfiniteFarClip(r_refdef.fov_x, r_refdef.fov_y, 1.0f);
+       if (r_shadow_lightingmode > 0)
+               GL_SetupView_Mode_PerspectiveInfiniteFarClip(r_refdef.fov_x, r_refdef.fov_y, 1.0f);
+       else
+               GL_SetupView_Mode_Perspective(r_refdef.fov_x, r_refdef.fov_y, 1.0f, r_farclip);
        GL_SetupView_Orientation_FromEntity (r_refdef.vieworg, r_refdef.viewangles);
        qglDepthFunc(GL_LEQUAL);
 
        R_Mesh_Start();
        R_MeshQueue_BeginScene();
 
-       if (r_shadows.integer == 3)
-       {
-               if (!gl_texturecubemap)
-               {
-                       Con_Printf("Cubemap texture support not detected, turning off r_shadows 3\n");
-                       Cvar_SetValueQuick(&r_shadows, 0);
-               }
-               else if (!gl_dot3arb)
-               {
-                       Con_Printf("Bumpmapping support not detected, turning off r_shadows 3\n");
-                       Cvar_SetValueQuick(&r_shadows, 0);
-               }
-               else if (!gl_stencil)
-               {
-                       Con_Printf("Stencil not enabled, turning off r_shadows 3, please type vid_stencil 1;vid_restart and try again\n");
-                       Cvar_SetValueQuick(&r_shadows, 0);
-               }
-               else if (!gl_combine.integer)
-               {
-                       Con_Printf("Combine disabled, please turn on gl_combine, turning off r_shadows 3\n");
-                       Cvar_SetValueQuick(&r_shadows, 0);
-               }
-       }
+       R_Shadow_UpdateWorldLightSelection();
 
        if (R_DrawBrushModelsSky())
                R_TimeReport("bmodelsky");
@@ -1045,21 +1237,24 @@ void R_RenderView (void)
        if (!intimerefresh && !r_speeds.integer)
                S_ExtraUpdate ();
 
-       R_DrawModels(r_shadows.integer == 3);
+       R_DrawModels(r_shadow_lightingmode > 0);
        R_TimeReport("models");
 
-       if (r_shadows.integer == 1)
+       if (r_shadows.integer == 1 && r_shadow_lightingmode <= 0)
        {
                R_DrawFakeShadows();
                R_TimeReport("fakeshadow");
        }
 
-       if (r_shadows.integer == 3)
+       if (r_shadow_lightingmode > 0)
        {
                R_ShadowVolumeLighting(false);
                R_TimeReport("dynlight");
        }
 
+       R_DrawLightningBeams();
+       R_TimeReport("lightning");
+
        R_DrawParticles();
        R_TimeReport("particles");
 
@@ -1080,7 +1275,7 @@ void R_RenderView (void)
 
        R_MeshQueue_Render();
        R_MeshQueue_EndScene();
-       if (r_shadows.integer == 2)
+       if (r_shadow_realtime.integer >= 2)
        {
                R_ShadowVolumeLighting(true);
                R_TimeReport("shadowvolume");
@@ -1205,7 +1400,7 @@ void R_DrawNoModel(entity_render_t *ent)
        //      R_DrawNoModelCallback(ent, 0);
 }
 
-void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width)
+void R_CalcBeamVerts (float *vert, const vec3_t org1, const vec3_t org2, float width)
 {
        vec3_t right1, right2, diff, normal;