X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_rsurf.c;h=8bd97db0059795a0b58b784d5022712e51106c44;hb=bc34558e2a1bb9e832ca15701811e19cf9926291;hp=9448717d8f77e6d51a6954f6f6d71c89f51ce466;hpb=1740f737276f086c2f19758f72881a20e5070b57;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 9448717d..8bd97db0 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -40,11 +40,6 @@ 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, k;
@@ -752,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;
@@ -789,14 +784,17 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture
 	}
 	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]));
-			GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_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);
@@ -809,19 +807,21 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 	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;
@@ -831,7 +831,7 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 		m.blendfunc1 = GL_ONE;
 		m.blendfunc2 = GL_ZERO;
 	}
-	m.tex[0] = R_GetTexture(surf->currenttexture->texture);
+	m.tex[0] = R_GetTexture(texture->texture);
 	colorscale = r_colorscale;
 	if (gl_combine.integer)
 	{
@@ -844,7 +844,7 @@ static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 	{
 		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))
@@ -863,35 +863,39 @@ 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.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]));
+				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)
@@ -900,14 +904,16 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
 	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;
@@ -917,7 +923,7 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
 		m.blendfunc1 = GL_ONE;
 		m.blendfunc2 = GL_ZERO;
 	}
-	m.tex[0] = R_GetTexture(surf->currenttexture->texture);
+	m.tex[0] = R_GetTexture(texture->texture);
 	colorscale = r_colorscale;
 	if (gl_combine.integer)
 	{
@@ -931,7 +937,7 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
 	{
 		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))
 		{
@@ -945,58 +951,25 @@ static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const m
 	}
 }
 
-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.tex[0] = R_GetTexture(surf->currenttexture->texture);
-	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, r_colorscale, mesh->numverts, modelorg);
-		R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->index);
-	}
-}
-
 static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf)
 {
 	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.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]));
+		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);
 	}
@@ -1007,11 +980,13 @@ 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.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)
@@ -1019,13 +994,13 @@ static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface
 		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]));
+			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;
@@ -1036,7 +1011,7 @@ static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render
 	m.blendfunc1 = GL_ONE;
 	m.blendfunc2 = GL_ZERO;
 	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;
@@ -1044,27 +1019,30 @@ static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render
 	R_Mesh_State(&m);
 	cl = (float) (1 << r_lightmapscalebit) * r_colorscale;
 	GL_Color(cl, cl, cl, 1);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		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)
+		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]));
-			memcpy(varray_texcoord[1], mesh->uv, mesh->numverts * sizeof(float[2]));
-			memcpy(varray_texcoord[2], mesh->ab, mesh->numverts * sizeof(float[2]));
-			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;
@@ -1074,31 +1052,34 @@ static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent
 	m.blendfunc1 = GL_ONE;
 	m.blendfunc2 = GL_ZERO;
 	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);
 	GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	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]));
-			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;
@@ -1109,19 +1090,22 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent,
 	m.tex[0] = R_GetTexture(texture->texture);
 	R_Mesh_State(&m);
 	GL_Color(1, 1, 1, 1);
-	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]));
-			memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			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;
@@ -1130,30 +1114,33 @@ static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent,
 	memset(&m, 0, sizeof(m));
 	m.blendfunc1 = GL_ZERO;
 	m.blendfunc2 = GL_SRC_COLOR;
-	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);
 	GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	for (surf = firstsurf;surf;surf = surf->texturechain)
 	{
-		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)
+		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->uv, mesh->numverts * sizeof(float[2]));
-			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;
@@ -1172,9 +1159,9 @@ static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const
 	}
 	R_Mesh_State(&m);
 	GL_UseColorArray();
-	for (surf = texture->surfacechain;surf;surf = surf->texturechain)
+	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)
 			{
@@ -1182,7 +1169,7 @@ 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, colorscale, mesh->numverts);
@@ -1193,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;
@@ -1205,21 +1192,24 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const te
 	m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
 	R_Mesh_State(&m);
 	GL_UseColorArray();
-	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 (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, r_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;
@@ -1230,19 +1220,22 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c
 	m.tex[0] = R_GetTexture(texture->detailtexture);
 	R_Mesh_State(&m);
 	GL_Color(1, 1, 1, 1);
-	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]));
-			memcpy(varray_texcoord[0], mesh->ab, mesh->numverts * sizeof(float[2]));
-			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;
@@ -1253,91 +1246,102 @@ static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const t
 	m.tex[0] = R_GetTexture(texture->glowtexture);
 	R_Mesh_State(&m);
 	GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
-	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]));
-			memcpy(varray_texcoord[0], mesh->st, mesh->numverts * sizeof(float[2]));
-			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
 	{
@@ -1345,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++)
 	{
@@ -1435,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_lightmapscalebit != r_lightmapscalebit)
+					 || 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
@@ -1467,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)
@@ -1519,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)
 			{
@@ -1535,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;
@@ -1563,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
@@ -1571,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)
 {
@@ -1706,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)
 		{
@@ -1743,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;
 				}
 			}
@@ -1754,159 +1698,189 @@ 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)
-	{
-		surfacepvsframes = cl.worldmodel->surfacepvsframes;
-		vis = Mod_LeafPVS (viewleaf, cl.worldmodel);
-		for (j = 0;j < cl.worldmodel->numleafs;j += 8)
+	model = ent->model;
+	if (model && (model->pvsviewleaf != viewleaf || model->pvsviewleafnovis != r_novis.integer))
+	{
+		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_PrepareSurfaces(ent);
+	R_DrawSurfaces(ent, SHADERSTAGE_SKY);
+	R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+}
+
+void R_Model_Brush_DrawSky (entity_render_t *ent)
 {
-	R_DrawBrushModel(ent, true, false);
+	if (ent != &cl_entities[0].render)
+		R_PrepareBrushModel(ent);
+	R_DrawSurfaces(ent, SHADERSTAGE_SKY);
 }
 
-void R_DrawBrushModelNormal (entity_render_t *ent)
+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_DrawBrushModelShadowVolumes (entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int visiblevolume)
+void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelightorigin, float lightradius)
 {
-	int i, numsurfaces;
+#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;
-	numsurfaces = ent->model->nummodelsurfaces;
+	R_Mesh_Matrix(&ent->matrix);
 	lightradius2 = lightradius * lightradius;
-	for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < numsurfaces;i++, surf++)
+	for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++)
 	{
-		VectorSubtract(relativelightorigin, surf->poly_center, temp);
-		if (DotProduct(temp, temp) < (surf->poly_radius2 + lightradius2))
+		if (surf->flags & SURF_SHADOWCAST)
 		{
 			f = PlaneDiff(relativelightorigin, surf->plane);
 			if (surf->flags & SURF_PLANEBACK)
 				f = -f;
-			// draw shadows only for backfaces
-			if (f < 0)
+			// draw shadows only for frontfaces
+			projectdistance = lightradius - f;
+			if (projectdistance >= 0.1 && projectdistance < lightradius)
 			{
-				projectdistance = lightradius + f;
-				if (projectdistance > 0)
+				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, mesh->index, mesh->triangleneighbors, relativelightorigin, projectdistance, visiblevolume);
+						R_Shadow_Volume(mesh->numverts, mesh->numtriangles, varray_vertex, mesh->index, mesh->triangleneighbors, relativelightorigin, lightradius, projectdistance);
 					}
 				}
 			}
 		}
 	}
+#endif
 }
 
-extern cvar_t r_shadows;
-void R_DrawBrushModelFakeShadow (entity_render_t *ent)
+void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float lightdistbias, float lightsubtract, float *lightcolor)
 {
-	int i;
-	vec3_t relativelightorigin;
-	rmeshstate_t m;
-	mlight_t *sl;
-	rdlight_t *rd;
-
-	if (r_shadows.integer < 2)
-		return;
-
-	memset(&m, 0, sizeof(m));
-	m.blendfunc1 = GL_ONE;
-	m.blendfunc2 = GL_ONE;
-	R_Mesh_State(&m);
+	int tnum;
+	msurface_t *surf;
+	texture_t *t;
+	float f, lightradius2;
+	surfmesh_t *mesh;
 	R_Mesh_Matrix(&ent->matrix);
-	GL_Color(0.0125 * r_colorscale, 0.025 * r_colorscale, 0.1 * r_colorscale, 1);
-	for (i = 0, sl = cl.worldmodel->lights;i < cl.worldmodel->numlights;i++, sl++)
-	{
-		if (d_lightstylevalue[sl->style] > 0
-		 && ent->maxs[0] >= sl->origin[0] - sl->cullradius
-		 && ent->mins[0] <= sl->origin[0] + sl->cullradius
-		 && ent->maxs[1] >= sl->origin[1] - sl->cullradius
-		 && ent->mins[1] <= sl->origin[1] + sl->cullradius
-		 && ent->maxs[2] >= sl->origin[2] - sl->cullradius
-		 && ent->mins[2] <= sl->origin[2] + sl->cullradius)
-		{
-			Matrix4x4_Transform(&ent->inversematrix, sl->origin, relativelightorigin);
-			R_DrawBrushModelShadowVolumes (ent, relativelightorigin, sl->cullradius, true);
-		}
-	}
-	for (i = 0, rd = r_dlight;i < r_numdlights;i++, rd++)
+	if (ent != &cl_entities[0].render)
+		R_PrepareBrushModel(ent);
+	lightradius2 = lightradius * lightradius;
+	for (tnum = 0;tnum < ent->model->numtextures;tnum++)
 	{
-		if (ent->maxs[0] >= rd->origin[0] - rd->cullradius
-		 && ent->mins[0] <= rd->origin[0] + rd->cullradius
-		 && ent->maxs[1] >= rd->origin[1] - rd->cullradius
-		 && ent->mins[1] <= rd->origin[1] + rd->cullradius
-		 && ent->maxs[2] >= rd->origin[2] - rd->cullradius
-		 && ent->mins[2] <= rd->origin[2] + rd->cullradius)
+		t = ent->model->textures + tnum;
+		if (ent->model->texturesurfacechains[tnum] && t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
 		{
-			Matrix4x4_Transform(&ent->inversematrix, rd->origin, relativelightorigin);
-			R_DrawBrushModelShadowVolumes (ent, relativelightorigin, rd->cullradius, true);
+			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);
+						}
+					}
+				}
+			}
 		}
 	}
 }
@@ -1921,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)