X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rsurf.c;h=8bd97db0059795a0b58b784d5022712e51106c44;hp=9cdd6cf64068f2eac009bc191dbba720ac585888;hb=bc34558e2a1bb9e832ca15701811e19cf9926291;hpb=59e91e85a8f84adf31e1c3e69b7089b77098b24e

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 9cdd6cf6..8bd97db0 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // r_surf.c: surface-related refresh code
 
 #include "quakedef.h"
+#include "r_shadow.h"
 
 #define MAX_LIGHTMAP_SIZE 256
 
@@ -39,24 +40,12 @@ cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "0"};
 
 static int dlightdivtable[32768];
 
-// variables used by R_PVSUpdate
-int r_pvsframecount = 0;
-mleaf_t *r_pvsviewleaf = NULL;
-int r_pvsviewleafnovis = 0;
-
 static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 {
-	int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract;
+	int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract, k;
 	unsigned int *bl;
 	float dist, impact[3], local[3];
 
-	// LordHavoc: use 64bit integer...  shame it's not very standardized...
-#if _MSC_VER || __BORLANDC__
-	__int64     k;
-#else
-	long long   k;
-#endif
-
 	lit = false;
 
 	smax = (surf->extents[0] >> 4) + 1;
@@ -108,9 +97,9 @@ static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 		maxdist3 = maxdist - dist2;
 
 		// convert to 8.8 blocklights format
-		red = r_dlight[lnum].light[0];
-		green = r_dlight[lnum].light[1];
-		blue = r_dlight[lnum].light[2];
+		red = r_dlight[lnum].light[0] * (1.0f / 128.0f);
+		green = r_dlight[lnum].light[1] * (1.0f / 128.0f);
+		blue = r_dlight[lnum].light[2] * (1.0f / 128.0f);
 		subtract = (int) (r_dlight[lnum].subtract * 4194304.0f);
 		bl = intblocklights;
 
@@ -129,9 +118,9 @@ static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 						k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract;
 						if (k > 0)
 						{
-							bl[0] += (red   * k) >> 7;
-							bl[1] += (green * k) >> 7;
-							bl[2] += (blue  * k) >> 7;
+							bl[0] += (red   * k);
+							bl[1] += (green * k);
+							bl[2] += (blue  * k);
 							lit = true;
 						}
 					}
@@ -252,7 +241,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int d
 
 		// update cached lighting info
 		surf->cached_dlight = 0;
-		surf->cached_lightscalebit = lightscalebit;
+		surf->cached_lightmapscalebit = r_lightmapscalebit;
 		surf->cached_ambient = r_ambient.value;
 		surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
 		surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
@@ -307,7 +296,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int d
 		bl = intblocklights;
 		out = templight;
 		// deal with lightmap brightness scale
-		shift = 7 + lightscalebit + 8;
+		shift = 7 + r_lightmapscalebit + 8;
 		if (ent->model->lightmaprgba)
 		{
 			stride = (surf->lightmaptexturestride - smax) * 4;
@@ -346,7 +335,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int d
 
 		// update cached lighting info
 		surf->cached_dlight = 0;
-		surf->cached_lightscalebit = lightscalebit;
+		surf->cached_lightmapscalebit = r_lightmapscalebit;
 		surf->cached_ambient = r_ambient.value;
 		surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
 		surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
@@ -397,7 +386,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int d
 		bl = floatblocklights;
 		out = templight;
 		// deal with lightmap brightness scale
-		scale = 1.0f / (1 << (7 + lightscalebit + 8));
+		scale = 1.0f / (1 << (7 + r_lightmapscalebit + 8));
 		if (ent->model->lightmaprgba)
 		{
 			stride = (surf->lightmaptexturestride - smax) * 4;
@@ -430,30 +419,16 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf, int d
 	}
 }
 
-void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8])
+void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, float fcolor[8])
 {
-	float ndist;
+	float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2;
 	msurface_t *surf, *endsurf;
-	int sdtable[256], td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, dist2, impacts, impactt, subtract, a, stained, cr, cg, cb, ca, ratio;
+	int i, s, t, smax, tmax, smax3, impacts, impactt, stained;
 	qbyte *bl;
 	vec3_t impact;
-	// LordHavoc: use 64bit integer...  shame it's not very standardized...
-#if _MSC_VER || __BORLANDC__
-	__int64     k;
-#else
-	long long   k;
-#endif
-
 
-	// for comparisons to minimum acceptable light
-	// compensate for 256 offset
-	maxdist = radius * radius + 256.0f;
-
-	// clamp radius to avoid exceeding 32768 entry division table
-	if (maxdist > 4194304)
-		maxdist = 4194304;
-
-	subtract = (int) ((1.0f / maxdist) * 4194304.0f);
+	maxdist = radius * radius;
+	invradius = 1.0f / radius;
 
 loc0:
 	if (node->contents < 0)
@@ -470,89 +445,78 @@ loc0:
 		goto loc0;
 	}
 
-	dist2 = ndist * ndist + 256.0f;
-	if (dist2 < maxdist)
-	{
-		maxdist3 = maxdist - dist2;
+	dist2 = ndist * ndist;
+	maxdist3 = maxdist - dist2;
 
-		if (node->plane->type < 3)
-		{
-			VectorCopy(origin, impact);
-			impact[node->plane->type] -= ndist;
-		}
-		else
-		{
-			impact[0] = origin[0] - node->plane->normal[0] * ndist;
-			impact[1] = origin[1] - node->plane->normal[1] * ndist;
-			impact[2] = origin[2] - node->plane->normal[2] * ndist;
-		}
+	if (node->plane->type < 3)
+	{
+		VectorCopy(origin, impact);
+		impact[node->plane->type] -= ndist;
+	}
+	else
+	{
+		impact[0] = origin[0] - node->plane->normal[0] * ndist;
+		impact[1] = origin[1] - node->plane->normal[1] * ndist;
+		impact[2] = origin[2] - node->plane->normal[2] * ndist;
+	}
 
-		for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
+	for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
+	{
+		if (surf->stainsamples)
 		{
-			if (surf->stainsamples)
-			{
-				smax = (surf->extents[0] >> 4) + 1;
-				tmax = (surf->extents[1] >> 4) + 1;
+			smax = (surf->extents[0] >> 4) + 1;
+			tmax = (surf->extents[1] >> 4) + 1;
 
-				impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
-				impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
+			impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
+			impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
 
-				s = bound(0, impacts, smax * 16) - impacts;
-				t = bound(0, impactt, tmax * 16) - impactt;
-				i = s * s + t * t + dist2;
-				if (i > maxdist)
-					continue;
+			s = bound(0, impacts, smax * 16) - impacts;
+			t = bound(0, impactt, tmax * 16) - impactt;
+			i = s * s + t * t + dist2;
+			if (i > maxdist)
+				continue;
 
-				// reduce calculations
-				for (s = 0, i = impacts; s < smax; s++, i -= 16)
-					sdtable[s] = i * i + dist2;
+			// reduce calculations
+			for (s = 0, i = impacts; s < smax; s++, i -= 16)
+				sdtable[s] = i * i + dist2;
 
-				// convert to 8.8 blocklights format
-				bl = surf->stainsamples;
-				smax3 = smax * 3;
-				stained = false;
+			bl = surf->stainsamples;
+			smax3 = smax * 3;
+			stained = false;
 
-				i = impactt;
-				for (t = 0;t < tmax;t++, i -= 16)
+			i = impactt;
+			for (t = 0;t < tmax;t++, i -= 16)
+			{
+				td = i * i;
+				// make sure some part of it is visible on this line
+				if (td < maxdist3)
 				{
-					td = i * i;
-					// make sure some part of it is visible on this line
-					if (td < maxdist3)
+					maxdist2 = maxdist - td;
+					for (s = 0;s < smax;s++)
 					{
-						maxdist2 = maxdist - td;
-						for (s = 0;s < smax;s++)
+						if (sdtable[s] < maxdist2)
 						{
-							if (sdtable[s] < maxdist2)
+							ratio = lhrandom(0.0f, 1.0f);
+							a = (fcolor[3] + ratio * fcolor[7]) * (1.0f - sqrt(sdtable[s] + td) * invradius);
+							if (a >= (1.0f / 64.0f))
 							{
-								k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract;
-								if (k > 0)
-								{
-									ratio = rand() & 255;
-									ca = (((icolor[7] - icolor[3]) * ratio) >> 8) + icolor[3];
-									a = (ca * k) >> 8;
-									if (a > 0)
-									{
-										a = bound(0, a, 256);
-										cr = (((icolor[4] - icolor[0]) * ratio) >> 8) + icolor[0];
-										cg = (((icolor[5] - icolor[1]) * ratio) >> 8) + icolor[1];
-										cb = (((icolor[6] - icolor[2]) * ratio) >> 8) + icolor[2];
-										bl[0] = (qbyte) ((((cr - (int) bl[0]) * a) >> 8) + (int) bl[0]);
-										bl[1] = (qbyte) ((((cg - (int) bl[1]) * a) >> 8) + (int) bl[1]);
-										bl[2] = (qbyte) ((((cb - (int) bl[2]) * a) >> 8) + (int) bl[2]);
-										stained = true;
-									}
-								}
+								if (a > 1)
+									a = 1;
+								bl[0] = (qbyte) ((float) bl[0] + a * ((fcolor[0] + ratio * fcolor[4]) - (float) bl[0]));
+								bl[1] = (qbyte) ((float) bl[1] + a * ((fcolor[1] + ratio * fcolor[5]) - (float) bl[1]));
+								bl[2] = (qbyte) ((float) bl[2] + a * ((fcolor[2] + ratio * fcolor[6]) - (float) bl[2]));
+								stained = true;
 							}
-							bl += 3;
 						}
+						bl += 3;
 					}
-					else // skip line
-						bl += smax3;
 				}
-				// force lightmap upload
-				if (stained)
-					surf->cached_dlight = true;
+				else // skip line
+					bl += smax3;
 			}
+			// force lightmap upload
+			if (stained)
+				surf->cached_dlight = true;
 		}
 	}
 
@@ -560,7 +524,7 @@ loc0:
 	{
 		if (node->children[1]->contents >= 0)
 		{
-			R_StainNode(node->children[0], model, origin, radius, icolor);
+			R_StainNode(node->children[0], model, origin, radius, fcolor);
 			node = node->children[1];
 			goto loc0;
 		}
@@ -579,22 +543,23 @@ loc0:
 
 void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2)
 {
-	int n, icolor[8];
+	int n;
+	float fcolor[8];
 	entity_render_t *ent;
 	model_t *model;
 	vec3_t org;
-	icolor[0] = cr1;
-	icolor[1] = cg1;
-	icolor[2] = cb1;
-	icolor[3] = ca1;
-	icolor[4] = cr2;
-	icolor[5] = cg2;
-	icolor[6] = cb2;
-	icolor[7] = ca2;
+	fcolor[0] = cr1;
+	fcolor[1] = cg1;
+	fcolor[2] = cb1;
+	fcolor[3] = ca1 * (1.0f / 64.0f);
+	fcolor[4] = cr2 - cr1;
+	fcolor[5] = cg2 - cg1;
+	fcolor[6] = cb2 - cb1;
+	fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f);
 
 	model = cl.worldmodel;
 	if (model)
-		R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor);
+		R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, fcolor);
 
 	// look for embedded bmodels
 	for (n = 0;n < cl_num_brushmodel_entities;n++)
@@ -607,7 +572,7 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i
 			if (model->type == mod_brush)
 			{
 				Matrix4x4_Transform(&ent->inversematrix, origin, org);
-				R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor);
+				R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, fcolor);
 			}
 		}
 	}
@@ -782,7 +747,7 @@ static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, co
 	return false;
 }
 
-static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
@@ -805,6 +770,9 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture
 	memset(&m, 0, sizeof(m));
 	if (skyrendermasked)
 	{
+		qglColorMask(0,0,0,0);
+		// just to make sure that braindead drivers don't draw anything
+		// despite that colormask...
 		m.blendfunc1 = GL_ZERO;
 		m.blendfunc2 = GL_ONE;
 	}
@@ -814,44 +782,46 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture
 		m.blendfunc1 = GL_ONE;
 		m.blendfunc2 = GL_ZERO;
 	}
-	m.wantoverbright = false;
 	m.depthwrite = true;
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+		if (surf->visframe == r_framecount)
 		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			if (skyrendermasked)
-				memset(varray_color, 0, mesh->numverts * sizeof(float[4]));
-			else
-				R_FillColors(varray_color, mesh->numverts, fogcolor[0] * mesh_colorscale, fogcolor[1] * mesh_colorscale, fogcolor[2] * mesh_colorscale, 1);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_colorscale, 1);
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
+	qglColorMask(1,1,1,1);
 }
 
 static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 {
 	const entity_render_t *ent = calldata1;
 	const msurface_t *surf = ent->model->surfaces + calldata2;
-	float f;
+	float f, colorscale;
 	const surfmesh_t *mesh;
 	rmeshstate_t m;
-	float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
+	float alpha = ent->alpha * (surf->flags & SURF_WATERALPHA ? r_wateralpha.value : 1);
 	float modelorg[3];
+	texture_t *texture;
 	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
 
 	R_Mesh_Matrix(&ent->matrix);
 
 	memset(&m, 0, sizeof(m));
-	if (ent->effects & EF_ADDITIVE)
+	texture = surf->texinfo->texture->currentframe[ent->frame != 0];
+	if (texture->rendertype == SURFRENDER_ADD)
 	{
 		m.blendfunc1 = GL_SRC_ALPHA;
 		m.blendfunc2 = GL_ONE;
 	}
-	else if (surf->currenttexture->fogtexture != NULL || alpha < 1)
+	else if (texture->rendertype == SURFRENDER_ALPHA)
 	{
 		m.blendfunc1 = GL_SRC_ALPHA;
 		m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
@@ -861,14 +831,20 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 		m.blendfunc1 = GL_ONE;
 		m.blendfunc2 = GL_ZERO;
 	}
-	m.wantoverbright = true;
-	m.tex[0] = R_GetTexture(surf->currenttexture->texture);
+	m.tex[0] = R_GetTexture(texture->texture);
+	colorscale = r_colorscale;
+	if (gl_combine.integer)
+	{
+		m.texrgbscale[0] = 4;
+		colorscale *= 0.25f;
+	}
 	R_Mesh_State(&m);
+	GL_UseColorArray();
 	for (mesh = surf->mesh;mesh;mesh = mesh->chain)
 	{
 		R_Mesh_ResizeCheck(mesh->numverts);
 		memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-		memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+		memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
 		f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f);
 		R_FillColors(varray_color, mesh->numverts, f, f, f, alpha);
 		if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT))
@@ -878,7 +854,7 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 			if (surf->flags & SURF_LIGHTMAP)
 				RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, varray_color, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
 		}
-		RSurf_FogColors(varray_vertex, varray_color, mesh_colorscale, mesh->numverts, modelorg);
+		RSurf_FogColors(varray_vertex, varray_color, colorscale, mesh->numverts, modelorg);
 		R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
 	}
 
@@ -887,52 +863,57 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 		memset(&m, 0, sizeof(m));
 		m.blendfunc1 = GL_SRC_ALPHA;
 		m.blendfunc2 = GL_ONE;
-		m.wantoverbright = false;
-		m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
+		m.tex[0] = R_GetTexture(texture->fogtexture);
 		R_Mesh_State(&m);
 		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
 		{
 			R_Mesh_ResizeCheck(mesh->numverts);
 			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
 			if (m.tex[0])
-				memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, mesh_colorscale, mesh->numverts, modelorg);
+				memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+			RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], alpha, r_colorscale, mesh->numverts, modelorg);
 			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
 		}
 	}
 }
 
-static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_Water(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	vec3_t center;
-	if ((r_wateralpha.value < 1 && !(texture->flags & SURF_DRAWNOALPHA)) || ent->effects & EF_ADDITIVE || texture->fogtexture)
+	if (texture->rendertype != SURFRENDER_OPAQUE)
 	{
-		for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+		for (surf = firstsurf;surf;surf = surf->texturechain)
 		{
-			Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
-			R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces);
+			if (surf->visframe == r_framecount)
+			{
+				Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+				R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->surfaces);
+			}
 		}
 	}
 	else
-		for (surf = texture->surfacechain;surf;surf = surf->texturechain)
-			RSurfShader_Water_Callback(ent, surf - ent->model->surfaces);
+		for (surf = firstsurf;surf;surf = surf->texturechain)
+			if (surf->visframe == r_framecount)
+				RSurfShader_Water_Callback(ent, surf - ent->model->surfaces);
 }
 
 static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf)
 {
-	float base;
+	float base, colorscale;
 	const surfmesh_t *mesh;
 	rmeshstate_t m;
 	float modelorg[3];
+	texture_t *texture;
 	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
 	memset(&m, 0, sizeof(m));
-	if (ent->effects & EF_ADDITIVE)
+	texture = surf->texinfo->texture->currentframe[ent->frame != 0];
+	if (texture->rendertype == SURFRENDER_ADD)
 	{
 		m.blendfunc1 = GL_SRC_ALPHA;
 		m.blendfunc2 = GL_ONE;
 	}
-	else if (surf->currenttexture->fogtexture != NULL || ent->alpha < 1)
+	else if (texture->rendertype == SURFRENDER_ALPHA)
 	{
 		m.blendfunc1 = GL_SRC_ALPHA;
 		m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
@@ -942,15 +923,21 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
 		m.blendfunc1 = GL_ONE;
 		m.blendfunc2 = GL_ZERO;
 	}
-	m.wantoverbright = true;
-	m.tex[0] = R_GetTexture(surf->currenttexture->texture);
+	m.tex[0] = R_GetTexture(texture->texture);
+	colorscale = r_colorscale;
+	if (gl_combine.integer)
+	{
+		m.texrgbscale[0] = 4;
+		colorscale *= 0.25f;
+	}
 	base = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f);
 	R_Mesh_State(&m);
+	GL_UseColorArray();
 	for (mesh = surf->mesh;mesh;mesh = mesh->chain)
 	{
 		R_Mesh_ResizeCheck(mesh->numverts);
 		memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-		memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+		memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
 		R_FillColors(varray_color, mesh->numverts, base, base, base, ent->alpha);
 		if (!(ent->effects & EF_FULLBRIGHT))
 		{
@@ -959,42 +946,7 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
 			if (surf->flags & SURF_LIGHTMAP)
 				RSurf_AddLightmapToVertexColors(mesh->lightmapoffsets, varray_color, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
 		}
-		RSurf_FogColors(varray_vertex, varray_color, mesh_colorscale, mesh->numverts, modelorg);
-		R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
-	}
-}
-
-static void RSurfShader_Wall_Pass_BaseFullbright(const entity_render_t *ent, const msurface_t *surf)
-{
-	const surfmesh_t *mesh;
-	rmeshstate_t m;
-	float modelorg[3];
-	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
-	memset(&m, 0, sizeof(m));
-	if (ent->effects & EF_ADDITIVE)
-	{
-		m.blendfunc1 = GL_SRC_ALPHA;
-		m.blendfunc2 = GL_ONE;
-	}
-	else if (surf->currenttexture->fogtexture != NULL || ent->alpha < 1)
-	{
-		m.blendfunc1 = GL_SRC_ALPHA;
-		m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-	}
-	else
-	{
-		m.blendfunc1 = GL_ONE;
-		m.blendfunc2 = GL_ZERO;
-	}
-	m.wantoverbright = false;
-	m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-	R_Mesh_State(&m);
-	for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-	{
-		R_Mesh_ResizeCheck(mesh->numverts);
-		memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-		memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-		RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, ent->alpha, mesh_colorscale, mesh->numverts, modelorg);
+		RSurf_FogColors(varray_vertex, varray_color, colorscale, mesh->numverts, modelorg);
 		R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
 	}
 }
@@ -1004,19 +956,21 @@ static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurfac
 	const surfmesh_t *mesh;
 	rmeshstate_t m;
 	float modelorg[3];
+	texture_t *texture;
+	texture = surf->texinfo->texture->currentframe[ent->frame != 0];
 	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_SRC_ALPHA;
 	m.blendfunc2 = GL_ONE;
-	m.wantoverbright = false;
-	m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
+	m.tex[0] = R_GetTexture(texture->glowtexture);
 	R_Mesh_State(&m);
+	GL_UseColorArray();
 	for (mesh = surf->mesh;mesh;mesh = mesh->chain)
 	{
 		R_Mesh_ResizeCheck(mesh->numverts);
 		memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-		memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-		RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, ent->alpha, mesh_colorscale, mesh->numverts, modelorg);
+		memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+		RSurf_FoggedColors(varray_vertex, varray_color, 1, 1, 1, ent->alpha, r_colorscale, mesh->numverts, modelorg);
 		R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
 	}
 }
@@ -1026,25 +980,27 @@ static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface
 	const surfmesh_t *mesh;
 	rmeshstate_t m;
 	float modelorg[3];
+	texture_t *texture;
+	texture = surf->texinfo->texture->currentframe[ent->frame != 0];
 	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_SRC_ALPHA;
 	m.blendfunc2 = GL_ONE;
-	m.wantoverbright = false;
-	m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
+	m.tex[0] = R_GetTexture(texture->fogtexture);
 	R_Mesh_State(&m);
+	GL_UseColorArray();
 	for (mesh = surf->mesh;mesh;mesh = mesh->chain)
 	{
 		R_Mesh_ResizeCheck(mesh->numverts);
 		memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
 		if (m.tex[0])
-			memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-		RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha, mesh_colorscale, mesh->numverts, modelorg);
+			memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+		RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha, r_colorscale, mesh->numverts, modelorg);
 		R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
@@ -1054,72 +1010,76 @@ static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_ONE;
 	m.blendfunc2 = GL_ZERO;
-	//m.wantoverbright = false;
 	m.tex[0] = R_GetTexture(texture->texture);
-	m.tex[1] = R_GetTexture(texture->surfacechain->lightmaptexture);
+	m.tex[1] = R_GetTexture(firstsurf->lightmaptexture);
 	m.tex[2] = R_GetTexture(texture->detailtexture);
 	m.texrgbscale[0] = 1;
 	m.texrgbscale[1] = 4;
 	m.texrgbscale[2] = 2;
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	cl = (float) (1 << r_lightmapscalebit) * r_colorscale;
+	GL_Color(cl, cl, cl, 1);
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-		if (m.tex[1] != lightmaptexturenum)
+		if (surf->visframe == r_framecount)
 		{
-			m.tex[1] = lightmaptexturenum;
-			R_Mesh_State(&m);
-		}
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			memcpy(varray_texcoord[1], mesh->uv, mesh->numverts * sizeof(float[2]));
-			memcpy(varray_texcoord[2], mesh->ab, mesh->numverts * sizeof(float[2]));
-			cl = (float) (1 << lightscalebit) * mesh_colorscale;
-			R_FillColors(varray_color, mesh->numverts, cl, cl, cl, 1);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+			if (m.tex[1] != lightmaptexturenum)
+			{
+				m.tex[1] = lightmaptexturenum;
+				R_Mesh_State(&m);
+			}
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[1], mesh->uvw, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[2], mesh->abc, mesh->numverts * sizeof(float[4]));
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
 	rmeshstate_t m;
 	int lightmaptexturenum;
-	float cl;
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_ONE;
 	m.blendfunc2 = GL_ZERO;
-	m.wantoverbright = true;
 	m.tex[0] = R_GetTexture(texture->texture);
-	m.tex[1] = R_GetTexture(texture->surfacechain->lightmaptexture);
+	m.tex[1] = R_GetTexture(firstsurf->lightmaptexture);
+	if (gl_combine.integer)
+		m.texrgbscale[1] = 4;
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-		if (m.tex[1] != lightmaptexturenum)
+		if (surf->visframe == r_framecount)
 		{
-			m.tex[1] = lightmaptexturenum;
-			R_Mesh_State(&m);
-		}
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			memcpy(varray_texcoord[1], mesh->uv, mesh->numverts * sizeof(float[2]));
-			cl = (float) (1 << lightscalebit) * mesh_colorscale;
-			R_FillColors(varray_color, mesh->numverts, cl, cl, cl, 1);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+			if (m.tex[1] != lightmaptexturenum)
+			{
+				m.tex[1] = lightmaptexturenum;
+				R_Mesh_State(&m);
+			}
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[1], mesh->uvw, mesh->numverts * sizeof(float[4]));
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
@@ -1127,70 +1087,81 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent,
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_ONE;
 	m.blendfunc2 = GL_ZERO;
-	//m.wantoverbright = false;
 	m.tex[0] = R_GetTexture(texture->texture);
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	GL_Color(1, 1, 1, 1);
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+		if (surf->visframe == r_framecount)
 		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			R_FillColors(varray_color, mesh->numverts, 1, 1, 1, 1);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
 	rmeshstate_t m;
 	int lightmaptexturenum;
-	float cl;
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_ZERO;
 	m.blendfunc2 = GL_SRC_COLOR;
-	m.wantoverbright = true;
-	m.tex[0] = R_GetTexture(texture->surfacechain->lightmaptexture);
+	m.tex[0] = R_GetTexture(firstsurf->lightmaptexture);
+	if (gl_combine.integer)
+		m.texrgbscale[0] = 4;
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
-		if (m.tex[0] != lightmaptexturenum)
+		if (surf->visframe == r_framecount)
 		{
-			m.tex[0] = lightmaptexturenum;
-			R_Mesh_State(&m);
-		}
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			memcpy(varray_texcoord[0], mesh->uv, mesh->numverts * sizeof(float[2]));
-			cl = (float) (1 << lightscalebit) * mesh_colorscale;
-			R_FillColors(varray_color, mesh->numverts, cl, cl, cl, 1);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+			if (m.tex[0] != lightmaptexturenum)
+			{
+				m.tex[0] = lightmaptexturenum;
+				R_Mesh_State(&m);
+			}
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[0], mesh->uvw, mesh->numverts * sizeof(float[4]));
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
+	float colorscale;
 	rmeshstate_t m;
 
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_SRC_ALPHA;
 	m.blendfunc2 = GL_ONE;
-	m.wantoverbright = true;
 	m.tex[0] = R_GetTexture(texture->texture);
+	colorscale = r_colorscale;
+	if (gl_combine.integer)
+	{
+		m.texrgbscale[0] = 4;
+		colorscale *= 0.25f;
+	}
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	GL_UseColorArray();
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		if (surf->dlightframe == r_framecount)
+		if (surf->visframe == r_framecount && surf->dlightframe == r_framecount)
 		{
 			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
 			{
@@ -1198,10 +1169,10 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const
 				{
 					R_Mesh_ResizeCheck(mesh->numverts);
 					memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-					memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
+					memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
 					R_FillColors(varray_color, mesh->numverts, 0, 0, 0, 1);
 					RSurf_LightSeparate(&ent->inversematrix, surf->dlightbits, mesh->numverts, varray_vertex, varray_color);
-					RSurf_ScaleColors(varray_color, mesh_colorscale, mesh->numverts);
+					RSurf_ScaleColors(varray_color, colorscale, mesh->numverts);
 					R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
 				}
 			}
@@ -1209,7 +1180,7 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
@@ -1219,24 +1190,26 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const te
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_SRC_ALPHA;
 	m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-	//m.wantoverbright = false;
-	//m.tex[0] = 0;
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	GL_UseColorArray();
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+		if (surf->visframe == r_framecount)
 		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			if (m.tex[0])
-				memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], 1, mesh_colorscale, mesh->numverts, modelorg);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				if (m.tex[0])
+					memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+				RSurf_FogPassColors(varray_vertex, varray_color, fogcolor[0], fogcolor[1], fogcolor[2], 1, r_colorscale, mesh->numverts, modelorg);
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
@@ -1244,23 +1217,25 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_DST_COLOR;
 	m.blendfunc2 = GL_SRC_COLOR;
-	//m.wantoverbright = false;
 	m.tex[0] = R_GetTexture(texture->detailtexture);
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	GL_Color(1, 1, 1, 1);
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+		if (surf->visframe == r_framecount)
 		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			memcpy(varray_texcoord[0], mesh->ab, mesh->numverts * sizeof(float[2]));
-			R_FillColors(varray_color, mesh->numverts, 1, 1, 1, 1);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[0], mesh->abc, mesh->numverts * sizeof(float[4]));
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
 }
 
-static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	const surfmesh_t *mesh;
@@ -1268,95 +1243,105 @@ static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const t
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_SRC_ALPHA;
 	m.blendfunc2 = GL_ONE;
-	//m.wantoverbright = false;
 	m.tex[0] = R_GetTexture(texture->glowtexture);
 	R_Mesh_State(&m);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+		if (surf->visframe == r_framecount)
 		{
-			R_Mesh_ResizeCheck(mesh->numverts);
-			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
-			memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			R_FillColors(varray_color, mesh->numverts, mesh_colorscale, mesh_colorscale, mesh_colorscale, 1);
-			R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
 }
 
-static void RSurfShader_Wall_Fullbright_Callback(const void *calldata1, int calldata2)
-{
-	const entity_render_t *ent = calldata1;
-	const msurface_t *surf = ent->model->surfaces + calldata2;
-	R_Mesh_Matrix(&ent->matrix);
-	RSurfShader_Wall_Pass_BaseFullbright(ent, surf);
-	if (surf->currenttexture->glowtexture)
-		RSurfShader_Wall_Pass_Glow(ent, surf);
-	if (fogenabled)
-		RSurfShader_Wall_Pass_Fog(ent, surf);
-}
-
-static void RSurfShader_Wall_Fullbright(const entity_render_t *ent, const texture_t *texture)
+static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
-	vec3_t center;
-	if (ent->effects & EF_ADDITIVE || ent->alpha < 1 || texture->fogtexture != NULL)
+	const surfmesh_t *mesh;
+	rmeshstate_t m;
+	memset(&m, 0, sizeof(m));
+	m.blendfunc1 = GL_SRC_ALPHA;
+	m.blendfunc2 = GL_ZERO;
+	m.tex[0] = R_GetTexture(texture->glowtexture);
+	R_Mesh_State(&m);
+	if (m.tex[0])
+		GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+	else
+		GL_Color(0, 0, 0, 1);
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+		if (surf->visframe == r_framecount)
 		{
-			Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
-			R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Fullbright_Callback, ent, surf - ent->model->surfaces);
+			for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+			{
+				R_Mesh_ResizeCheck(mesh->numverts);
+				memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+				memcpy(varray_texcoord[0], mesh->str, mesh->numverts * sizeof(float[4]));
+				R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
+			}
 		}
 	}
-	else
-	{
-		for (surf = texture->surfacechain;surf;surf = surf->texturechain)
-			RSurfShader_Wall_Pass_BaseFullbright(ent, surf);
-		if (texture->glowtexture)
-			for (surf = texture->surfacechain;surf;surf = surf->texturechain)
-				RSurfShader_Wall_Pass_Glow(ent, surf);
-		if (fogenabled)
-			for (surf = texture->surfacechain;surf;surf = surf->texturechain)
-				RSurfShader_Wall_Pass_Fog(ent, surf);
-	}
 }
 
 static void RSurfShader_Wall_Vertex_Callback(const void *calldata1, int calldata2)
 {
 	const entity_render_t *ent = calldata1;
 	const msurface_t *surf = ent->model->surfaces + calldata2;
+	texture_t *texture;
+	texture = surf->texinfo->texture->currentframe[ent->frame != 0];
 	R_Mesh_Matrix(&ent->matrix);
 	RSurfShader_Wall_Pass_BaseVertex(ent, surf);
-	if (surf->currenttexture->glowtexture)
+	if (texture->glowtexture)
 		RSurfShader_Wall_Pass_Glow(ent, surf);
 	if (fogenabled)
 		RSurfShader_Wall_Pass_Fog(ent, surf);
 }
 
-static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_t *texture)
+extern cvar_t r_shadows;
+static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_t *texture, const msurface_t *firstsurf)
 {
 	const msurface_t *surf;
 	vec3_t center;
-	if (ent->effects & EF_ADDITIVE || ent->alpha < 1 || texture->fogtexture != NULL)
+	if (texture->rendertype != SURFRENDER_OPAQUE)
 	{
 		// transparent vertex shaded from lightmap
-		for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+		for (surf = firstsurf;surf;surf = surf->texturechain)
 		{
-			Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
-			R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+			if (surf->visframe == r_framecount)
+			{
+				Matrix4x4_Transform(&ent->matrix, surf->poly_center, center);
+				R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->surfaces);
+			}
 		}
 	}
+	else if (r_shadows.integer == 3 && cl.worldmodel->numlights)
+	{
+		// opaque base lighting
+		RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, firstsurf);
+		if (fogenabled)
+			RSurfShader_OpaqueWall_Pass_Fog(ent, texture, firstsurf);
+	}
 	else if (r_vertexsurfaces.integer)
 	{
 		// opaque vertex shaded from lightmap
-		for (surf = texture->surfacechain;surf;surf = surf->texturechain)
-			RSurfShader_Wall_Pass_BaseVertex(ent, surf);
+		for (surf = firstsurf;surf;surf = surf->texturechain)
+			if (surf->visframe == r_framecount)
+				RSurfShader_Wall_Pass_BaseVertex(ent, surf);
 		if (texture->glowtexture)
-			for (surf = texture->surfacechain;surf;surf = surf->texturechain)
-				RSurfShader_Wall_Pass_Glow(ent, surf);
+			for (surf = firstsurf;surf;surf = surf->texturechain)
+				if (surf->visframe == r_framecount)
+					RSurfShader_Wall_Pass_Glow(ent, surf);
 		if (fogenabled)
-			for (surf = texture->surfacechain;surf;surf = surf->texturechain)
-				RSurfShader_Wall_Pass_Fog(ent, surf);
+			for (surf = firstsurf;surf;surf = surf->texturechain)
+				if (surf->visframe == r_framecount)
+					RSurfShader_Wall_Pass_Fog(ent, surf);
 	}
 	else
 	{
@@ -1364,75 +1349,79 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_
 		if (r_textureunits.integer >= 2)
 		{
 			if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer)
-				RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture);
+				RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture, firstsurf);
 			else
 			{
-				RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture);
+				RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture, firstsurf);
 				if (r_detailtextures.integer)
-					RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture);
+					RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, firstsurf);
 			}
 		}
 		else
 		{
-			RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture);
-			RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture);
+			RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, firstsurf);
+			RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, firstsurf);
 			if (r_detailtextures.integer)
-				RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture);
+				RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, firstsurf);
 		}
 		if (!r_dlightmap.integer && !(ent->effects & EF_FULLBRIGHT))
-			RSurfShader_OpaqueWall_Pass_Light(ent, texture);
+			RSurfShader_OpaqueWall_Pass_Light(ent, texture, firstsurf);
 		if (texture->glowtexture)
-			RSurfShader_OpaqueWall_Pass_Glow(ent, texture);
+			RSurfShader_OpaqueWall_Pass_Glow(ent, texture, firstsurf);
 		if (fogenabled)
-			RSurfShader_OpaqueWall_Pass_Fog(ent, texture);
+			RSurfShader_OpaqueWall_Pass_Fog(ent, texture, firstsurf);
 	}
 }
 
 Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, SHADERFLAGS_NEEDLIGHTMAP};
-Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, 0};
 Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, 0};
 Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, 0};
 
-int Cshader_count = 4;
-Cshader_t *Cshaders[4] =
+int Cshader_count = 3;
+Cshader_t *Cshaders[3] =
 {
 	&Cshader_wall_lightmap,
-	&Cshader_wall_fullbright,
 	&Cshader_water,
 	&Cshader_sky
 };
 
-void R_DrawSurfaces(entity_render_t *ent, int sky, int normal)
+extern cvar_t r_shadows;
+void R_PrepareSurfaces(entity_render_t *ent)
 {
-	int i, alttextures, texframe, framecount, numtextures, numsurfaces, *surfacevisframes;
-	texture_t *t, *textures;
+	int i, texframe, numsurfaces, *surfacevisframes;
 	model_t *model;
 	msurface_t *surf, *surfaces;
+	texture_t *t;
 	vec3_t modelorg;
 
 	if (!ent->model)
 		return;
 
-	// mark the surfaces touched by dynamic lights
-	if (normal && r_dynamic.integer)
-		R_MarkLights(ent);
-
-	R_Mesh_Matrix(&ent->matrix);
-
 	model = ent->model;
-	alttextures = ent->frame != 0;
-	texframe = (int)(cl.time * 5.0f);
-
 	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
-
-	numtextures = model->numtextures;
-	textures = model->textures;
 	numsurfaces = model->nummodelsurfaces;
 	surfaces = model->surfaces + model->firstmodelsurface;
 	surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
 
-	for (i = 0;i < numtextures;i++)
-		textures[i].surfacechain = NULL;
+	texframe = (int)(cl.time * 5.0f);
+	for (i = 0;i < model->numtextures;i++)
+	{
+		t = model->textures + i;
+		if (ent->effects & EF_ADDITIVE)
+			t->rendertype = SURFRENDER_ADD;
+		else if (ent->alpha < 1 || (t->flags & SURF_WATERALPHA && r_wateralpha.value < 1) || t->fogtexture != NULL)
+			t->rendertype = SURFRENDER_ALPHA;
+		else
+			t->rendertype = SURFRENDER_OPAQUE;
+		if (t->animated)
+		{
+			t->currentframe[0] = t->anim_frames[0][(t->anim_total[0] >= 2) ? (texframe % t->anim_total[0]) : 0];
+			t->currentframe[1] = t->anim_frames[1][(t->anim_total[1] >= 2) ? (texframe % t->anim_total[1]) : 0];
+		}
+	}
+
+	if (r_dynamic.integer && r_shadows.integer != 3)
+		R_MarkLights(ent);
 
 	for (i = 0, surf = surfaces;i < numsurfaces;i++, surf++)
 	{
@@ -1454,30 +1443,19 @@ void R_DrawSurfaces(entity_render_t *ent, int sky, int normal)
 #endif
 			{
 				c_faces++;
-				t = surf->texinfo->texture;
-				if (t->animated)
-				{
-					framecount = t->anim_total[alttextures];
-					if (framecount >= 2)
-						t = t->anim_frames[alttextures][texframe % framecount];
-					else
-						t = t->anim_frames[alttextures][0];
-				}
-				surf->currenttexture = t;
-				surf->texturechain = t->surfacechain;
-				t->surfacechain = surf;
+				surf->visframe = r_framecount;
 				if (!r_vertexsurfaces.integer && surf->lightmaptexture != NULL)
 				{
 					if (surf->cached_dlight
-					|| surf->cached_ambient != r_ambient.value
-					|| surf->cached_lightscalebit != lightscalebit)
+					 || surf->cached_ambient != r_ambient.value
+					 || surf->cached_lightmapscalebit != r_lightmapscalebit)
 						R_BuildLightMap(ent, surf, false); // base lighting changed
 					else if (r_dynamic.integer)
 					{
 						if  (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0]
-						|| (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
-						|| (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
-						|| (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
+						 || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
+						 || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
+						 || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
 							R_BuildLightMap(ent, surf, false); // base lighting changed
 						else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
 							R_BuildLightMap(ent, surf, true); // only dlights
@@ -1486,16 +1464,16 @@ void R_DrawSurfaces(entity_render_t *ent, int sky, int normal)
 			}
 		}
 	}
+}
 
-	if (sky)
-		for (i = 0, t = textures;i < numtextures;i++, t++)
-			if (t->surfacechain && t->shader->shaderfunc[SHADERSTAGE_SKY])
-				t->shader->shaderfunc[SHADERSTAGE_SKY](ent, t);
-
-	if (normal)
-		for (i = 0, t = textures;i < numtextures;i++, t++)
-			if (t->surfacechain && t->shader->shaderfunc[SHADERSTAGE_NORMAL])
-				t->shader->shaderfunc[SHADERSTAGE_NORMAL](ent, t);
+void R_DrawSurfaces(entity_render_t *ent, int type)
+{
+	int i;
+	texture_t *t;
+	R_Mesh_Matrix(&ent->matrix);
+	for (i = 0, t = ent->model->textures;i < ent->model->numtextures;i++, t++)
+		if (t->shader->shaderfunc[type] && ent->model->texturesurfacechains[i])
+			t->shader->shaderfunc[type](ent, t, ent->model->texturesurfacechains[i]);
 }
 
 static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
@@ -1508,16 +1486,14 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_SRC_ALPHA;
 	m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-	//m.wantoverbright = false;
 	R_Mesh_Matrix(&ent->matrix);
 	R_Mesh_State(&m);
 	R_Mesh_ResizeCheck(portal->numpoints);
 	i = portal - ent->model->portals;
-	R_FillColors(varray_color, portal->numpoints,
-		((i & 0x0007) >> 0) * (1.0f / 7.0f) * mesh_colorscale,
-		((i & 0x0038) >> 3) * (1.0f / 7.0f) * mesh_colorscale,
-		((i & 0x01C0) >> 6) * (1.0f / 7.0f) * mesh_colorscale,
-		0.125f);
+	GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f) * r_colorscale,
+			 ((i & 0x0038) >> 3) * (1.0f / 7.0f) * r_colorscale,
+			 ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * r_colorscale,
+			 0.125f);
 	if (PlaneDiff(r_origin, (&portal->plane)) > 0)
 	{
 		for (i = portal->numpoints - 1, v = varray_vertex;i >= 0;i--, v += 4)
@@ -1540,7 +1516,7 @@ static void R_DrawPortals(entity_render_t *ent)
 
 	for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++)
 	{
-		if (portal->here->pvsframe == r_pvsframecount || portal->past->pvsframe == r_pvsframecount)
+		if (portal->here->pvsframe == ent->model->pvsframecount || portal->past->pvsframe == ent->model->pvsframecount)
 		{
 			if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
 			{
@@ -1556,7 +1532,7 @@ static void R_DrawPortals(entity_render_t *ent)
 	}
 }
 
-void R_DrawBrushModel(entity_render_t *ent, int sky, int normal)
+void R_PrepareBrushModel(entity_render_t *ent)
 {
 	int i, numsurfaces, *surfacevisframes, *surfacepvsframes;
 	msurface_t *surf;
@@ -1584,7 +1560,7 @@ void R_DrawBrushModel(entity_render_t *ent, int sky, int normal)
 			if ((surf->flags & SURF_PLANEBACK))
 			{
 				surfacevisframes[i] = r_framecount;
-				surfacepvsframes[i] = r_pvsframecount;
+				surfacepvsframes[i] = model->pvsframecount;
 			}
 		}
 		else
@@ -1592,115 +1568,61 @@ void R_DrawBrushModel(entity_render_t *ent, int sky, int normal)
 			if (!(surf->flags & SURF_PLANEBACK))
 			{
 				surfacevisframes[i] = r_framecount;
-				surfacepvsframes[i] = r_pvsframecount;
+				surfacepvsframes[i] = model->pvsframecount;
 			}
 		}
 #else
 		surfacevisframes[i] = r_framecount;
-		surfacepvsframes[i] = r_pvsframecount;
+		surfacepvsframes[i] = model->pvsframecount;
 #endif
 		surf->dlightframe = -1;
 	}
-	R_DrawSurfaces(ent, sky, normal);
+	R_PrepareSurfaces(ent);
 }
 
 void R_SurfaceWorldNode (entity_render_t *ent)
 {
-	int i, numsurfaces, *surfacevisframes, *surfacepvsframes;
-	msurface_t *surfaces, *surf;
+	int i, *surfacevisframes, *surfacepvsframes, surfnum;
+	msurface_t *surf;
+	mleaf_t *leaf;
 	model_t *model;
 	vec3_t modelorg;
 
 	model = ent->model;
-	numsurfaces = model->nummodelsurfaces;
-	surfaces = model->surfaces + model->firstmodelsurface;
 	surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
 	surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface;
 	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
 
-	for (i = 0, surf = surfaces;i < numsurfaces;i++, surf++)
+	for (leaf = model->pvsleafchain;leaf;leaf = leaf->pvschain)
 	{
-		if (surfacepvsframes[i] == r_pvsframecount)
+		if (!R_CullBox (leaf->mins, leaf->maxs))
 		{
-#if WORLDNODECULLBACKFACES
-			if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
-			{
-				if ((surf->flags & SURF_PLANEBACK) && R_NotCulledBox (surf->poly_mins, surf->poly_maxs))
-					surfacevisframes[i] = r_framecount;
-			}
-			else
-			{
-				if (!(surf->flags & SURF_PLANEBACK) && R_NotCulledBox (surf->poly_mins, surf->poly_maxs))
-					surfacevisframes[i] = r_framecount;
-			}
-#else
-			if (R_NotCulledBox (surf->poly_mins, surf->poly_maxs))
-				surfacevisframes[i] = r_framecount;
-#endif
+			c_leafs++;
+			leaf->visframe = r_framecount;
 		}
 	}
-}
 
-/*
-static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
-{
-	int portalstack, i;
-	mportal_t *p, *pstack[8192];
-	msurface_t *surf, **mark, **endmark;
-	mleaf_t *leaf;
-	// LordHavoc: portal-passage worldnode with PVS;
-	// follows portals leading outward from viewleaf, does not venture
-	// offscreen or into leafs that are not visible, faster than Quake's
-	// RecursiveWorldNode
-	leaf = viewleaf;
-	leaf->worldnodeframe = r_framecount;
-	portalstack = 0;
-loc0:
-	c_leafs++;
-	if (leaf->nummarksurfaces)
+	for (i = 0;i < model->pvssurflistlength;i++)
 	{
-		for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
+		surfnum = model->pvssurflist[i];
+		surf = model->surfaces + surfnum;
+#if WORLDNODECULLBACKFACES
+		if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
 		{
-			surf = *mark++;
-			// make sure surfaces are only processed once
-			if (surf->worldnodeframe != r_framecount)
-			{
-				surf->worldnodeframe = r_framecount;
-				if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
-				{
-					if (surf->flags & SURF_PLANEBACK)
-						surf->visframe = r_framecount;
-				}
-				else
-				{
-					if (!(surf->flags & SURF_PLANEBACK))
-						surf->visframe = r_framecount;
-				}
-			}
+			if ((surf->flags & SURF_PLANEBACK) && !R_CullBox (surf->poly_mins, surf->poly_maxs))
+				surfacevisframes[surfnum] = r_framecount;
 		}
-	}
-	// follow portals into other leafs
-	for (p = leaf->portals;p;p = p->next)
-	{
-		leaf = p->past;
-		if (leaf->worldnodeframe != r_framecount)
+		else
 		{
-			leaf->worldnodeframe = r_framecount;
-			// FIXME: R_NotCulledBox is absolute, should be done relative
-			if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs))
-			{
-				p->visframe = r_framecount;
-				pstack[portalstack++] = p;
-				goto loc0;
-loc1:
-				p = pstack[--portalstack];
-			}
+			if (!(surf->flags & SURF_PLANEBACK) && !R_CullBox (surf->poly_mins, surf->poly_maxs))
+				surfacevisframes[surfnum] = r_framecount;
 		}
+#else
+		if (!R_CullBox (surf->poly_mins, surf->poly_maxs))
+			surfacevisframes[surfnum] = r_framecount;
+#endif
 	}
-	if (portalstack)
-		goto loc1;
 }
-*/
 
 static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 {
@@ -1727,6 +1649,7 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 	{
 		c_leafs++;
 		leaf = leafstack[--leafstackpos];
+		leaf->visframe = r_framecount;
 		// draw any surfaces bounding this leaf
 		if (leaf->nummarksurfaces)
 		{
@@ -1764,8 +1687,8 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 				if (leaf->worldnodeframe != r_framecount)
 				{
 					leaf->worldnodeframe = r_framecount;
-					// FIXME: R_NotCulledBox is absolute, should be done relative
-					if (leaf->pvsframe == r_pvsframecount && R_NotCulledBox(leaf->mins, leaf->maxs))
+					// FIXME: R_CullBox is absolute, should be done relative
+					if (leaf->pvsframe == ent->model->pvsframecount && !R_CullBox(leaf->mins, leaf->maxs))
 						leafstack[leafstackpos++] = leaf;
 				}
 			}
@@ -1775,80 +1698,191 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 		R_DrawPortals(ent);
 }
 
-void R_PVSUpdate (mleaf_t *viewleaf)
+void R_PVSUpdate (entity_render_t *ent, mleaf_t *viewleaf)
 {
 	int i, j, l, c, bits, *surfacepvsframes, *mark;
 	mleaf_t *leaf;
 	qbyte *vis;
+	model_t *model;
 
-	if (r_pvsviewleaf == viewleaf && r_pvsviewleafnovis == r_novis.integer)
-		return;
-
-	r_pvsframecount++;
-	r_pvsviewleaf = viewleaf;
-	r_pvsviewleafnovis = r_novis.integer;
-
-	if (viewleaf)
+	model = ent->model;
+	if (model && (model->pvsviewleaf != viewleaf || model->pvsviewleafnovis != r_novis.integer))
 	{
-		surfacepvsframes = cl.worldmodel->surfacepvsframes;
-		vis = Mod_LeafPVS (viewleaf, cl.worldmodel);
-		for (j = 0;j < cl.worldmodel->numleafs;j += 8)
+		model->pvsframecount++;
+		model->pvsviewleaf = viewleaf;
+		model->pvsviewleafnovis = r_novis.integer;
+		model->pvsleafchain = NULL;
+		model->pvssurflistlength = 0;
+		if (viewleaf)
 		{
-			bits = *vis++;
-			if (bits)
+			surfacepvsframes = model->surfacepvsframes;
+			vis = Mod_LeafPVS (viewleaf, model);
+			for (j = 0;j < model->numleafs;j += 8)
 			{
-				l = cl.worldmodel->numleafs - j;
-				if (l > 8)
-					l = 8;
-				for (i = 0;i < l;i++)
+				bits = *vis++;
+				if (bits)
 				{
-					if (bits & (1 << i))
+					l = model->numleafs - j;
+					if (l > 8)
+						l = 8;
+					for (i = 0;i < l;i++)
 					{
-						leaf = &cl.worldmodel->leafs[j + i + 1];
-						leaf->pvsframe = r_pvsframecount;
-						// mark surfaces bounding this leaf as visible
-						for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--)
-							surfacepvsframes[*mark++] = r_pvsframecount;
+						if (bits & (1 << i))
+						{
+							leaf = &model->leafs[j + i + 1];
+							leaf->pvschain = model->pvsleafchain;
+							model->pvsleafchain = leaf;
+							leaf->pvsframe = model->pvsframecount;
+							// mark surfaces bounding this leaf as visible
+							for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--, mark++)
+							{
+								if (surfacepvsframes[*mark] != model->pvsframecount)
+								{
+									surfacepvsframes[*mark] = model->pvsframecount;
+									model->pvssurflist[model->pvssurflistlength++] = *mark;
+								}
+							}
+						}
 					}
 				}
 			}
+			/*
+			for (i = 0, j = model->firstmodelsurface;i < model->nummodelsurfaces;i++, j++)
+				if (model->surfacepvsframes[j] == model->pvsframecount)
+					model->pvssurflist[model->pvssurflistlength++] = j;
+			*/
 		}
 	}
 }
 
-/*
-=============
-R_DrawWorld
-=============
-*/
-void R_DrawWorld (entity_render_t *ent)
+void R_WorldVisibility (entity_render_t *ent)
 {
+	vec3_t modelorg;
 	mleaf_t *viewleaf;
-	viewleaf = Mod_PointInLeaf (r_origin, cl.worldmodel);
-	R_PVSUpdate(viewleaf);
+
+	Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+	viewleaf = Mod_PointInLeaf (modelorg, ent->model);
+	R_PVSUpdate(ent, viewleaf);
+
 	if (!viewleaf)
 		return;
+
 	if (r_surfaceworldnode.integer || viewleaf->contents == CONTENTS_SOLID)
 		R_SurfaceWorldNode (ent);
 	else
 		R_PortalWorldNode (ent, viewleaf);
-	R_DrawSurfaces(ent, true, true);
 }
 
-/*
-=================
-R_DrawBrushModel
-=================
-*/
-void R_DrawBrushModelSky (entity_render_t *ent)
+void R_DrawWorld (entity_render_t *ent)
 {
-	R_DrawBrushModel(ent, true, false);
+	R_PrepareSurfaces(ent);
+	R_DrawSurfaces(ent, SHADERSTAGE_SKY);
+	R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
 }
 
-void R_DrawBrushModelNormal (entity_render_t *ent)
+void R_Model_Brush_DrawSky (entity_render_t *ent)
+{
+	if (ent != &cl_entities[0].render)
+		R_PrepareBrushModel(ent);
+	R_DrawSurfaces(ent, SHADERSTAGE_SKY);
+}
+
+void R_Model_Brush_Draw (entity_render_t *ent)
 {
 	c_bmodels++;
-	R_DrawBrushModel(ent, false, true);
+	if (ent != &cl_entities[0].render)
+		R_PrepareBrushModel(ent);
+	R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+}
+
+void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelightorigin, float lightradius)
+{
+#if 0
+	float projectdistance, temp[3];
+	shadowmesh_t *mesh;
+	VectorSubtract(relativelightorigin, ent->model->shadowmesh_center, temp);
+	projectdistance = lightradius + ent->model->shadowmesh_radius - sqrt(DotProduct(temp, temp));
+	if (projectdistance >= 0.1)
+	{
+		R_Mesh_Matrix(&ent->matrix);
+		for (mesh = ent->model->shadowmesh;mesh;mesh = mesh->next)
+		{
+			R_Mesh_ResizeCheck(mesh->numverts * 2);
+			memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+			R_Shadow_Volume(mesh->numverts, mesh->numtriangles, varray_vertex, mesh->elements, mesh->neighbors, relativelightorigin, lightradius, projectdistance);
+		}
+	}
+#else
+	int i;
+	msurface_t *surf;
+	float projectdistance, f, temp[3], lightradius2;
+	surfmesh_t *mesh;
+	R_Mesh_Matrix(&ent->matrix);
+	lightradius2 = lightradius * lightradius;
+	for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++)
+	{
+		if (surf->flags & SURF_SHADOWCAST)
+		{
+			f = PlaneDiff(relativelightorigin, surf->plane);
+			if (surf->flags & SURF_PLANEBACK)
+				f = -f;
+			// draw shadows only for frontfaces
+			projectdistance = lightradius - f;
+			if (projectdistance >= 0.1 && projectdistance < lightradius)
+			{
+				VectorSubtract(relativelightorigin, surf->poly_center, temp);
+				if (DotProduct(temp, temp) < (surf->poly_radius2 + lightradius2))
+				{
+					for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+					{
+						R_Mesh_ResizeCheck(mesh->numverts * 2);
+						memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+						R_Shadow_Volume(mesh->numverts, mesh->numtriangles, varray_vertex, mesh->index, mesh->triangleneighbors, relativelightorigin, lightradius, projectdistance);
+					}
+				}
+			}
+		}
+	}
+#endif
+}
+
+void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float lightdistbias, float lightsubtract, float *lightcolor)
+{
+	int tnum;
+	msurface_t *surf;
+	texture_t *t;
+	float f, lightradius2;
+	surfmesh_t *mesh;
+	R_Mesh_Matrix(&ent->matrix);
+	if (ent != &cl_entities[0].render)
+		R_PrepareBrushModel(ent);
+	lightradius2 = lightradius * lightradius;
+	for (tnum = 0;tnum < ent->model->numtextures;tnum++)
+	{
+		t = ent->model->textures + tnum;
+		if (ent->model->texturesurfacechains[tnum] && t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
+		{
+			t = t->currentframe[ent->frame != 0];
+			for (surf = ent->model->texturesurfacechains[tnum];surf;surf = surf->texturechain)
+			{
+				if (surf->visframe == r_framecount)
+				{
+					f = PlaneDiff(relativelightorigin, surf->plane);
+					if (surf->flags & SURF_PLANEBACK)
+						f = -f;
+					if (f >= -0.1 && f < lightradius)
+					{
+						for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+						{
+							R_Mesh_ResizeCheck(mesh->numverts);
+							memcpy(varray_vertex, mesh->verts, mesh->numverts * sizeof(float[4]));
+							R_Shadow_RenderLighting(mesh->numverts, mesh->numtriangles, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals, mesh->str, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, t->texture, t->glosstexture, t->nmaptexture, NULL);
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 static void gl_surf_start(void)
@@ -1861,10 +1895,6 @@ static void gl_surf_shutdown(void)
 
 static void gl_surf_newmap(void)
 {
-	// reset pvs visibility variables so it will update on first frame
-	r_pvsframecount = 1;
-	r_pvsviewleaf = NULL;
-	r_pvsviewleafnovis = false;
 }
 
 void GL_Surf_Init(void)