X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=bedc8b8d784f177eb7ab74ab26b442a665b37680;hb=9eed14a34e6f2a05afa0f57d9490837cf20df9ec;hp=4a8d46f5c5ac6d7e9eeef77c1166a50f116cd37b;hpb=bcdca3f76b1e1020eeebd27e5721ec4fe57523a1;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rmain.c b/gl_rmain.c
index 4a8d46f5..bedc8b8d 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -52,12 +52,13 @@ 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_shadow_staticworldlights = {0, "r_shadow_staticworldlights", "1"};
 cvar_t r_speeds = {0, "r_speeds","0"};
 cvar_t r_fullbright = {0, "r_fullbright","0"};
 cvar_t r_wateralpha = {CVAR_SAVE, "r_wateralpha","1"};
 cvar_t r_dynamic = {CVAR_SAVE, "r_dynamic","1"};
 cvar_t r_fullbrights = {CVAR_SAVE, "r_fullbrights", "1"};
+cvar_t r_shadow_cull = {0, "r_shadow_cull", "1"};
 
 cvar_t gl_fogenable = {0, "gl_fogenable", "0"};
 cvar_t gl_fogdensity = {0, "gl_fogdensity", "0.25"};
@@ -221,14 +222,15 @@ void GL_Main_Init(void)
 	Cvar_RegisterVariable (&r_drawentities);
 	Cvar_RegisterVariable (&r_drawviewmodel);
 	Cvar_RegisterVariable (&r_shadows);
-	Cvar_RegisterVariable (&r_staticworldlights);
+	Cvar_RegisterVariable (&r_shadow_staticworldlights);
 	Cvar_RegisterVariable (&r_speeds);
 	Cvar_RegisterVariable (&r_fullbrights);
 	Cvar_RegisterVariable (&r_wateralpha);
 	Cvar_RegisterVariable (&r_dynamic);
 	Cvar_RegisterVariable (&r_fullbright);
 	Cvar_RegisterVariable (&r_textureunits);
-	if (gamemode == GAME_NEHAHRA)
+	Cvar_RegisterVariable (&r_shadow_cull);
+	if (gamemode == GAME_NEHAHRA || gamemode == GAME_NEXIUZ)
 		Cvar_SetValue("r_fullbrights", 0);
 	R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
 }
@@ -330,7 +332,7 @@ void GL_Init (void)
 	Con_Printf ("\nengine extensions: %s\n", ENGINE_EXTENSIONS);
 }
 
-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;
@@ -341,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;
 		}
@@ -377,48 +379,119 @@ 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];
+	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)
+			if (((mleaf_t *)node)->pvsframe == cl.worldmodel->pvsframecount)
 				return false;
-			break;
-		case 4:
-			if (p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2] < p->dist)
-				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;
+	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;
+	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;
+	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;
@@ -469,7 +542,9 @@ static void R_MarkEntities (void)
 		Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix);
 		R_LerpAnimation(ent);
 		R_UpdateEntLights(ent);
-		if (R_NotCulledBox(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);
@@ -504,6 +579,7 @@ int R_DrawBrushModelsSky (void)
 R_DrawViewModel
 =============
 */
+/*
 void R_DrawViewModel (void)
 {
 	entity_render_t *ent;
@@ -520,9 +596,10 @@ void R_DrawViewModel (void)
 	R_UpdateEntLights(ent);
 	ent->model->Draw(ent);
 }
+*/
 
 void R_DrawNoModel(entity_render_t *ent);
-void R_DrawModels (int baselighting)
+void R_DrawModels ()
 {
 	int i;
 	entity_render_t *ent;
@@ -530,22 +607,13 @@ void R_DrawModels (int baselighting)
 	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 (baselighting && ent->model->DrawBaseLighting != NULL)
-				{
-					if (ent->model->DrawBaseLighting)
-						ent->model->DrawBaseLighting(ent);
-				}
-				else if (ent->model->Draw)
-					ent->model->Draw(ent);
-			}
+			if (ent->model && ent->model->Draw != NULL)
+				ent->model->Draw(ent);
 			else
 				R_DrawNoModel(ent);
 		}
@@ -573,205 +641,119 @@ void R_DrawFakeShadows (void)
 
 #include "r_shadow.h"
 
-void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float lightradius, int visiblevolume)
+int shadowframecount = 0;
+
+int Light_CullBox(const vec3_t mins, const vec3_t maxs)
 {
-	int i;
-	vec3_t p, p2, temp, relativelightorigin;
-	float dist, projectdistance;
-	// rough checks
-	if (ent->model && ent->model->DrawShadowVolume)
+	int stackpos, sides;
+	mnode_t *node, *stack[4096];
+	stackpos = 0;
+	stack[stackpos++] = cl.worldmodel->nodes;
+	while (stackpos)
 	{
-		temp[0] = bound(ent->mins[0], lightorigin[0], ent->maxs[0]) - lightorigin[0];
-		temp[1] = bound(ent->mins[1], lightorigin[1], ent->maxs[1]) - lightorigin[1];
-		temp[2] = bound(ent->mins[2], lightorigin[2], ent->maxs[2]) - lightorigin[2];
-		dist = DotProduct(temp, temp);
-		if (dist < lightradius * lightradius)
+		node = stack[--stackpos];
+		if (node->contents < 0)
 		{
-			projectdistance = lightradius - sqrt(dist);
-			{
-#if 0
-			int d0, d1, d2, d3;
-			// calculate projected bounding box and decide if it is on-screen
-			d0 = false;
-			d1 = false;
-			d2 = false;
-			d3 = false;
-			for (i = 0;i < 8;i++)
-			{
-				p[0] = i & 1 ? ent->maxs[0] : ent->mins[0];
-				p[1] = i & 2 ? ent->maxs[1] : ent->mins[1];
-				p[2] = i & 4 ? ent->maxs[2] : ent->mins[2];
-				VectorSubtract(p, lightorigin, temp);
-				dist = projectdistance / sqrt(DotProduct(temp, temp));
-				VectorMA(p, dist, temp, p2);
-				if (!d0 && (DotProduct(p , frustum[0].normal) < frustum[0].dist || DotProduct(p2, frustum[0].normal) < frustum[0].dist))
-					d0 = true;
-				if (!d1 && (DotProduct(p , frustum[1].normal) < frustum[1].dist || DotProduct(p2, frustum[1].normal) < frustum[1].dist))
-					d1 = true;
-				if (!d2 && (DotProduct(p , frustum[2].normal) < frustum[2].dist || DotProduct(p2, frustum[2].normal) < frustum[2].dist))
-					d2 = true;
-				if (!d3 && (DotProduct(p , frustum[3].normal) < frustum[3].dist || DotProduct(p2, frustum[3].normal) < frustum[3].dist))
-					d3 = true;
-			}
-			if (d0 && d1 && d2 && d3)
-#else
-			vec3_t mins, maxs;
-			// calculate projected bounding box and decide if it is on-screen
-			VectorCopy(ent->mins, mins);
-			VectorCopy(ent->maxs, maxs);
-			for (i = 0;i < 8;i++)
-			{
-				p[0] = i & 1 ? ent->maxs[0] : ent->mins[0];
-				p[1] = i & 2 ? ent->maxs[1] : ent->mins[1];
-				p[2] = i & 4 ? ent->maxs[2] : ent->mins[2];
-				VectorSubtract(p, lightorigin, temp);
-				dist = projectdistance / sqrt(DotProduct(temp, temp));
-				VectorMA(p, dist, temp, p2);
-				if (mins[0] > p2[0]) mins[0] = p2[0];if (maxs[0] < p2[0]) maxs[0] = p2[0];
-				if (mins[1] > p2[1]) mins[1] = p2[1];if (maxs[1] < p2[1]) maxs[1] = p2[1];
-				if (mins[2] > p2[2]) mins[2] = p2[2];if (maxs[2] < p2[2]) maxs[2] = p2[2];
-			}
-			if (R_NotCulledBox(mins, maxs))
-#endif
-			{
-				Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin);
-				ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius, visiblevolume);
-			}
-			}
+			if (((mleaf_t *)node)->worldnodeframe == shadowframecount)
+				return false;
+		}
+		else
+		{
+			sides = BoxOnPlaneSide(mins, maxs, node->plane);
+			if (sides & 2 && stackpos < 4096)
+				stack[stackpos++] = node->children[1];
+			if (sides & 1 && stackpos < 4096)
+				stack[stackpos++] = node->children[0];
 		}
 	}
+	return true;
 }
 
-void R_DrawWorldLightShadowVolume(mlight_t *sl, int visiblevolume)
+int LightAndVis_CullBox(const vec3_t mins, const vec3_t maxs)
 {
-	shadowmesh_t *mesh;
-	R_Mesh_Matrix(&cl_entities[0].render.matrix);
-	for (mesh = sl->shadowvolume;mesh;mesh = mesh->next)
+	int stackpos, sides;
+	mnode_t *node, *stack[4096];
+	if (R_CullBox(mins, maxs))
+		return true;
+	stackpos = 0;
+	stack[stackpos++] = cl.worldmodel->nodes;
+	while (stackpos)
 	{
-		memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-		R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements, visiblevolume);
-	}
-}
-
-void R_DrawShadowVolumes (void)
-{
-	int i, lnum;
-	entity_render_t *ent;
-	vec3_t mins, maxs;//, relativelightorigin;
-	mlight_t *sl;
-	rdlight_t *rd;
-	rmeshstate_t m;
-
-	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;
-		/*
-		mins[0] = sl->origin[0] - sl->cullradius;
-		maxs[0] = sl->origin[0] + sl->cullradius;
-		mins[1] = sl->origin[1] - sl->cullradius;
-		maxs[1] = sl->origin[1] + sl->cullradius;
-		mins[2] = sl->origin[2] - sl->cullradius;
-		maxs[2] = sl->origin[2] + sl->cullradius;
-		if (R_CullBox(mins, maxs))
-			continue;
-		*/
-		if (R_CullBox(sl->mins, sl->maxs))
-			continue;
-		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);
-		if (sl->shadowvolume && r_staticworldlights.integer)
-			R_DrawWorldLightShadowVolume(sl, true);
-		else
-		{
-			ent = &cl_entities[0].render;
-			R_TestAndDrawShadowVolume(ent, sl->origin, sl->cullradius, true);
-		}
-		/*
-		ent = &cl_entities[0].render;
-		if (ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2])
+		node = stack[--stackpos];
+		if (node->contents < 0)
 		{
-			Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
-			ent->model->DrawShadowVolume (ent, relativelightorigin, sl->cullradius, true);
+			if (((mleaf_t *)node)->visframe == r_framecount && ((mleaf_t *)node)->worldnodeframe == shadowframecount)
+				return false;
 		}
-		*/
-		if (r_drawentities.integer)
+		else
 		{
-			for (i = 0;i < r_refdef.numentities;i++)
-			{
-				ent = r_refdef.entities[i];
-				/*
-				if (ent->mins[0] <= sl->maxs[0]
-				 && ent->maxs[0] >= sl->mins[0]
-				 && ent->mins[1] <= sl->maxs[1]
-				 && ent->maxs[1] >= sl->mins[1]
-				 && ent->mins[2] <= sl->maxs[2]
-				 && ent->maxs[2] >= sl->mins[2])
-				*/
-					R_TestAndDrawShadowVolume(ent, sl->origin, sl->cullradius, true);
-				/*
-				ent = r_refdef.entities[i];
-				if (ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2])
-				{
-					Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
-					ent->model->DrawShadowVolume (ent, relativelightorigin, sl->cullradius, true);
-				}
-				*/
-			}
+			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;
+}
 
-	for (lnum = 0, rd = r_dlight;lnum < r_numdlights;lnum++, rd++)
+
+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)
+{
+	int i;
+	vec3_t p, p2, temp, relativelightorigin, mins, maxs;
+	float dist, projectdistance;
+	// rough checks
+	if (ent->model == NULL || ent->model->DrawShadowVolume == NULL || ent->alpha < 1 || (ent->effects & EF_ADDITIVE))
+		return;
+	if (r_shadow_cull.integer)
 	{
-		mins[0] = rd->origin[0] - rd->cullradius;
-		maxs[0] = rd->origin[0] + rd->cullradius;
-		mins[1] = rd->origin[1] - rd->cullradius;
-		maxs[1] = rd->origin[1] + rd->cullradius;
-		mins[2] = rd->origin[2] - rd->cullradius;
-		maxs[2] = rd->origin[2] + rd->cullradius;
-		if (R_CullBox(mins, maxs))
-			continue;
-		memset(&m, 0, sizeof(m));
-		m.blendfunc1 = GL_ONE;
-		m.blendfunc2 = GL_ONE;
-		R_Mesh_State(&m);
-		GL_Color(0.1 * r_colorscale, 0.0125 * r_colorscale, 0.0 * r_colorscale, 1);
-		ent = &cl_entities[0].render;
-		if (ent != rd->ent)
-			R_TestAndDrawShadowVolume(ent, rd->origin, rd->cullradius, true);
-		/*
-		ent = &cl_entities[0].render;
-		if (ent != rd->ent && ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2])
-		{
-			Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin);
-			ent->model->DrawShadowVolume (ent, relativelightorigin, rd->cullradius, true);
-		}
-		*/
-		if (r_drawentities.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 (r_shadow_cull.integer)
+	{
+		projectdistance = cullradius;
+		// calculate projected bounding box and decide if it is on-screen
+		for (i = 0;i < 8;i++)
 		{
-			for (i = 0;i < r_refdef.numentities;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)
 			{
-				ent = r_refdef.entities[i];
-				if (ent != rd->ent)
-					R_TestAndDrawShadowVolume(ent, rd->origin, rd->cullradius, true);
-				/*
-				ent = r_refdef.entities[i];
-				if (ent != rd->ent && ent->model && ent->model->DrawShadowVolume && ent->maxs[0] >= mins[0] && ent->mins[0] <= maxs[0] && ent->maxs[1] >= mins[1] && ent->mins[1] <= maxs[1] && ent->maxs[2] >= mins[2] && ent->mins[2] <= maxs[2])
-				{
-					Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin);
-					ent->model->DrawShadowVolume (ent, relativelightorigin, rd->cullradius, true);
-				}
-				*/
+				if (mins[0] > p[0]) mins[0] = p[0];if (maxs[0] < p[0]) maxs[0] = p[0];
+				if (mins[1] > p[1]) mins[1] = p[1];if (maxs[1] < p[1]) maxs[1] = p[1];
+				if (mins[2] > p[2]) mins[2] = p[2];if (maxs[2] < p[2]) maxs[2] = p[2];
+			}
+			else
+			{
+				VectorCopy(p, mins);
+				VectorCopy(p, maxs);
 			}
+			if (mins[0] > p2[0]) mins[0] = p2[0];if (maxs[0] < p2[0]) maxs[0] = p2[0];
+			if (mins[1] > p2[1]) mins[1] = p2[1];if (maxs[1] < p2[1]) maxs[1] = p2[1];
+			if (mins[2] > p2[2]) mins[2] = p2[2];if (maxs[2] < p2[2]) maxs[2] = p2[2];
 		}
+		if (mins[0] >= clipmaxs[0] || maxs[0] <= clipmins[0]
+		 || mins[1] >= clipmaxs[1] || maxs[1] <= clipmins[1]
+		 || mins[2] >= clipmaxs[2] || maxs[2] <= clipmins[2]
+		 || LightAndVis_CullBox(mins, maxs))
+			return;
 	}
+	Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin);
+	ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius);
 }
 
+void R_Shadow_DrawWorldLightShadowVolume(matrix4x4_t *matrix, worldlight_t *light);
+
 #define SHADOWSPHERE_SEGMENTS 16
 
 shadowmesh_t *shadowsphere;
@@ -780,7 +762,7 @@ void R_CreateShadowSphere(void)
 	int i, j;
 	vec3_t angles, angles2, angles3, angles4;
 	float verts[12];
-	shadowsphere = Mod_ShadowMesh_Begin(zonemempool);
+	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++)
@@ -804,24 +786,13 @@ void R_CreateShadowSphere(void)
 			VectorScale(&verts[6], 1.0f, &verts[6]);
 			VectorScale(&verts[9], 1.0f, &verts[9]);
 			Mod_ShadowMesh_AddPolygon(zonemempool, shadowsphere, 4, verts);
-			/*
-			AngleVectorsFLU(angles, verts, NULL, NULL);
-			AngleVectorsFLU(angles2, verts + 3, NULL, NULL);
-			AngleVectorsFLU(angles3, verts + 6, NULL, NULL);
-			AngleVectorsFLU(angles4, verts + 9, NULL, NULL);
-			VectorScale(&verts[0], -4.0f, &verts[0]);
-			VectorScale(&verts[3], -4.0f, &verts[3]);
-			VectorScale(&verts[6], -4.0f, &verts[6]);
-			VectorScale(&verts[9], -4.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, int visiblevolume)
+void R_DrawShadowSphere(vec3_t origin, float cullradius, float lightradius)
 {
 	shadowmesh_t *mesh;
 	matrix4x4_t matrix;
@@ -833,7 +804,7 @@ void R_DrawShadowSphere(vec3_t origin, float cullradius, float lightradius, int
 	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, visiblevolume);
+		R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
 	}
 	Matrix4x4_CreateScale(&matrix, -cullradius);
 	Matrix4x4_ConcatTranslate(&matrix, origin[0], origin[1], origin[2]);
@@ -841,148 +812,273 @@ void R_DrawShadowSphere(vec3_t origin, float cullradius, float lightradius, int
 	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, visiblevolume);
+		R_Shadow_RenderVolume(mesh->numverts, mesh->numtriangles, mesh->elements);
 	}
 }
 
-void R_ShadowVolumeLighting (void)
+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;
-	vec3_t mins, maxs, relativelightorigin, relativeeyeorigin, lightcolor;
-	mlight_t *sl;
+	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;
 
-	R_Shadow_Stage_Begin();
-	for (lnum = 0, sl = cl.worldmodel->lights;lnum < cl.worldmodel->numlights;lnum++, sl++)
+	if (visiblevolumes)
 	{
-		if (d_lightstylevalue[sl->style] <= 0)
+		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;
-		if (r_light_debuglight.integer >= 0 && lnum != r_light_debuglight.integer)
+		cullradius = wl->cullradius;
+		lightradius = wl->lightradius;
+		if (R_CullSphere(wl->origin, lightradius))
 			continue;
-		VectorCopy(sl->mins, mins);
-		VectorCopy(sl->maxs, maxs);
-		if (R_CullBox(mins, maxs))
+		//if (R_CullBox(wl->mins, wl->maxs) || R_CullSphere(wl->origin, lightradius))
+		//	continue;
+		//if (VIS_CullBox(wl->mins, wl->maxs) || VIS_CullSphere(wl->origin, lightradius))
+		//	continue;
+		if (r_shadow_debuglight.integer >= 0 && lnum != r_shadow_debuglight.integer)
 			continue;
 
-		f = d_lightstylevalue[sl->style] * (1.0f / 32768.0f);
-		VectorScale(sl->light, f, lightcolor);
+		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];
+
+		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
+		for (i = 0;i < wl->numleafs;i++)
+			wl->leafs[i]->worldnodeframe = shadowframecount;
 
-		R_Shadow_Stage_ShadowVolumes();
-		R_DrawShadowSphere(sl->origin, sl->cullradius, sl->lightradius * 2, false);
-		if (sl->shadowvolume && r_staticworldlights.integer)
-			R_DrawWorldLightShadowVolume(sl, false);
+
+		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(&cl_entities[0].render, sl->origin, sl->cullradius, false);
+			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++)
 			{
 				ent = r_refdef.entities[i];
-				/*
-				if (ent->maxs[0] >= mins[0]
-				 && ent->mins[0] <= maxs[0]
-				 && ent->maxs[1] >= mins[1]
-				 && ent->mins[1] <= maxs[1]
-				 && ent->maxs[2] >= mins[2]
-				 && ent->mins[2] <= maxs[2])
-				*/
-					R_TestAndDrawShadowVolume(r_refdef.entities[i], sl->origin, sl->cullradius, false);
+				if (ent->model && !strcmp(ent->model->name, "progs/missile.mdl"))
+					R_TestAndDrawShadowVolume(ent, wl->origin, cullradius, lightradius, wl->mins, wl->maxs, clipmins, clipmaxs);
 			}
 		}
 
-		R_Shadow_Stage_Light();
-		ent = &cl_entities[0].render;
-		if (ent->model && ent->model->DrawLight)
+		if (!visiblevolumes)
 		{
-			Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
-			Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
-			ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, sl->lightradius, sl->distbias, sl->subtract, lightcolor);
+			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->visframe == r_framecount && ent->model && ent->model->DrawLight
-				/*
-				 && ent->maxs[0] >= mins[0]
-				 && ent->mins[0] <= maxs[0]
-				 && ent->maxs[1] >= mins[1]
-				 && ent->mins[1] <= maxs[1]
-				 && ent->maxs[2] >= mins[2]
-				 && ent->mins[2] <= maxs[2]*/)
+				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++)
 				{
-					Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
-					Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
-					ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, sl->lightradius, sl->distbias, sl->subtract, lightcolor);
+					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++)
 	{
-		mins[0] = rd->origin[0] - rd->cullradius;
-		maxs[0] = rd->origin[0] + rd->cullradius;
-		mins[1] = rd->origin[1] - rd->cullradius;
-		maxs[1] = rd->origin[1] + rd->cullradius;
-		mins[2] = rd->origin[2] - rd->cullradius;
-		maxs[2] = rd->origin[2] + rd->cullradius;
-		if (R_CullBox(mins, maxs))
+		cullradius = rd->cullradius;
+		lightradius = rd->cullradius;
+		if (VIS_CullSphere(rd->origin, lightradius))
 			continue;
 
-		R_Shadow_Stage_ShadowVolumes();
-		R_TestAndDrawShadowVolume(&cl_entities[0].render, rd->origin, rd->cullradius, false);
+		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->maxs[0] >= mins[0]
-				 && ent->mins[0] <= maxs[0]
-				 && ent->maxs[1] >= mins[1]
-				 && ent->mins[1] <= maxs[1]
-				 && ent->maxs[2] >= mins[2]
-				 && ent->mins[2] <= maxs[2])
-				*/
-					R_TestAndDrawShadowVolume(ent, rd->origin, rd->cullradius, false);
+				if (ent != rd->ent)
+					R_TestAndDrawShadowVolume(ent, rd->origin, cullradius, lightradius, clipmins, clipmaxs, clipmins, clipmaxs);
 			}
 		}
 
-		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, rd->cullradius, LIGHTOFFSET, rd->subtract, rd->light);
-		}
-		if (r_drawentities.integer)
+		if (!visiblevolumes)
 		{
-			for (i = 0;i < r_refdef.numentities;i++)
+			R_Shadow_Stage_Light();
+			ent = &cl_entities[0].render;
+			if (ent->model && ent->model->DrawLight)
 			{
-				ent = r_refdef.entities[i];
-				if (ent->visframe == r_framecount && ent->model && ent->model->DrawLight
-				/*
-				 && ent->maxs[0] >= mins[0]
-				 && ent->mins[0] <= maxs[0]
-				 && ent->maxs[1] >= mins[1]
-				 && ent->mins[1] <= maxs[1]
-				 && ent->maxs[2] >= mins[2]
-				 && ent->mins[2] <= maxs[2]*/)
+				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++)
 				{
-					Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin);
-					Matrix4x4_Transform(&ent->inversematrix, r_origin, relativeeyeorigin);
-					ent->model->DrawLight(ent, relativelightorigin, relativeeyeorigin, rd->cullradius, LIGHTOFFSET, rd->subtract, rd->light);
+					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);
+					}
 				}
 			}
 		}
 	}
 
-	R_Shadow_Stage_End();
+	if (!visiblevolumes)
+		R_Shadow_Stage_End();
+	qglEnable(GL_CULL_FACE);
+	qglDisable(GL_SCISSOR_TEST);
 }
 
 static void R_SetFrustum (void)
@@ -1079,6 +1175,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
@@ -1093,66 +1215,53 @@ void R_RenderView (void)
 	R_BuildLightList();
 	R_TimeReport("setup");
 
+	R_WorldVisibility(world);
+	R_TimeReport("worldvis");
+
 	R_FarClip_Start(r_origin, vpn, 768.0f);
 	R_MarkEntities();
-	r_farclip = R_FarClip_Finish() + 16384.0f;//256.0f;
+	r_farclip = R_FarClip_Finish() + 256.0f;
 	R_TimeReport("markentity");
 
 	GL_SetupView_ViewPort(r_refdef.x, r_refdef.y, r_refdef.width, r_refdef.height);
-	//GL_SetupView_Mode_Perspective(r_refdef.fov_x, r_refdef.fov_y, 1.0f, r_farclip);
-	GL_SetupView_Mode_PerspectiveInfiniteFarClip(r_refdef.fov_x, r_refdef.fov_y, 1.0f);
+	if (r_shadow_lightingmode > 0)
+		GL_SetupView_Mode_PerspectiveInfiniteFarClip(r_refdef.fov_x, r_refdef.fov_y, 1.0f);
+	else
+		GL_SetupView_Mode_Perspective(r_refdef.fov_x, r_refdef.fov_y, 1.0f, r_farclip);
 	GL_SetupView_Orientation_FromEntity (r_refdef.vieworg, r_refdef.viewangles);
 	qglDepthFunc(GL_LEQUAL);
 
 	R_Mesh_Start();
 	R_MeshQueue_BeginScene();
 
-	if (r_shadows.integer == 3)
-	{
-		if (!gl_texturecubemap)
-		{
-			Con_Printf("Cubemap texture support not detected, turning off r_shadows 3\n");
-			Cvar_SetValueQuick(&r_shadows, 0);
-		}
-		else if (!gl_dot3arb)
-		{
-			Con_Printf("Bumpmapping support not detected, turning off r_shadows 3\n");
-			Cvar_SetValueQuick(&r_shadows, 0);
-		}
-		else if (!gl_stencil)
-		{
-			Con_Printf("Stencil not enabled, turning off r_shadows 3, please type vid_stencil 1;vid_restart and try again\n");
-			Cvar_SetValueQuick(&r_shadows, 0);
-		}
-		else if (!gl_combine.integer)
-		{
-			Con_Printf("Combine disabled, please turn on gl_combine, turning off r_shadows 3\n");
-			Cvar_SetValueQuick(&r_shadows, 0);
-		}
-	}
+	if (r_shadow_lightingmode)
+		R_Shadow_UpdateWorldLightSelection();
 
 	if (R_DrawBrushModelsSky())
 		R_TimeReport("bmodelsky");
 
 	// must occur early because it can draw sky
-	R_DrawWorld(world, r_shadows.integer == 3);
+	R_DrawWorld(world);
 	R_TimeReport("world");
 
 	// don't let sound skip if going slow
 	if (!intimerefresh && !r_speeds.integer)
 		S_ExtraUpdate ();
 
-	R_DrawModels(r_shadows.integer == 3);
+	R_DrawModels(r_shadow_lightingmode > 0);
 	R_TimeReport("models");
 
-	if (r_shadows.integer == 1)
+	if (r_shadows.integer == 1 && r_shadow_lightingmode <= 0)
 	{
 		R_DrawFakeShadows();
-		R_TimeReport("fakeshadows");
+		R_TimeReport("fakeshadow");
 	}
 
-	if (r_shadows.integer == 3)
-		R_ShadowVolumeLighting();
+	if (r_shadow_lightingmode > 0)
+	{
+		R_ShadowVolumeLighting(false);
+		R_TimeReport("dynlight");
+	}
 
 	R_DrawParticles();
 	R_TimeReport("particles");
@@ -1174,10 +1283,10 @@ void R_RenderView (void)
 
 	R_MeshQueue_Render();
 	R_MeshQueue_EndScene();
-	if (r_shadows.integer == 2)
+	if (r_shadow_realtime.integer >= 2)
 	{
-		R_DrawShadowVolumes();
-		R_TimeReport("shadowvolumes");
+		R_ShadowVolumeLighting(true);
+		R_TimeReport("shadowvolume");
 	}
 	R_Mesh_Finish();
 	R_TimeReport("meshfinish");
@@ -1299,7 +1408,7 @@ void R_DrawNoModel(entity_render_t *ent)
 	//	R_DrawNoModelCallback(ent, 0);
 }
 
-void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width)
+void R_CalcBeamVerts (float *vert, const vec3_t org1, const vec3_t org2, float width)
 {
 	vec3_t right1, right2, diff, normal;