]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rmain.c
fixed some dynamic lighting bugs related to glowing self
[xonotic/darkplaces.git] / gl_rmain.c
index 9c2cfdbb732b9e97f53dc8e98c885c5727e61690..6e24c18335e2cdde148ee909d8989ffa4a4bf493 100644 (file)
@@ -26,7 +26,9 @@ int r_framecount;
 
 mplane_t frustum[4];
 
-int c_brush_polys, c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
+matrix4x4_t r_identitymatrix;
+
+int c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
 
 // true during envmap command capture
 qboolean envmap;
@@ -44,13 +46,13 @@ vec3_t vup;
 //
 refdef_t r_refdef;
 
-mleaf_t *r_viewleaf, *r_oldviewleaf;
-
 // 8.8 fraction of base light value
 unsigned short d_lightstylevalue[256];
 
 cvar_t r_drawentities = {0, "r_drawentities","1"};
 cvar_t r_drawviewmodel = {0, "r_drawviewmodel","1"};
+cvar_t r_shadows = {CVAR_SAVE, "r_shadows", "1"};
+cvar_t r_staticworldlights = {0, "r_staticworldlights", "0"};
 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"};
@@ -123,52 +125,6 @@ static void R_TimeRefresh_f (void)
        Con_Printf ("%f seconds (%f fps)\n", time, 128/time);
 }
 
-extern cvar_t r_drawportals;
-
-int R_VisibleCullBox (vec3_t mins, vec3_t maxs)
-{
-       int sides;
-       mnode_t *nodestack[8192], *node;
-       int stack = 0;
-
-       if (R_CullBox(mins, maxs))
-               return true;
-
-       node = cl.worldmodel->nodes;
-loc0:
-       if (node->contents < 0)
-       {
-               if (((mleaf_t *)node)->visframe == r_framecount)
-                       return false;
-               if (!stack)
-                       return true;
-               node = nodestack[--stack];
-               goto loc0;
-       }
-
-       sides = BOX_ON_PLANE_SIDE(mins, maxs, node->plane);
-
-// recurse down the contacted sides
-       if (sides & 1)
-       {
-               if (sides & 2) // 3
-               {
-                       // put second child on the stack for later examination
-                       nodestack[stack++] = node->children[1];
-                       node = node->children[0];
-                       goto loc0;
-               }
-               else // 1
-               {
-                       node = node->children[0];
-                       goto loc0;
-               }
-       }
-       // 2
-       node = node->children[1];
-       goto loc0;
-}
-
 vec3_t fogcolor;
 vec_t fogdensity;
 float fog_density, fog_red, fog_green, fog_blue;
@@ -248,18 +204,24 @@ void gl_main_shutdown(void)
 {
 }
 
+extern void CL_ParseEntityLump(char *entitystring);
 void gl_main_newmap(void)
 {
+       if (cl.worldmodel && cl.worldmodel->entities)
+               CL_ParseEntityLump(cl.worldmodel->entities);
        r_framecount = 1;
 }
 
 void GL_Main_Init(void)
 {
+       Matrix4x4_CreateIdentity(&r_identitymatrix);
 // FIXME: move this to client?
        FOG_registercvars();
        Cmd_AddCommand ("timerefresh", R_TimeRefresh_f);
        Cvar_RegisterVariable (&r_drawentities);
        Cvar_RegisterVariable (&r_drawviewmodel);
+       Cvar_RegisterVariable (&r_shadows);
+       Cvar_RegisterVariable (&r_staticworldlights);
        Cvar_RegisterVariable (&r_speeds);
        Cvar_RegisterVariable (&r_fullbrights);
        Cvar_RegisterVariable (&r_wateralpha);
@@ -313,26 +275,16 @@ float R_FarClip_Finish(void)
 R_NewMap
 ===============
 */
-void CL_ParseEntityLump(char *entitystring);
 void R_NewMap (void)
 {
-       int i;
-
-       for (i = 0;i < 256;i++)
-               d_lightstylevalue[i] = 264;             // normal light value
-
-       r_viewleaf = NULL;
-       if (cl.worldmodel->entities)
-               CL_ParseEntityLump(cl.worldmodel->entities);
        R_Modules_NewMap();
-
-       r_farclip = 64.0f;
 }
 
 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);
@@ -342,16 +294,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();
@@ -360,7 +313,7 @@ void Render_Init(void)
        R_Particles_Init();
        R_Explosion_Init();
        ui_init();
-       R_Modules_Start();
+       Sbar_Init();
 }
 
 /*
@@ -375,9 +328,114 @@ 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 mins, const vec3_t maxs)
+{
+       int i;
+       mplane_t *p;
+       for (i = 0;i < 4;i++)
+       {
+               p = frustum + i;
+               switch(p->signbits)
+               {
+               default:
+               case 0:
+                       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]*mins[0] + p->normal[1]*maxs[1] + p->normal[2]*maxs[2] < p->dist)
+                               return true;
+                       break;
+               case 2:
+                       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]*mins[0] + p->normal[1]*mins[1] + p->normal[2]*maxs[2] < p->dist)
+                               return true;
+                       break;
+               case 4:
+                       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]*mins[0] + p->normal[1]*maxs[1] + p->normal[2]*mins[2] < p->dist)
+                               return true;
+                       break;
+               case 6:
+                       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]*mins[0] + p->normal[1]*mins[1] + p->normal[2]*mins[2] < p->dist)
+                               return true;
+                       break;
+               }
+       }
+       return false;
+}
+
+int PVS_CullBox(const vec3_t mins, const vec3_t maxs)
+{
+       int stackpos, sides;
+       mnode_t *node, *stack[4096];
+       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;
+               }
+               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;
+       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;
+               }
+               else
+               {
+                       dist = PlaneDiff(origin, node->plane);
+                       if (dist <= radius)
+                               stack[stackpos++] = node->children[1];
+                       if (dist >= -radius)
+                               stack[stackpos++] = node->children[0];
+               }
+       }
+       return true;
 }
 
 
@@ -393,7 +451,8 @@ static void R_MarkEntities (void)
        Matrix4x4_CreateIdentity(&ent->matrix);
        Matrix4x4_CreateIdentity(&ent->inversematrix);
 
-       R_FarClip_Box(cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
+       if (cl.worldmodel)
+               R_FarClip_Box(cl.worldmodel->normalmins, cl.worldmodel->normalmaxs);
 
        if (!r_drawentities.integer)
                return;
@@ -417,40 +476,26 @@ static void R_MarkEntities (void)
                        VectorAdd(ent->angles, r_refdef.viewangles, ent->angles);
                }
 
-               if (ent->angles[0] || ent->angles[2])
-               {
-                       VectorMA(ent->origin, ent->scale, ent->model->rotatedmins, ent->mins);
-                       VectorMA(ent->origin, ent->scale, ent->model->rotatedmaxs, ent->maxs);
-               }
-               else if (ent->angles[1])
-               {
-                       VectorMA(ent->origin, ent->scale, ent->model->yawmins, ent->mins);
-                       VectorMA(ent->origin, ent->scale, ent->model->yawmaxs, ent->maxs);
-               }
-               else
-               {
-                       VectorMA(ent->origin, ent->scale, ent->model->normalmins, ent->mins);
-                       VectorMA(ent->origin, ent->scale, ent->model->normalmaxs, ent->maxs);
-               }
-               if (R_VisibleCullBox(ent->mins, ent->maxs))
-                       continue;
-
                VectorCopy(ent->angles, v);
-               if (ent->model->type != mod_brush)
+               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);
                R_LerpAnimation(ent);
-               ent->visframe = r_framecount;
-
-               R_FarClip_Box(ent->mins, ent->maxs);
-
                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))
+               {
+                       ent->visframe = r_framecount;
+                       R_FarClip_Box(ent->mins, ent->maxs);
+               }
        }
 }
 
 // only used if skyrendermasked, and normally returns false
-int R_DrawBModelSky (void)
+int R_DrawBrushModelsSky (void)
 {
        int i, sky;
        entity_render_t *ent;
@@ -462,7 +507,7 @@ int R_DrawBModelSky (void)
        for (i = 0;i < r_refdef.numentities;i++)
        {
                ent = r_refdef.entities[i];
-               if (ent->visframe == r_framecount && ent->model->DrawSky)
+               if (ent->visframe == r_framecount && ent->model && ent->model->DrawSky)
                {
                        ent->model->DrawSky(ent);
                        sky = true;
@@ -471,7 +516,30 @@ int R_DrawBModelSky (void)
        return sky;
 }
 
-void R_DrawModels (void)
+/*
+=============
+R_DrawViewModel
+=============
+*/
+void R_DrawViewModel (void)
+{
+       entity_render_t *ent;
+
+       // FIXME: move these checks to client
+       if (!r_drawviewmodel.integer || chase_active.integer || envmap || !r_drawentities.integer || cl.items & IT_INVISIBILITY || cl.stats[STAT_HEALTH] <= 0 || !cl.viewent.render.model)
+               return;
+
+       ent = &cl.viewent.render;
+       Mod_CheckLoaded(ent->model);
+       R_LerpAnimation(ent);
+       Matrix4x4_CreateFromQuakeEntity(&ent->matrix, ent->origin[0], ent->origin[1], ent->origin[2], -ent->angles[0], ent->angles[1], ent->angles[2], ent->scale);
+       Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix);
+       R_UpdateEntLights(ent);
+       ent->model->Draw(ent);
+}
+
+void R_DrawNoModel(entity_render_t *ent);
+void R_DrawModels ()
 {
        int i;
        entity_render_t *ent;
@@ -479,36 +547,345 @@ 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 && ent->model->Draw)
-                       ent->model->Draw(ent);
+               if (ent->visframe == r_framecount)
+               {
+                       if (ent->model && ent->model->Draw != NULL)
+                               ent->model->Draw(ent);
+                       else
+                               R_DrawNoModel(ent);
+               }
        }
 }
 
-/*
-=============
-R_DrawViewModel
-=============
-*/
-void R_DrawViewModel (void)
+void R_DrawFakeShadows (void)
 {
+       int i;
        entity_render_t *ent;
 
-       // FIXME: move these checks to client
-       if (!r_drawviewmodel.integer || chase_active.integer || envmap || !r_drawentities.integer || cl.items & IT_INVISIBILITY || cl.stats[STAT_HEALTH] <= 0 || !cl.viewent.render.model)
+       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->model && ent->model->DrawFakeShadow)
+                       ent->model->DrawFakeShadow(ent);
+       }
+}
 
-       ent = &cl.viewent.render;
-       Mod_CheckLoaded(ent->model);
+#include "r_shadow.h"
 
-       R_LerpAnimation(ent);
+void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float lightradius)
+{
+       int i;
+       vec3_t p, p2, temp, relativelightorigin;
+       float dist, projectdistance;
+       // rough checks
+       if (ent->model && ent->model->DrawShadowVolume)
+       {
+               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)
+               {
+                       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);
+                       }
+                       }
+               }
+       }
+}
 
-       Matrix4x4_CreateFromQuakeEntity(&ent->matrix, ent->origin[0], ent->origin[1], ent->origin[2], -ent->angles[0], ent->angles[1], ent->angles[2], ent->scale);
-       Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix);
+void R_DrawWorldLightShadowVolume(mlight_t *sl)
+{
+       shadowmesh_t *mesh;
+       R_Mesh_Matrix(&cl_entities[0].render.matrix);
+       for (mesh = sl->shadowvolume;mesh;mesh = mesh->next)
+       {
+               memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+               R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
+       }
+}
 
-       ent->model->Draw(ent);
+#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);
+       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);
+       }
+}
+
+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;
+       rdlight_t *rd;
+       rmeshstate_t m;
+
+       if (visiblevolumes)
+       {
+               memset(&m, 0, sizeof(m));
+               m.blendfunc1 = GL_ONE;
+               m.blendfunc2 = GL_ONE;
+               R_Mesh_State(&m);
+               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++)
+       {
+               if (d_lightstylevalue[sl->style] <= 0)
+                       continue;
+               if (r_light_debuglight.integer >= 0 && lnum != r_light_debuglight.integer)
+                       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))
+                       continue;
+
+               f = d_lightstylevalue[sl->style] * (1.0f / 32768.0f);
+               VectorScale(sl->light, f, lightcolor);
+
+               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)
+               {
+                       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);
+                       }
+               }
+
+               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])
+                                       {
+                                               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);
+                                       }
+                               }
+                       }
+
+                       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))
+                       continue;
+
+               VectorScale(rd->light, 4.0f, lightcolor);
+
+               if (!visiblevolumes)
+                       R_Shadow_Stage_ShadowVolumes();
+               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_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, cullradius, LIGHTOFFSET, rd->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)
+                                       {
+                                               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);
+                                       }
+                               }
+                       }
+
+                       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();
 }
 
 static void R_SetFrustum (void)
@@ -558,17 +935,13 @@ static void R_SetupFrame (void)
 
        AngleVectors (r_refdef.viewangles, vpn, vright, vup);
 
-// current viewleaf
-       r_oldviewleaf = r_viewleaf;
-       r_viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel);
-
        R_AnimateLight ();
 }
 
 
 static void R_BlendView(void)
 {
-       rmeshbufferinfo_t m;
+       rmeshstate_t m;
        float r;
 
        if (r_refdef.viewblend[3] < 0.01f)
@@ -578,31 +951,22 @@ static void R_BlendView(void)
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        m.depthdisable = true; // magic
-       m.numtriangles = 1;
-       m.numverts = 3;
-       Matrix4x4_CreateIdentity(&m.matrix);
-       if (R_Mesh_Draw_GetBuffer(&m, false))
-       {
-               m.index[0] = 0;
-               m.index[1] = 1;
-               m.index[2] = 2;
-               m.color[0] = m.color[4] = m.color[8] = r_refdef.viewblend[0];
-               m.color[1] = m.color[5] = m.color[9] = r_refdef.viewblend[1];
-               m.color[2] = m.color[6] = m.color[10] = r_refdef.viewblend[2];
-               m.color[3] = m.color[7] = m.color[11] = r_refdef.viewblend[3];
-               r = 64000;
-               m.vertex[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r;
-               m.vertex[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r;
-               m.vertex[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r;
-               r *= 3;
-               m.vertex[4] = m.vertex[0] + vup[0] * r;
-               m.vertex[5] = m.vertex[1] + vup[1] * r;
-               m.vertex[6] = m.vertex[2] + vup[2] * r;
-               m.vertex[8] = m.vertex[0] + vright[0] * r;
-               m.vertex[9] = m.vertex[1] + vright[1] * r;
-               m.vertex[10] = m.vertex[2] + vright[2] * r;
-               R_Mesh_Render();
-       }
+       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_State(&m);
+
+       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;
+       varray_vertex[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r;
+       r *= 3;
+       varray_vertex[4] = varray_vertex[0] + vup[0] * r;
+       varray_vertex[5] = varray_vertex[1] + vup[1] * r;
+       varray_vertex[6] = varray_vertex[2] + vup[2] * r;
+       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);
 }
 
 /*
@@ -614,76 +978,87 @@ r_refdef must be set before the first call
 */
 void R_RenderView (void)
 {
-       entity_render_t *world = &cl_entities[0].render;
-       if (!cl.worldmodel)
+       entity_render_t *world;
+       if (!r_refdef.entities/* || !cl.worldmodel*/)
                return; //Host_Error ("R_RenderView: NULL worldmodel");
 
+       world = &cl_entities[0].render;
+
        // FIXME: move to client
        R_MoveExplosions();
        R_TimeReport("mexplosion");
 
+       R_Textures_Frame();
        R_SetupFrame();
        R_SetFrustum();
        R_SetupFog();
        R_SkyStartFrame();
        R_BuildLightList();
-
-       R_FarClip_Start(r_origin, vpn, 768.0f);
-
        R_TimeReport("setup");
 
-       R_DrawWorld(world);
-       R_TimeReport("worldnode");
-
+       R_FarClip_Start(r_origin, vpn, 768.0f);
        R_MarkEntities();
+       r_farclip = R_FarClip_Finish() + 16384.0f;//256.0f;
        R_TimeReport("markentity");
 
-       R_SurfMarkLights(world);
-       R_TimeReport("marklights");
-
-       r_farclip = R_FarClip_Finish() + 256.0f;
-
-       R_Mesh_Start(r_farclip);
+       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);
+       GL_SetupView_Orientation_FromEntity (r_refdef.vieworg, r_refdef.viewangles);
+       qglDepthFunc(GL_LEQUAL);
 
+       R_Mesh_Start();
        R_MeshQueue_BeginScene();
 
-
-       if (skyrendermasked)
+       if (r_shadows.integer == 3)
        {
-               if (R_DrawBModelSky())
-                       R_TimeReport("bmodelsky");
-       }
-       else
-       {
-               R_DrawViewModel();
-               R_TimeReport("viewmodel");
+               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_PrepareSurfaces(world);
-       R_TimeReport("surfprep");
-
-       R_DrawSurfaces(world, SHADERSTAGE_SKY);
-       R_DrawSurfaces(world, SHADERSTAGE_NORMAL);
-       R_TimeReport("surfdraw");
+       if (R_DrawBrushModelsSky())
+               R_TimeReport("bmodelsky");
 
-       if (r_drawportals.integer)
-       {
-               R_DrawPortals(world);
-               R_TimeReport("portals");
-       }
+       // must occur early because it can draw sky
+       R_DrawWorld(world);
+       R_TimeReport("world");
 
        // don't let sound skip if going slow
        if (!intimerefresh && !r_speeds.integer)
                S_ExtraUpdate ();
 
-       if (skyrendermasked)
+       R_DrawModels(r_shadows.integer == 3);
+       R_TimeReport("models");
+
+       if (r_shadows.integer == 1)
        {
-               R_DrawViewModel();
-               R_TimeReport("viewmodel");
+               R_DrawFakeShadows();
+               R_TimeReport("fakeshadow");
        }
 
-       R_DrawModels();
-       R_TimeReport("models");
+       if (r_shadows.integer == 3)
+       {
+               R_ShadowVolumeLighting(false);
+               R_TimeReport("dynlight");
+       }
 
        R_DrawParticles();
        R_TimeReport("particles");
@@ -692,22 +1067,171 @@ void R_RenderView (void)
        R_TimeReport("explosions");
 
        R_MeshQueue_RenderTransparent();
-       R_TimeReport("addtrans");
+       R_TimeReport("drawtrans");
 
        R_DrawCoronas();
        R_TimeReport("coronas");
 
-       R_DrawCrosshair();
+       R_DrawWorldCrosshair();
        R_TimeReport("crosshair");
 
        R_BlendView();
        R_TimeReport("blendview");
 
        R_MeshQueue_Render();
-
        R_MeshQueue_EndScene();
-
+       if (r_shadows.integer == 2)
+       {
+               R_ShadowVolumeLighting(true);
+               R_TimeReport("shadowvolume");
+       }
        R_Mesh_Finish();
        R_TimeReport("meshfinish");
 }
 
+/*
+void R_DrawBBoxMesh(vec3_t mins, vec3_t maxs, float cr, float cg, float cb, float ca)
+{
+       int i;
+       float *v, *c, f1, f2, diff[3];
+       rmeshstate_t m;
+       m.blendfunc1 = GL_SRC_ALPHA;
+       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+       R_Mesh_Matrix(&r_identitymatrix);
+       R_Mesh_State(&m);
+
+       varray_vertex[ 0] = mins[0];varray_vertex[ 1] = mins[1];varray_vertex[ 2] = mins[2];
+       varray_vertex[ 4] = maxs[0];varray_vertex[ 5] = mins[1];varray_vertex[ 6] = mins[2];
+       varray_vertex[ 8] = mins[0];varray_vertex[ 9] = maxs[1];varray_vertex[10] = mins[2];
+       varray_vertex[12] = maxs[0];varray_vertex[13] = maxs[1];varray_vertex[14] = mins[2];
+       varray_vertex[16] = mins[0];varray_vertex[17] = mins[1];varray_vertex[18] = maxs[2];
+       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];
+       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)
+               {
+                       VectorSubtract(v, r_origin, diff);
+                       f2 = exp(fogdensity/DotProduct(diff, diff));
+                       f1 = 1 - f2;
+                       f2 *= r_colorscale;
+                       c[0] = c[0] * f1 + fogcolor[0] * f2;
+                       c[1] = c[1] * f1 + fogcolor[1] * f2;
+                       c[2] = c[2] * f1 + fogcolor[2] * f2;
+               }
+       }
+       GL_UseColorArray();
+       R_Mesh_Draw(8, 12);
+}
+*/
+
+void R_DrawNoModelCallback(const void *calldata1, int calldata2)
+{
+       const entity_render_t *ent = calldata1;
+       int i, element[24];
+       float f1, f2, *c, diff[3];
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       if (ent->flags & EF_ADDITIVE)
+       {
+               m.blendfunc1 = GL_SRC_ALPHA;
+               m.blendfunc2 = GL_ONE;
+       }
+       else if (ent->alpha < 1)
+       {
+               m.blendfunc1 = GL_SRC_ALPHA;
+               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+       }
+       else
+       {
+               m.blendfunc1 = GL_ONE;
+               m.blendfunc2 = GL_ZERO;
+       }
+       R_Mesh_Matrix(&ent->matrix);
+       R_Mesh_State(&m);
+
+       element[ 0] = 5;element[ 1] = 2;element[ 2] = 0;
+       element[ 3] = 5;element[ 4] = 1;element[ 5] = 2;
+       element[ 6] = 5;element[ 7] = 0;element[ 8] = 3;
+       element[ 9] = 5;element[10] = 3;element[11] = 1;
+       element[12] = 0;element[13] = 2;element[14] = 4;
+       element[15] = 2;element[16] = 1;element[17] = 4;
+       element[18] = 3;element[19] = 0;element[20] = 4;
+       element[21] = 1;element[22] = 3;element[23] = 4;
+       varray_vertex[ 0] = -16;varray_vertex[ 1] =   0;varray_vertex[ 2] =   0;
+       varray_vertex[ 4] =  16;varray_vertex[ 5] =   0;varray_vertex[ 6] =   0;
+       varray_vertex[ 8] =   0;varray_vertex[ 9] = -16;varray_vertex[10] =   0;
+       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 * 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);
+               f2 = exp(fogdensity/DotProduct(diff, diff));
+               f1 = 1 - f2;
+               for (i = 0, c = varray_color;i < 6;i++, c += 4)
+               {
+                       c[0] = (c[0] * f1 + fogcolor[0] * f2) * r_colorscale;
+                       c[1] = (c[1] * f1 + fogcolor[1] * f2) * r_colorscale;
+                       c[2] = (c[2] * f1 + fogcolor[2] * f2) * r_colorscale;
+               }
+       }
+       else
+       {
+               for (i = 0, c = varray_color;i < 6;i++, c += 4)
+               {
+                       c[0] *= r_colorscale;
+                       c[1] *= r_colorscale;
+                       c[2] *= r_colorscale;
+               }
+       }
+       GL_UseColorArray();
+       R_Mesh_Draw(6, 8, element);
+}
+
+void R_DrawNoModel(entity_render_t *ent)
+{
+       //if ((ent->effects & EF_ADDITIVE) || (ent->alpha < 1))
+               R_MeshQueue_AddTransparent(ent->origin, R_DrawNoModelCallback, ent, 0);
+       //else
+       //      R_DrawNoModelCallback(ent, 0);
+}
+
+void R_CalcBeamVerts (float *vert, vec3_t org1, 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];
+}