]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rmain.c
entity shadow casting is now optional per entity (EF_NOSHADOW added), and special...
[xonotic/darkplaces.git] / gl_rmain.c
index 0b21178968aac487bc607e33519b039d29a1e428..fe0052d2830c1a4ae443dd2b3b7ae59a41123781 100644 (file)
@@ -51,11 +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", "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"};
@@ -218,13 +221,16 @@ void GL_Main_Init(void)
        Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);
        Cvar_RegisterVariable (&r_drawentities);
        Cvar_RegisterVariable (&r_drawviewmodel);
+       Cvar_RegisterVariable (&r_shadows);
+       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);
 }
@@ -280,6 +286,7 @@ extern void R_Textures_Init(void);
 extern void Mod_RenderInit(void);
 extern void GL_Draw_Init(void);
 extern void GL_Main_Init(void);
+extern void R_Shadow_Init(void);
 extern void GL_Models_Init(void);
 extern void R_Sky_Init(void);
 extern void GL_Surf_Init(void);
@@ -289,16 +296,17 @@ extern void R_Particles_Init(void);
 extern void R_Explosion_Init(void);
 extern void ui_init(void);
 extern void gl_backend_init(void);
+extern void Sbar_Init(void);
 
 void Render_Init(void)
 {
-       R_Modules_Shutdown();
        R_Textures_Init();
        Mod_RenderInit();
        gl_backend_init();
        R_MeshQueue_Init();
        GL_Draw_Init();
        GL_Main_Init();
+       R_Shadow_Init();
        GL_Models_Init();
        R_Sky_Init();
        GL_Surf_Init();
@@ -307,7 +315,7 @@ void Render_Init(void)
        R_Particles_Init();
        R_Explosion_Init();
        ui_init();
-       R_Modules_Start();
+       Sbar_Init();
 }
 
 /*
@@ -322,12 +330,9 @@ void GL_Init (void)
 
        // LordHavoc: report supported extensions
        Con_Printf ("\nengine extensions: %s\n", ENGINE_EXTENSIONS);
-
-       qglCullFace(GL_FRONT);
-       qglEnable(GL_TEXTURE_2D);
 }
 
-int R_CullBox(const vec3_t emins, const vec3_t emaxs)
+int R_CullBox(const vec3_t mins, const vec3_t maxs)
 {
        int i;
        mplane_t *p;
@@ -338,35 +343,35 @@ int R_CullBox(const vec3_t emins, const vec3_t emaxs)
                {
                default:
                case 0:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist)
+                       if (p->normal[0]*maxs[0] + p->normal[1]*maxs[1] + p->normal[2]*maxs[2] < p->dist)
                                return true;
                        break;
                case 1:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist)
+                       if (p->normal[0]*mins[0] + p->normal[1]*maxs[1] + p->normal[2]*maxs[2] < p->dist)
                                return true;
                        break;
                case 2:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist)
+                       if (p->normal[0]*maxs[0] + p->normal[1]*mins[1] + p->normal[2]*maxs[2] < p->dist)
                                return true;
                        break;
                case 3:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist)
+                       if (p->normal[0]*mins[0] + p->normal[1]*mins[1] + p->normal[2]*maxs[2] < p->dist)
                                return true;
                        break;
                case 4:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist)
+                       if (p->normal[0]*maxs[0] + p->normal[1]*maxs[1] + p->normal[2]*mins[2] < p->dist)
                                return true;
                        break;
                case 5:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist)
+                       if (p->normal[0]*mins[0] + p->normal[1]*maxs[1] + p->normal[2]*mins[2] < p->dist)
                                return true;
                        break;
                case 6:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist)
+                       if (p->normal[0]*maxs[0] + p->normal[1]*mins[1] + p->normal[2]*mins[2] < p->dist)
                                return true;
                        break;
                case 7:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist)
+                       if (p->normal[0]*mins[0] + p->normal[1]*mins[1] + p->normal[2]*mins[2] < p->dist)
                                return true;
                        break;
                }
@@ -374,48 +379,127 @@ int R_CullBox(const vec3_t emins, const vec3_t emaxs)
        return false;
 }
 
-int R_NotCulledBox(const vec3_t emins, const vec3_t emaxs)
+int PVS_CullBox(const vec3_t mins, const vec3_t maxs)
 {
-       int i;
-       mplane_t *p;
-       for (i = 0;i < 4;i++)
+       int stackpos, sides;
+       mnode_t *node, *stack[4096];
+       if (cl.worldmodel == NULL)
+               return false;
+       stackpos = 0;
+       stack[stackpos++] = cl.worldmodel->nodes;
+       while (stackpos)
        {
-               p = frustum + i;
-               switch(p->signbits)
+               node = stack[--stackpos];
+               if (node->contents < 0)
                {
-               default:
-               case 0:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist)
-                               return false;
-                       break;
-               case 1:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2] < p->dist)
-                               return false;
-                       break;
-               case 2:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist)
-                               return false;
-                       break;
-               case 3:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2] < p->dist)
-                               return false;
-                       break;
-               case 4:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist)
+                       if (((mleaf_t *)node)->pvsframe == cl.worldmodel->pvsframecount)
                                return false;
-                       break;
-               case 5:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist)
+               }
+               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 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;
-                       break;
-               case 6:
-                       if (p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist)
+               }
+               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
+            || DotProduct(frustum[1].normal, origin) + radius < frustum[1].dist
+            || DotProduct(frustum[2].normal, origin) + radius < frustum[2].dist
+            || DotProduct(frustum[3].normal, origin) + radius < frustum[3].dist);
+}
+
+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)
+       {
+               node = stack[--stackpos];
+               if (node->contents < 0)
+               {
+                       if (((mleaf_t *)node)->pvsframe == cl.worldmodel->pvsframecount)
                                return false;
-                       break;
-               case 7:
-                       if (p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2] < p->dist)
+               }
+               else
+               {
+                       dist = PlaneDiff(origin, node->plane);
+                       if (dist <= radius)
+                               stack[stackpos++] = node->children[1];
+                       if (dist >= -radius)
+                               stack[stackpos++] = node->children[0];
+               }
+       }
+       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;
-                       break;
+               }
+               else
+               {
+                       dist = PlaneDiff(origin, node->plane);
+                       if (dist <= radius)
+                               stack[stackpos++] = node->children[1];
+                       if (dist >= -radius)
+                               stack[stackpos++] = node->children[0];
                }
        }
        return true;
@@ -459,10 +543,6 @@ static void R_MarkEntities (void)
                        VectorAdd(ent->angles, r_refdef.viewangles, ent->angles);
                }
 
-               if (R_CullBox(ent->mins, ent->maxs))
-                       continue;
-
-               ent->visframe = r_framecount;
                VectorCopy(ent->angles, v);
                if (!ent->model || ent->model->type != mod_brush)
                        v[0] = -v[0];
@@ -470,7 +550,13 @@ static void R_MarkEntities (void)
                Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix);
                R_LerpAnimation(ent);
                R_UpdateEntLights(ent);
-               R_FarClip_Box(ent->mins, ent->maxs);
+               if ((chase_active.integer || !(ent->flags & RENDER_EXTERIORMODEL))
+                && !VIS_CullSphere(ent->origin, ent->model->radius * ent->scale)
+                && !VIS_CullBox(ent->mins, ent->maxs))
+               {
+                       ent->visframe = r_framecount;
+                       R_FarClip_Box(ent->mins, ent->maxs);
+               }
        }
 }
 
@@ -501,6 +587,7 @@ int R_DrawBrushModelsSky (void)
 R_DrawViewModel
 =============
 */
+/*
 void R_DrawViewModel (void)
 {
        entity_render_t *ent;
@@ -517,9 +604,10 @@ void R_DrawViewModel (void)
        R_UpdateEntLights(ent);
        ent->model->Draw(ent);
 }
+*/
 
 void R_DrawNoModel(entity_render_t *ent);
-void R_DrawModels (void)
+void R_DrawModels ()
 {
        int i;
        entity_render_t *ent;
@@ -527,45 +615,570 @@ void R_DrawModels (void)
        if (!r_drawentities.integer)
                return;
 
-       R_DrawViewModel();
        for (i = 0;i < r_refdef.numentities;i++)
        {
                ent = r_refdef.entities[i];
                if (ent->visframe == r_framecount)
                {
-                       if (ent->model)
+                       if (ent->model && ent->model->Draw != NULL)
+                               ent->model->Draw(ent);
+                       else
+                               R_DrawNoModel(ent);
+               }
+       }
+}
+
+void R_DrawFakeShadows (void)
+{
+       int i;
+       entity_render_t *ent;
+
+       ent = &cl_entities[0].render;
+       if (ent->model && ent->model->DrawFakeShadow)
+               ent->model->DrawFakeShadow(ent);
+
+       if (!r_drawentities.integer)
+               return;
+       for (i = 0;i < r_refdef.numentities;i++)
+       {
+               ent = r_refdef.entities[i];
+               if ((ent->flags & RENDER_SHADOW) && ent->model && ent->model->DrawFakeShadow)
+                       ent->model->DrawFakeShadow(ent);
+       }
+}
+
+#include "r_shadow.h"
+
+int shadowframecount = 0;
+
+int Light_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)
+       {
+               node = stack[--stackpos];
+               if (node->contents < 0)
+               {
+                       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;
+}
+
+int LightAndVis_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 && ((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;
+}
+
+int LightAndVis_CullPointCloud(int numpoints, const float *points)
+{
+       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)
+       {
+               node = stack[--stackpos];
+               if (node->contents < 0)
+               {
+                       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];
+               }
+       }
+       return true;
+}
+
+
+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)
+{
+       vec3_t relativelightorigin;
+       #if 0
+       int i;
+       vec3_t p, p2, temp, relativelightorigin/*, mins, maxs*/;
+       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)
+       {
+               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;
+       }
+       #if 0
+       if (r_shadow_cull.integer)
+       {
+               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 (ent->model->Draw)
-                                       ent->model->Draw(ent);
+                               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
-                               R_DrawNoModel(ent);
+                       {
+                               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);
 }
 
-static void R_SetFrustum (void)
+void R_Shadow_DrawWorldLightShadowVolume(matrix4x4_t *matrix, worldlight_t *light);
+
+#define SHADOWSPHERE_SEGMENTS 16
+
+shadowmesh_t *shadowsphere;
+void R_CreateShadowSphere(void)
+{
+       int i, j;
+       vec3_t angles, angles2, angles3, angles4;
+       float verts[12];
+       shadowsphere = Mod_ShadowMesh_Begin(zonemempool, SHADOWSPHERE_SEGMENTS * SHADOWSPHERE_SEGMENTS / 2);
+       for (i = 0;i < SHADOWSPHERE_SEGMENTS / 2;i++)
+       {
+               for (j = 0;j < SHADOWSPHERE_SEGMENTS;j++)
+               {
+                       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);
+               }
+       }
+       shadowsphere = Mod_ShadowMesh_Finish(zonemempool, shadowsphere);
+}
+
+
+void R_DrawShadowSphere(vec3_t origin, float cullradius, float lightradius)
+{
+       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)
+       {
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
+       }
+       Matrix4x4_CreateScale(&matrix, -cullradius);
+       Matrix4x4_ConcatTranslate(&matrix, origin[0], origin[1], origin[2]);
+       R_Mesh_Matrix(&matrix);
+       for (mesh = shadowsphere;mesh;mesh = mesh->next)
+       {
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
+       }
+}
+
+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);
+void R_ShadowVolumeLighting (int visiblevolumes)
 {
        int i;
+       entity_render_t *ent;
+       int lnum;
+       float f, lightradius, cullradius;
+       vec3_t relativelightorigin, relativeeyeorigin, lightcolor, clipmins, clipmaxs;
+       worldlight_t *wl;
+       //mlight_t *sl;
+       rdlight_t *rd;
+       rmeshstate_t m;
+       mleaf_t *leaf;
+
+       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();
+       shadowframecount++;
+       for (lnum = 0, wl = r_shadow_worldlightchain;wl;wl = wl->next, lnum++)
+       {
+               if (d_lightstylevalue[wl->style] <= 0)
+                       continue;
+               cullradius = wl->cullradius;
+               lightradius = wl->lightradius;
+               if (R_CullSphere(wl->origin, lightradius))
+                       continue;
+               //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;
+
+               if (cl.worldmodel != NULL)
+               {
+                       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++;i < wl->numleafs;i++)
+                       {
+                               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 (clipmins[1] < wl->mins[1]) clipmins[1] = wl->mins[1];
+                       if (clipmins[2] < wl->mins[2]) clipmins[2] = wl->mins[2];
+                       if (clipmaxs[0] > wl->maxs[0]) clipmaxs[0] = wl->maxs[0];
+                       if (clipmaxs[1] > wl->maxs[1]) clipmaxs[1] = wl->maxs[1];
+                       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))
+                       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 (!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();
+                       ent = &cl_entities[0].render;
+                       if (ent->model && ent->model->DrawLight)
+                       {
+                               Matrix4x4_Transform(&ent->inversematrix, wl->origin, relativelightorigin);
+                               Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
+                               if (wl->numsurfaces)
+                                       R_Model_Brush_DrawLightForSurfaceList(ent, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, wl->surfaces, wl->numsurfaces);
+                               else
+                                       ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor);
+                       }
+                       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
+                                        && ent->maxs[0] >= wl->mins[0] && ent->mins[0] <= wl->maxs[0]
+                                        && ent->maxs[1] >= wl->mins[1] && ent->mins[1] <= wl->maxs[1]
+                                        && ent->maxs[2] >= wl->mins[2] && ent->mins[2] <= wl->maxs[2]
+                                        && !(ent->effects & EF_ADDITIVE) && ent->alpha == 1)
+                                       {
+                                               Matrix4x4_Transform(&ent->inversematrix, wl->origin, relativelightorigin);
+                                               Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
+                                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius / ent->scale, lightcolor);
+                                       }
+                               }
+                       }
+               }
+       }
+       /*
+       for (lnum = 0, sl = cl.worldmodel->lights;lnum < cl.worldmodel->numlights;lnum++, sl++)
+       {
+               if (d_lightstylevalue[sl->style] <= 0)
+                       continue;
+               if (r_shadow_debuglight.integer >= 0 && lnum != r_shadow_debuglight.integer)
+                       continue;
+               cullradius = sl->cullradius;
+               lightradius = sl->lightradius;
+               if (VIS_CullBox(sl->mins, sl->maxs) || VIS_CullSphere(sl->origin, lightradius))
+                       continue;
+
+               f = d_lightstylevalue[sl->style] * (1.0f / 32768.0f);
+               VectorScale(sl->light, f, lightcolor);
+
+               if (!visiblevolumes)
+                       R_Shadow_Stage_ShadowVolumes();
+               if (sl->shadowvolume && r_shadow_staticworldlights.integer)
+                       R_DrawWorldLightShadowVolume(&cl_entities[0].render.matrix, sl->shadowvolume);
+               else
+                       R_TestAndDrawShadowVolume(&cl_entities[0].render, sl->origin, cullradius, lightradius);
+               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]
+                                && !(ent->effects & EF_ADDITIVE) && ent->alpha == 1)
+                                       R_TestAndDrawShadowVolume(r_refdef.entities[i], sl->origin, cullradius, lightradius);
+                       }
+               }
+
+               if (!visiblevolumes)
+               {
+                       R_Shadow_Stage_Light();
+                       ent = &cl_entities[0].render;
+                       if (ent->model && ent->model->DrawLight)
+                       {
+                               Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
+                               Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
+                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius, sl->distbias, sl->subtract, lightcolor);
+                       }
+                       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
+                                        && 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->effects & EF_ADDITIVE) && ent->alpha == 1)
+                                       {
+                                               Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
+                                               Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
+                                               ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, lightradius, sl->distbias, sl->subtract, lightcolor);
+                                       }
+                               }
+                       }
+               }
+       }
+       */
+       for (lnum = 0, rd = r_dlight;lnum < r_numdlights;lnum++, rd++)
+       {
+               cullradius = rd->cullradius;
+               lightradius = rd->cullradius;
+               if (VIS_CullSphere(rd->origin, lightradius))
+                       continue;
+
+               VectorScale(rd->light, (1.0f / 8192.0f), lightcolor);
+               clipmins[0] = rd->origin[0] - cullradius;
+               clipmins[1] = rd->origin[1] - cullradius;
+               clipmins[2] = rd->origin[2] - cullradius;
+               clipmaxs[0] = rd->origin[0] + cullradius;
+               clipmaxs[1] = rd->origin[1] + cullradius;
+               clipmaxs[2] = rd->origin[2] + cullradius;
+
+               if (R_Shadow_ScissorForBBoxAndSphere(clipmins, clipmaxs, rd->origin, rd->cullradius))
+                       continue;
 
+               if (!visiblevolumes)
+                       R_Shadow_Stage_ShadowVolumes();
+               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, lightradius, clipmins, clipmaxs, clipmins, clipmaxs);
+                       }
+               }
+
+               if (!visiblevolumes)
+               {
+                       R_Shadow_Stage_Light();
+                       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, lightradius / ent->scale, lightcolor);
+                       }
+                       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
+                                        && !(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, lightradius / ent->scale, lightcolor);
+                                       }
+                               }
+                       }
+               }
+       }
+
+       if (!visiblevolumes)
+               R_Shadow_Stage_End();
+       qglEnable(GL_CULL_FACE);
+       qglDisable(GL_SCISSOR_TEST);
+}
+
+static void R_SetFrustum (void)
+{
        // 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]);
 }
 
 /*
@@ -610,10 +1223,6 @@ static void R_BlendView(void)
        R_Mesh_Matrix(&r_identitymatrix);
        R_Mesh_State(&m);
 
-       varray_color[0] = varray_color[4] = varray_color[8] = r_refdef.viewblend[0];
-       varray_color[1] = varray_color[5] = varray_color[9] = r_refdef.viewblend[1];
-       varray_color[2] = varray_color[6] = varray_color[10] = r_refdef.viewblend[2];
-       varray_color[3] = varray_color[7] = varray_color[11] = r_refdef.viewblend[3];
        r = 64000;
        varray_vertex[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r;
        varray_vertex[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r;
@@ -625,6 +1234,7 @@ static void R_BlendView(void)
        varray_vertex[8] = varray_vertex[0] + vright[0] * r;
        varray_vertex[9] = varray_vertex[1] + vright[1] * r;
        varray_vertex[10] = varray_vertex[2] + vright[2] * r;
+       GL_Color(r_refdef.viewblend[0], r_refdef.viewblend[1], r_refdef.viewblend[2], r_refdef.viewblend[3]);
        R_Mesh_Draw(3, 1, polygonelements);
 }
 
@@ -641,6 +1251,32 @@ void R_RenderView (void)
        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
@@ -655,19 +1291,27 @@ 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() + 256.0f;
        R_TimeReport("markentity");
 
        GL_SetupView_ViewPort(r_refdef.x, r_refdef.y, r_refdef.width, r_refdef.height);
-       GL_SetupView_Mode_Perspective((double) r_refdef.height / r_refdef.width, r_refdef.fov_x, r_refdef.fov_y, 1.0f, r_farclip);
+       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);
-       GL_DepthFunc(GL_LEQUAL);
-       
+       qglDepthFunc(GL_LEQUAL);
+
        R_Mesh_Start();
        R_MeshQueue_BeginScene();
 
+       R_Shadow_UpdateWorldLightSelection();
+
        if (R_DrawBrushModelsSky())
                R_TimeReport("bmodelsky");
 
@@ -679,9 +1323,21 @@ void R_RenderView (void)
        if (!intimerefresh && !r_speeds.integer)
                S_ExtraUpdate ();
 
-       R_DrawModels();
+       R_DrawModels(r_shadow_lightingmode > 0);
        R_TimeReport("models");
 
+       if (r_shadows.integer == 1 && r_shadow_lightingmode <= 0)
+       {
+               R_DrawFakeShadows();
+               R_TimeReport("fakeshadow");
+       }
+
+       if (r_shadow_lightingmode > 0)
+       {
+               R_ShadowVolumeLighting(false);
+               R_TimeReport("dynlight");
+       }
+
        R_DrawParticles();
        R_TimeReport("particles");
 
@@ -694,7 +1350,7 @@ void R_RenderView (void)
        R_DrawCoronas();
        R_TimeReport("coronas");
 
-       R_DrawCrosshair();
+       R_DrawWorldCrosshair();
        R_TimeReport("crosshair");
 
        R_BlendView();
@@ -702,6 +1358,11 @@ void R_RenderView (void)
 
        R_MeshQueue_Render();
        R_MeshQueue_EndScene();
+       if (r_shadow_realtime.integer >= 2)
+       {
+               R_ShadowVolumeLighting(true);
+               R_TimeReport("shadowvolume");
+       }
        R_Mesh_Finish();
        R_TimeReport("meshfinish");
 }
@@ -725,10 +1386,7 @@ void R_DrawBBoxMesh(vec3_t mins, vec3_t maxs, float cr, float cg, float cb, floa
        varray_vertex[20] = maxs[0];varray_vertex[21] = mins[1];varray_vertex[22] = maxs[2];
        varray_vertex[24] = mins[0];varray_vertex[25] = maxs[1];varray_vertex[26] = maxs[2];
        varray_vertex[28] = maxs[0];varray_vertex[29] = maxs[1];varray_vertex[30] = maxs[2];
-       varray_color[ 0] = varray_color[ 4] = varray_color[ 8] = varray_color[12] = varray_color[16] = varray_color[20] = varray_color[24] = varray_color[28] = cr * r_colorscale;
-       varray_color[ 1] = varray_color[ 5] = varray_color[ 9] = varray_color[13] = varray_color[17] = varray_color[21] = varray_color[25] = varray_color[29] = cg * r_colorscale;
-       varray_color[ 2] = varray_color[ 6] = varray_color[10] = varray_color[14] = varray_color[18] = varray_color[22] = varray_color[26] = varray_color[30] = cb * r_colorscale;
-       varray_color[ 3] = varray_color[ 7] = varray_color[11] = varray_color[15] = varray_color[19] = varray_color[23] = varray_color[27] = varray_color[31] = ca;
+       R_FillColors(varray_color, 8, cr * r_colorscale, cg * r_colorscale, cb * r_colorscale, ca);
        if (fogenabled)
        {
                for (i = 0, v = varray_vertex, c = varray_color;i < 8;i++, v += 4, c += 4)
@@ -742,6 +1400,7 @@ void R_DrawBBoxMesh(vec3_t mins, vec3_t maxs, float cr, float cg, float cb, floa
                        c[2] = c[2] * f1 + fogcolor[2] * f2;
                }
        }
+       GL_UseColorArray();
        R_Mesh_Draw(8, 12);
 }
 */
@@ -785,12 +1444,12 @@ void R_DrawNoModelCallback(const void *calldata1, int calldata2)
        varray_vertex[12] =   0;varray_vertex[13] =  16;varray_vertex[14] =   0;
        varray_vertex[16] =   0;varray_vertex[17] =   0;varray_vertex[18] = -16;
        varray_vertex[20] =   0;varray_vertex[21] =   0;varray_vertex[22] =  16;
-       varray_color[ 0] = 0.00f;varray_color[ 1] = 0.00f;varray_color[ 2] = 0.50f;varray_color[ 3] = ent->alpha;
-       varray_color[ 4] = 0.00f;varray_color[ 5] = 0.00f;varray_color[ 6] = 0.50f;varray_color[ 7] = ent->alpha;
-       varray_color[ 8] = 0.00f;varray_color[ 9] = 0.50f;varray_color[10] = 0.00f;varray_color[11] = ent->alpha;
-       varray_color[12] = 0.00f;varray_color[13] = 0.50f;varray_color[14] = 0.00f;varray_color[15] = ent->alpha;
-       varray_color[16] = 0.50f;varray_color[17] = 0.00f;varray_color[18] = 0.00f;varray_color[19] = ent->alpha;
-       varray_color[20] = 0.50f;varray_color[21] = 0.00f;varray_color[22] = 0.00f;varray_color[23] = ent->alpha;
+       varray_color[ 0] = 0.00f * r_colorscale;varray_color[ 1] = 0.00f * r_colorscale;varray_color[ 2] = 0.50f * r_colorscale;varray_color[ 3] = ent->alpha;
+       varray_color[ 4] = 0.00f * r_colorscale;varray_color[ 5] = 0.00f * r_colorscale;varray_color[ 6] = 0.50f * r_colorscale;varray_color[ 7] = ent->alpha;
+       varray_color[ 8] = 0.00f * r_colorscale;varray_color[ 9] = 0.50f * r_colorscale;varray_color[10] = 0.00f * r_colorscale;varray_color[11] = ent->alpha;
+       varray_color[12] = 0.00f * r_colorscale;varray_color[13] = 0.50f * r_colorscale;varray_color[14] = 0.00f * r_colorscale;varray_color[15] = ent->alpha;
+       varray_color[16] = 0.50f * r_colorscale;varray_color[17] = 0.00f * r_colorscale;varray_color[18] = 0.00f * r_colorscale;varray_color[19] = ent->alpha;
+       varray_color[20] = 0.50f * r_colorscale;varray_color[21] = 0.00f * r_colorscale;varray_color[22] = 0.00f * r_colorscale;varray_color[23] = ent->alpha;
        if (fogenabled)
        {
                VectorSubtract(ent->origin, r_origin, diff);
@@ -812,6 +1471,7 @@ void R_DrawNoModelCallback(const void *calldata1, int calldata2)
                        c[2] *= r_colorscale;
                }
        }
+       GL_UseColorArray();
        R_Mesh_Draw(6, 8, element);
 }
 
@@ -823,3 +1483,33 @@ void R_DrawNoModel(entity_render_t *ent)
        //      R_DrawNoModelCallback(ent, 0);
 }
 
+void R_CalcBeamVerts (float *vert, const vec3_t org1, const vec3_t org2, float width)
+{
+       vec3_t right1, right2, diff, normal;
+
+       VectorSubtract (org2, org1, normal);
+       VectorNormalizeFast (normal);
+
+       // calculate 'right' vector for start
+       VectorSubtract (r_origin, org1, diff);
+       VectorNormalizeFast (diff);
+       CrossProduct (normal, diff, right1);
+
+       // calculate 'right' vector for end
+       VectorSubtract (r_origin, org2, diff);
+       VectorNormalizeFast (diff);
+       CrossProduct (normal, diff, right2);
+
+       vert[ 0] = org1[0] + width * right1[0];
+       vert[ 1] = org1[1] + width * right1[1];
+       vert[ 2] = org1[2] + width * right1[2];
+       vert[ 4] = org1[0] - width * right1[0];
+       vert[ 5] = org1[1] - width * right1[1];
+       vert[ 6] = org1[2] - width * right1[2];
+       vert[ 8] = org2[0] - width * right2[0];
+       vert[ 9] = org2[1] - width * right2[1];
+       vert[10] = org2[2] - width * right2[2];
+       vert[12] = org2[0] + width * right2[0];
+       vert[13] = org2[1] + width * right2[1];
+       vert[14] = org2[2] + width * right2[2];
+}