]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rsurf.c
added texmatrix[] to rmeshstate_t and removed R_Mesh_TextureMatrix function
[xonotic/darkplaces.git] / gl_rsurf.c
index ad2b93f350a95c224415e45eb38e719fe21eaf6f..cabf4bbf5d8f6e606b6839d03772a5465edb0749 100644 (file)
@@ -30,13 +30,32 @@ static float floatblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHav
 static qbyte templight[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*4];
 
 cvar_t r_ambient = {0, "r_ambient", "0"};
-cvar_t r_vertexsurfaces = {0, "r_vertexsurfaces", "0"};
-cvar_t r_dlightmap = {CVAR_SAVE, "r_dlightmap", "1"};
 cvar_t r_drawportals = {0, "r_drawportals", "0"};
 cvar_t r_testvis = {0, "r_testvis", "0"};
 cvar_t r_floatbuildlightmap = {0, "r_floatbuildlightmap", "0"};
 cvar_t r_detailtextures = {CVAR_SAVE, "r_detailtextures", "1"};
 cvar_t r_surfaceworldnode = {0, "r_surfaceworldnode", "1"};
+cvar_t r_drawcollisionbrushes_polygonfactor = {0, "r_drawcollisionbrushes_polygonfactor", "-1"};
+cvar_t r_drawcollisionbrushes_polygonoffset = {0, "r_drawcollisionbrushes_polygonoffset", "0"};
+cvar_t gl_lightmaps = {0, "gl_lightmaps", "0"};
+
+/*
+// FIXME: these arrays are huge!
+int r_q1bsp_maxmarkleafs;
+int r_q1bsp_nummarkleafs;
+mleaf_t *r_q1bsp_maxleaflist[65536];
+int r_q1bsp_maxmarksurfaces;
+int r_q1bsp_nummarksurfaces;
+msurface_t *r_q1bsp_maxsurfacelist[65536];
+
+// FIXME: these arrays are huge!
+int r_q3bsp_maxmarkleafs;
+int r_q3bsp_nummarkleafs;
+q3mleaf_t *r_q3bsp_maxleaflist[65536];
+int r_q3bsp_maxmarksurfaces;
+int r_q3bsp_nummarksurfaces;
+q3mface_t *r_q3bsp_maxsurfacelist[65536];
+*/
 
 static int dlightdivtable[32768];
 
@@ -45,6 +64,7 @@ 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;
        unsigned int *bl;
        float dist, impact[3], local[3];
+       dlight_t *light;
 
        lit = false;
 
@@ -52,17 +72,17 @@ static int R_IntAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
        tmax = (surf->extents[1] >> 4) + 1;
        smax3 = smax * 3;
 
-       for (lnum = 0; lnum < r_numdlights; lnum++)
+       for (lnum = 0, light = r_dlight;lnum < r_numdlights;lnum++, light++)
        {
                if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
                        continue;                                       // not lit by this light
 
-               Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local);
+               Matrix4x4_Transform(matrix, light->origin, local);
                dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 
                // for comparisons to minimum acceptable light
                // compensate for LIGHTOFFSET
-               maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET;
+               maxdist = (int) light->rtlight.lightmap_cullradius2 + LIGHTOFFSET;
 
                dist2 = dist * dist;
                dist2 += LIGHTOFFSET;
@@ -97,10 +117,10 @@ 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] * (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);
+               red = light->rtlight.lightmap_light[0] * (1.0f / 128.0f);
+               green = light->rtlight.lightmap_light[1] * (1.0f / 128.0f);
+               blue = light->rtlight.lightmap_light[2] * (1.0f / 128.0f);
+               subtract = (int) (light->rtlight.lightmap_subtract * 4194304.0f);
                bl = intblocklights;
 
                i = impactt;
@@ -138,6 +158,7 @@ static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
 {
        int lnum, s, t, smax, tmax, smax3, lit, impacts, impactt;
        float sdtable[256], *bl, k, dist, dist2, maxdist, maxdist2, maxdist3, td1, td, red, green, blue, impact[3], local[3], subtract;
+       dlight_t *light;
 
        lit = false;
 
@@ -145,17 +166,17 @@ static int R_FloatAddDynamicLights (const matrix4x4_t *matrix, msurface_t *surf)
        tmax = (surf->extents[1] >> 4) + 1;
        smax3 = smax * 3;
 
-       for (lnum = 0; lnum < r_numdlights; lnum++)
+       for (lnum = 0, light = r_dlight;lnum < r_numdlights;lnum++, light++)
        {
                if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
                        continue;                                       // not lit by this light
 
-               Matrix4x4_Transform(matrix, r_dlight[lnum].origin, local);
+               Matrix4x4_Transform(matrix, light->origin, local);
                dist = DotProduct (local, surf->plane->normal) - surf->plane->dist;
 
                // for comparisons to minimum acceptable light
                // compensate for LIGHTOFFSET
-               maxdist = (int) r_dlight[lnum].cullradius2 + LIGHTOFFSET;
+               maxdist = (int) light->rtlight.lightmap_cullradius2 + LIGHTOFFSET;
 
                dist2 = dist * dist;
                dist2 += LIGHTOFFSET;
@@ -190,10 +211,10 @@ static int R_FloatAddDynamicLights (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];
-               subtract = r_dlight[lnum].subtract * 32768.0f;
+               red = light->rtlight.lightmap_light[0];
+               green = light->rtlight.lightmap_light[1];
+               blue = light->rtlight.lightmap_light[2];
+               subtract = light->rtlight.lightmap_subtract * 32768.0f;
                bl = floatblocklights;
 
                td1 = impactt;
@@ -235,7 +256,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
 {
        if (!r_floatbuildlightmap.integer)
        {
-               int smax, tmax, i, j, size, size3, shift, maps, stride, l;
+               int smax, tmax, i, j, size, size3, maps, stride, l;
                unsigned int *bl, scale;
                qbyte *lightmap, *out, *stain;
 
@@ -250,7 +271,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
 
        // set to full bright if no light data
                bl = intblocklights;
-               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
+               if (!ent->model->brushq1.lightdata)
                {
                        for (i = 0;i < size3;i++)
                                bl[i] = 255*256;
@@ -267,7 +288,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                        else
                                memset(bl, 0, size*3*sizeof(unsigned int));
 
-                       if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+                       if (surf->dlightframe == r_framecount)
                        {
                                surf->cached_dlight = R_IntAddDynamicLights(&ent->inversematrix, surf);
                                if (surf->cached_dlight)
@@ -287,18 +308,20 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                stain = surf->stainsamples;
                bl = intblocklights;
                out = templight;
-               // deal with lightmap brightness scale
-               shift = 7 + r_lightmapscalebit + 8;
-               if (ent->model->lightmaprgba)
+               // the >> 16 shift adjusts down 8 bits to account for the stainmap
+               // scaling, and remaps the 0-65536 (2x overbright) to 0-256, it will
+               // be doubled during rendering to achieve 2x overbright
+               // (0 = 0.0, 128 = 1.0, 256 = 2.0)
+               if (ent->model->brushq1.lightmaprgba)
                {
                        stride = (surf->lightmaptexturestride - smax) * 4;
                        for (i = 0;i < tmax;i++, out += stride)
                        {
                                for (j = 0;j < smax;j++)
                                {
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
                                        *out++ = 255;
                                }
                        }
@@ -310,9 +333,9 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                        {
                                for (j = 0;j < smax;j++)
                                {
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
+                                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
                                }
                        }
                }
@@ -336,7 +359,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
 
        // set to full bright if no light data
                bl = floatblocklights;
-               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
+               if (!ent->model->brushq1.lightdata)
                        j = 255*256;
                else
                        j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
@@ -350,7 +373,7 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                else
                        memset(bl, 0, size*3*sizeof(float));
 
-               if (surf->dlightframe == r_framecount && r_dlightmap.integer)
+               if (surf->dlightframe == r_framecount)
                {
                        surf->cached_dlight = R_FloatAddDynamicLights(&ent->inversematrix, surf);
                        if (surf->cached_dlight)
@@ -369,9 +392,12 @@ static void R_BuildLightMap (const entity_render_t *ent, msurface_t *surf)
                stain = surf->stainsamples;
                bl = floatblocklights;
                out = templight;
-               // deal with lightmap brightness scale
-               scale = 1.0f / (1 << (7 + r_lightmapscalebit + 8));
-               if (ent->model->lightmaprgba)
+               // this scaling adjusts down 8 bits to account for the stainmap
+               // scaling, and remaps the 0.0-2.0 (2x overbright) to 0-256, it will
+               // be doubled during rendering to achieve 2x overbright
+               // (0 = 0.0, 128 = 1.0, 256 = 2.0)
+               scale = 1.0f / (1 << 16);
+               if (ent->model->brushq1.lightmaprgba)
                {
                        stride = (surf->lightmaptexturestride - smax) * 4;
                        for (i = 0;i < tmax;i++, out += stride)
@@ -444,7 +470,7 @@ loc0:
                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->brushq1.surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
        {
                if (surf->stainsamples)
                {
@@ -532,7 +558,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
        entity_render_t *ent;
        model_t *model;
        vec3_t org;
-       if (cl.worldmodel == NULL)
+       if (cl.worldmodel == NULL || !cl.worldmodel->brushq1.nodes)
                return;
        fcolor[0] = cr1;
        fcolor[1] = cg1;
@@ -543,7 +569,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
        fcolor[6] = cb2 - cb1;
        fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f);
 
-       R_StainNode(cl.worldmodel->nodes + cl.worldmodel->hulls[0].firstclipnode, cl.worldmodel, origin, radius, fcolor);
+       R_StainNode(cl.worldmodel->brushq1.nodes + cl.worldmodel->brushq1.hulls[0].firstclipnode, cl.worldmodel, origin, radius, fcolor);
 
        // look for embedded bmodels
        for (n = 0;n < cl_num_brushmodel_entities;n++)
@@ -553,10 +579,10 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
                if (model && model->name[0] == '*')
                {
                        Mod_CheckLoaded(model);
-                       if (model->type == mod_brush)
+                       if (model->brushq1.nodes)
                        {
                                Matrix4x4_Transform(&ent->inversematrix, origin, org);
-                               R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, fcolor);
+                               R_StainNode(model->brushq1.nodes + model->brushq1.hulls[0].firstclipnode, model, org, radius, fcolor);
                        }
                }
        }
@@ -678,21 +704,21 @@ static int RSurf_LightSeparate_Vertex3f_Color4f(const matrix4x4_t *matrix, const
        const float *v;
        float *c;
        int i, l, lit = false;
-       const rdlight_t *rd;
+       const dlight_t *light;
        vec3_t lightorigin;
        for (l = 0;l < r_numdlights;l++)
        {
                if (dlightbits[l >> 5] & (1 << (l & 31)))
                {
-                       rd = &r_dlight[l];
-                       Matrix4x4_Transform(matrix, rd->origin, lightorigin);
+                       light = &r_dlight[l];
+                       Matrix4x4_Transform(matrix, light->origin, lightorigin);
                        for (i = 0, v = vert, c = color;i < numverts;i++, v += 3, c += 4)
                        {
                                f = VectorDistance2(v, lightorigin) + LIGHTOFFSET;
-                               if (f < rd->cullradius2)
+                               if (f < light->rtlight.lightmap_cullradius2)
                                {
-                                       f = ((1.0f / f) - rd->subtract) * scale;
-                                       VectorMA(c, f, rd->light, c);
+                                       f = ((1.0f / f) - light->rtlight.lightmap_subtract) * scale;
+                                       VectorMA(c, f, light->rtlight.lightmap_light, c);
                                        lit = true;
                                }
                        }
@@ -701,35 +727,13 @@ static int RSurf_LightSeparate_Vertex3f_Color4f(const matrix4x4_t *matrix, const
        return lit;
 }
 
-// note: this untransforms lights to do the checking
-static int RSurf_LightCheck(const matrix4x4_t *matrix, const int *dlightbits, const surfmesh_t *mesh)
-{
-       int i, l;
-       const rdlight_t *rd;
-       vec3_t lightorigin;
-       const float *v;
-       for (l = 0;l < r_numdlights;l++)
-       {
-               if (dlightbits[l >> 5] & (1 << (l & 31)))
-               {
-                       rd = &r_dlight[l];
-                       Matrix4x4_Transform(matrix, rd->origin, lightorigin);
-                       for (i = 0, v = mesh->vertex3f;i < mesh->numverts;i++, v += 3)
-                               if (VectorDistance2(v, lightorigin) < rd->cullradius2)
-                                       return true;
-               }
-       }
-       return false;
-}
-
 static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
 
        // LordHavoc: HalfLife maps have freaky skypolys...
-       if (ent->model->ishlbsp)
+       if (ent->model->brush.ishlbsp)
                return;
 
        if (skyrendernow)
@@ -741,121 +745,131 @@ static void RSurfShader_Sky(const entity_render_t *ent, const texture_t *texture
 
        R_Mesh_Matrix(&ent->matrix);
 
-       // draw depth-only polys
-       memset(&m, 0, sizeof(m));
+       GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1);
        if (skyrendermasked)
        {
-               qglColorMask(0,0,0,0);
+               // depth-only (masking)
+               GL_ColorMask(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;
+               GL_BlendFunc(GL_ZERO, GL_ONE);
        }
        else
        {
                // fog sky
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
+               GL_BlendFunc(GL_ONE, GL_ZERO);
        }
-       m.depthwrite = true;
-       R_Mesh_State(&m);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+
+       memset(&m, 0, sizeof(m));
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_colorscale, 1);
-                               R_Mesh_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
-       qglColorMask(1,1,1,1);
+       GL_ColorMask(1,1,1,1);
 }
 
 static void RSurfShader_Water_Callback(const void *calldata1, int calldata2)
 {
-       int i;
        const entity_render_t *ent = calldata1;
-       const msurface_t *surf = ent->model->surfaces + calldata2;
-       float f, colorscale, scroll[2], *v, *tc;
-       const surfmesh_t *mesh;
+       const msurface_t *surf = ent->model->brushq1.surfaces + calldata2;
        rmeshstate_t m;
        float alpha;
        float modelorg[3];
        texture_t *texture;
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       float args[4] = {0.05f,0,0,0.04f};
 
        R_Mesh_Matrix(&ent->matrix);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
 
-       memset(&m, 0, sizeof(m));
        texture = surf->texinfo->texture->currentframe;
        alpha = texture->currentalpha;
        if (texture->rendertype == SURFRENDER_ADD)
        {
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE;
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               GL_DepthMask(false);
        }
        else if (texture->rendertype == SURFRENDER_ALPHA)
        {
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               GL_DepthMask(false);
        }
        else
        {
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               GL_DepthMask(true);
        }
-       m.tex[0] = R_GetTexture(texture->skin.base);
-       colorscale = r_colorscale;
-       if (gl_combine.integer)
-       {
-               m.texrgbscale[0] = 4;
-               colorscale *= 0.25f;
+       GL_DepthTest(true);
+       GL_Color(1, 1, 1, alpha);
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = surf->mesh.data_vertex3f;
+       if (gl_textureshader && r_watershader.value && !fogenabled)
+       {
+               m.tex[0] = R_GetTexture(mod_shared_distorttexture[(int)(cl.time * 16)&63]);
+               m.tex[1] = R_GetTexture(texture->skin.base);
+               m.texcombinergb[0] = GL_REPLACE;
+               m.texcombinergb[1] = GL_REPLACE;
+               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+               m.pointer_texcoord[1] = surf->mesh.data_texcoordtexture2f;
+               Matrix4x4_CreateFromQuakeEntity(&m.texmatrix[0], 0, 0, 0, 0, 0, 0, r_watershader.value);
+               Matrix4x4_CreateTranslate(&m.texmatrix[1], sin(cl.time) * 0.025 * r_waterscroll.value, sin(cl.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
+               R_Mesh_State(&m);
+
+               GL_ActiveTexture(0);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
+               GL_ActiveTexture(1);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_OFFSET_TEXTURE_2D_NV);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB);
+               qglTexEnvfv(GL_TEXTURE_SHADER_NV, GL_OFFSET_TEXTURE_MATRIX_NV, &args[0]);
+               qglEnable(GL_TEXTURE_SHADER_NV);
+
+               GL_LockArrays(0, surf->mesh.num_vertices);
+               R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+               GL_LockArrays(0, 0);
+
+               qglDisable(GL_TEXTURE_SHADER_NV);
+               qglTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_TEXTURE_2D);
+               GL_ActiveTexture(0);
        }
-       R_Mesh_State(&m);
-       GL_UseColorArray();
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       else
        {
-               R_Mesh_GetSpace(mesh->numverts);
-               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-               scroll[0] = sin(cl.time) * 0.125f;
-               scroll[1] = sin(cl.time * 0.8f) * 0.125f;
-               for (i = 0, v = varray_texcoord2f[0], tc = mesh->texcoordtexture2f;i < mesh->numverts;i++, v += 2, tc += 2)
+               if (fogenabled)
                {
-                       v[0] = tc[0] + scroll[0];
-                       v[1] = tc[1] + scroll[1];
+                       R_FillColors(varray_color4f, surf->mesh.num_vertices, 1, 1, 1, alpha);
+                       RSurf_FogColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, 1, surf->mesh.num_vertices, modelorg);
+                       m.pointer_color = varray_color4f;
                }
-               f = surf->flags & SURF_DRAWFULLBRIGHT ? 1.0f : ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f);
-               R_FillColors(varray_color4f, mesh->numverts, f, f, f, alpha);
-               if (!(surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT))
+               m.tex[0] = R_GetTexture(texture->skin.base);
+               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+               if (r_waterscroll.value)
                {
-                       if (surf->dlightframe == r_framecount)
-                               RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, 1);
-                       if (surf->flags & SURF_LIGHTMAP)
-                               RSurf_AddLightmapToVertexColors_Color4f(mesh->lightmapoffsets, varray_color4f, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
+                       // scrolling in texture matrix
+                       Matrix4x4_CreateTranslate(&m.texmatrix[0], sin(cl.time) * 0.025 * r_waterscroll.value, sin(cl.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
                }
-               RSurf_FogColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg);
-               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-       }
-
-       if (fogenabled)
-       {
-               memset(&m, 0, sizeof(m));
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE;
-               m.tex[0] = R_GetTexture(texture->skin.fog);
                R_Mesh_State(&m);
-               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+
+               GL_LockArrays(0, surf->mesh.num_vertices);
+               R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+               GL_LockArrays(0, 0);
+
+               if (fogenabled && texture->rendertype != SURFRENDER_ADD)
                {
-                       R_Mesh_GetSpace(mesh->numverts);
-                       R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                       if (m.tex[0])
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                       RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], alpha, r_colorscale, mesh->numverts, modelorg);
-                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
+                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+                       GL_DepthMask(false);
+                       RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], alpha, 1, surf->mesh.num_vertices, modelorg);
+                       m.tex[0] = R_GetTexture(texture->skin.fog);
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
@@ -872,287 +886,273 @@ static void RSurfShader_Water(const entity_render_t *ent, const texture_t *textu
                        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);
+                               R_MeshQueue_AddTransparent(center, RSurfShader_Water_Callback, ent, surf - ent->model->brushq1.surfaces);
                        }
                }
        }
        else
                for (chain = surfchain;(surf = *chain) != NULL;chain++)
                        if (surf->visframe == r_framecount)
-                               RSurfShader_Water_Callback(ent, surf - ent->model->surfaces);
+                               RSurfShader_Water_Callback(ent, surf - ent->model->brushq1.surfaces);
 }
 
 static void RSurfShader_Wall_Pass_BaseVertex(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha)
 {
        float base, colorscale;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
        if (rendertype == SURFRENDER_ADD)
        {
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE;
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               GL_DepthMask(false);
        }
        else if (rendertype == SURFRENDER_ALPHA)
        {
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               GL_DepthMask(false);
        }
        else
        {
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+               GL_DepthMask(true);
        }
        m.tex[0] = R_GetTexture(texture->skin.base);
-       colorscale = r_colorscale;
+       colorscale = 1;
        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);
+       GL_DepthTest(true);
+
+       m.pointer_color = varray_color4f;
+       m.pointer_vertex = surf->mesh.data_vertex3f;
+       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
        R_Mesh_State(&m);
-       GL_UseColorArray();
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-       {
-               R_Mesh_GetSpace(mesh->numverts);
-               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-               R_FillColors(varray_color4f, mesh->numverts, base, base, base, currentalpha);
-               if (!(ent->effects & EF_FULLBRIGHT))
-               {
-                       if (surf->dlightframe == r_framecount)
-                               RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, 1);
-                       if (surf->flags & SURF_LIGHTMAP)
-                               RSurf_AddLightmapToVertexColors_Color4f(mesh->lightmapoffsets, varray_color4f, mesh->numverts, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
-               }
-               RSurf_FogColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, colorscale, mesh->numverts, modelorg);
-               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-       }
+       R_FillColors(varray_color4f, surf->mesh.num_vertices, base, base, base, currentalpha);
+       if (!(ent->effects & EF_FULLBRIGHT))
+       {
+               if (surf->dlightframe == r_framecount)
+                       RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, surf->mesh.num_vertices, surf->mesh.data_vertex3f, varray_color4f, 1);
+               if (surf->flags & SURF_LIGHTMAP)
+                       RSurf_AddLightmapToVertexColors_Color4f(surf->mesh.data_lightmapoffsets, varray_color4f,surf->mesh.num_vertices, surf->samples, ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3, surf->styles);
+       }
+       RSurf_FogColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, colorscale, surf->mesh.num_vertices, modelorg);
+       GL_LockArrays(0, surf->mesh.num_vertices);
+       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+       GL_LockArrays(0, 0);
 }
 
 static void RSurfShader_Wall_Pass_Glow(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha)
 {
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       m.pointer_color = varray_color4f;
        m.tex[0] = R_GetTexture(texture->skin.glow);
+
+       m.pointer_vertex = surf->mesh.data_vertex3f;
+       if (m.tex[0])
+               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
        R_Mesh_State(&m);
-       GL_UseColorArray();
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-       {
-               R_Mesh_GetSpace(mesh->numverts);
-               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-               RSurf_FoggedColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, 1, 1, 1, currentalpha, r_colorscale, mesh->numverts, modelorg);
-               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-       }
+       RSurf_FoggedColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, 1, 1, 1, currentalpha, 1, surf->mesh.num_vertices, modelorg);
+       GL_LockArrays(0, surf->mesh.num_vertices);
+       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+       GL_LockArrays(0, 0);
 }
 
 static void RSurfShader_Wall_Pass_Fog(const entity_render_t *ent, const msurface_t *surf, const texture_t *texture, int rendertype, float currentalpha)
 {
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       m.pointer_color = varray_color4f;
        m.tex[0] = R_GetTexture(texture->skin.fog);
+
+       m.pointer_vertex = surf->mesh.data_vertex3f;
+       if (m.tex[0])
+               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
        R_Mesh_State(&m);
-       GL_UseColorArray();
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-       {
-               R_Mesh_GetSpace(mesh->numverts);
-               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-               if (m.tex[0])
-                       R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-               RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, r_colorscale, mesh->numverts, modelorg);
-               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-       }
+       RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], currentalpha, 1, surf->mesh.num_vertices, modelorg);
+       GL_LockArrays(0, surf->mesh.num_vertices);
+       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+       GL_LockArrays(0, 0);
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
+static void RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetailGlow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        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;
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
        m.tex[0] = R_GetTexture(texture->skin.base);
        m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
+       m.texrgbscale[1] = 2;
        m.tex[2] = R_GetTexture(texture->skin.detail);
-       m.texrgbscale[0] = 1;
-       m.texrgbscale[1] = 4;
        m.texrgbscale[2] = 2;
-       R_Mesh_State(&m);
-       cl = (float) (1 << r_lightmapscalebit) * r_colorscale;
-       GL_Color(cl, cl, cl, 1);
+       if (texture->skin.glow)
+       {
+               m.tex[3] = R_GetTexture(texture->skin.glow);
+               m.texcombinergb[3] = GL_ADD;
+       }
+       if (r_shadow_realtime_world.integer)
+               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
+       else
+               GL_Color(1, 1, 1, 1);
+
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
                        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_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(1, mesh->texcoordlightmap2f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(2, mesh->texcoorddetail2f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.tex[1] = lightmaptexturenum;
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+                       m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f;
+                       m.pointer_texcoord[2] = surf->mesh.data_texcoorddetail2f;
+                       m.pointer_texcoord[3] = surf->mesh.data_texcoordtexture2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseDoubleTex(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
+static void RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetail(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        int lightmaptexturenum;
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_ONE;
-       m.blendfunc2 = GL_ZERO;
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
        m.tex[0] = R_GetTexture(texture->skin.base);
        m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
-       if (gl_combine.integer)
-               m.texrgbscale[1] = 4;
-       R_Mesh_State(&m);
-       GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+       m.texrgbscale[1] = 2;
+       m.tex[2] = R_GetTexture(texture->skin.detail);
+       m.texrgbscale[2] = 2;
+       if (r_shadow_realtime_world.integer)
+               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
+       else
+               GL_Color(1, 1, 1, 1);
+
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
                        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_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(1, mesh->texcoordlightmap2f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.tex[1] = lightmaptexturenum;
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+                       m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f;
+                       m.pointer_texcoord[2] = surf->mesh.data_texcoorddetail2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
+static void RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
+       int lightmaptexturenum;
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_ONE;
-       m.blendfunc2 = GL_ZERO;
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
        m.tex[0] = R_GetTexture(texture->skin.base);
-       R_Mesh_State(&m);
-       GL_Color(1, 1, 1, 1);
+       m.tex[1] = R_GetTexture((**surfchain).lightmaptexture);
+       m.texrgbscale[1] = 2;
+       if (r_shadow_realtime_world.integer)
+               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
+       else
+               GL_Color(1, 1, 1, 1);
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               R_Mesh_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+                       m.tex[1] = lightmaptexturenum;
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+                       m.pointer_texcoord[1] = surf->mesh.data_texcoordlightmap2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
+static void RSurfShader_OpaqueWall_Pass_BaseTexture(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
-       int lightmaptexturenum;
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_ZERO;
-       m.blendfunc2 = GL_SRC_COLOR;
-       m.tex[0] = R_GetTexture((**surfchain).lightmaptexture);
-       if (gl_combine.integer)
-               m.texrgbscale[0] = 4;
-       R_Mesh_State(&m);
-       GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       m.tex[0] = R_GetTexture(texture->skin.base);
+       if (r_shadow_realtime_world.integer)
+               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
+       else
+               GL_Color(1, 1, 1, 1);
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
-                       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_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoordlightmap2f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
 
-static void RSurfShader_OpaqueWall_Pass_Light(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
+static void RSurfShader_OpaqueWall_Pass_BaseLightmap(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
-       float colorscale;
        rmeshstate_t m;
-
+       int lightmaptexturenum;
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.tex[0] = R_GetTexture(texture->skin.base);
-       colorscale = r_colorscale;
-       if (gl_combine.integer)
-       {
-               m.texrgbscale[0] = 4;
-               colorscale *= 0.25f;
-       }
-       R_Mesh_State(&m);
-       GL_UseColorArray();
+       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture((**surfchain).lightmaptexture);
+       GL_Color(1, 1, 1, 1);
        while((surf = *surfchain++) != NULL)
        {
-               if (surf->visframe == r_framecount && surf->dlightframe == r_framecount)
+               if (surf->visframe == r_framecount)
                {
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               if (RSurf_LightCheck(&ent->inversematrix, surf->dlightbits, mesh))
-                               {
-                                       R_Mesh_GetSpace(mesh->numverts);
-                                       R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                                       R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                                       R_FillColors(varray_color4f, mesh->numverts, 0, 0, 0, 1);
-                                       RSurf_LightSeparate_Vertex3f_Color4f(&ent->inversematrix, surf->dlightbits, mesh->numverts, mesh->vertex3f, varray_color4f, colorscale);
-                                       R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                               }
-                       }
+                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+                       m.tex[0] = lightmaptexturenum;
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordlightmap2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
@@ -1160,28 +1160,26 @@ 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, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        float modelorg[3];
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       R_Mesh_State(&m);
-       GL_UseColorArray();
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       m.pointer_color = varray_color4f;
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               R_Mesh_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               if (m.tex[0])
-                                       R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                               RSurf_FogPassColors_Vertex3f_Color4f(mesh->vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, r_colorscale, mesh->numverts, modelorg);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       if (m.tex[0])
+                               m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+                       R_Mesh_State(&m);
+                       RSurf_FogPassColors_Vertex3f_Color4f(surf->mesh.data_vertex3f, varray_color4f, fogcolor[0], fogcolor[1], fogcolor[2], 1, 1, surf->mesh.num_vertices, modelorg);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
@@ -1189,25 +1187,23 @@ static void RSurfShader_OpaqueWall_Pass_Fog(const entity_render_t *ent, const te
 static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_DST_COLOR;
-       m.blendfunc2 = GL_SRC_COLOR;
+       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
        m.tex[0] = R_GetTexture(texture->skin.detail);
-       R_Mesh_State(&m);
        GL_Color(1, 1, 1, 1);
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               R_Mesh_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoorddetail2f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoorddetail2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
@@ -1215,54 +1211,81 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(const entity_render_t *ent, c
 static void RSurfShader_OpaqueWall_Pass_Glow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
        m.tex[0] = R_GetTexture(texture->skin.glow);
-       R_Mesh_State(&m);
-       GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+       GL_Color(1, 1, 1, 1);
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               R_Mesh_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
 
+/*
 static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
 {
        const msurface_t *surf;
-       const surfmesh_t *mesh;
        rmeshstate_t m;
        memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ZERO;
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ZERO);
+       GL_DepthMask(true);
        m.tex[0] = R_GetTexture(texture->skin.glow);
-       R_Mesh_State(&m);
        if (m.tex[0])
-               GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+               GL_Color(1, 1, 1, 1);
        else
                GL_Color(0, 0, 0, 1);
        while((surf = *surfchain++) != NULL)
        {
                if (surf->visframe == r_framecount)
                {
-                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                       {
-                               R_Mesh_GetSpace(mesh->numverts);
-                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                               R_Mesh_CopyTexCoord2f(0, mesh->texcoordtexture2f, mesh->numverts);
-                               R_Mesh_Draw(mesh->numverts, mesh->numtriangles, mesh->element3i);
-                       }
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordtexture2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
+               }
+       }
+}
+*/
+
+static void RSurfShader_OpaqueWall_Pass_BaseLightmapOnly(const entity_render_t *ent, const texture_t *texture, msurface_t **surfchain)
+{
+       const msurface_t *surf;
+       rmeshstate_t m;
+       int lightmaptexturenum;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture((**surfchain).lightmaptexture);
+       if (r_shadow_realtime_world.integer)
+               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
+       else
+               GL_Color(1, 1, 1, 1);
+       while((surf = *surfchain++) != NULL)
+       {
+               if (surf->visframe == r_framecount)
+               {
+                       lightmaptexturenum = R_GetTexture(surf->lightmaptexture);
+                       m.tex[0] = lightmaptexturenum;
+                       m.pointer_vertex = surf->mesh.data_vertex3f;
+                       m.pointer_texcoord[0] = surf->mesh.data_texcoordlightmap2f;
+                       R_Mesh_State(&m);
+                       GL_LockArrays(0, surf->mesh.num_vertices);
+                       R_Mesh_Draw(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i);
+                       GL_LockArrays(0, 0);
                }
        }
 }
@@ -1270,7 +1293,7 @@ static void RSurfShader_OpaqueWall_Pass_OpaqueGlow(const entity_render_t *ent, c
 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;
+       const msurface_t *surf = ent->model->brushq1.surfaces + calldata2;
        int rendertype;
        float currentalpha;
        texture_t *texture;
@@ -1281,8 +1304,6 @@ static void RSurfShader_Wall_Vertex_Callback(const void *calldata1, int calldata
                texture = texture->anim_frames[ent->frame != 0][(texture->anim_total[ent->frame != 0] >= 2) ? ((int) (cl.time * 5.0f) % texture->anim_total[ent->frame != 0]) : 0];
 
        currentalpha = ent->alpha;
-       if (texture->flags & SURF_WATERALPHA)
-               currentalpha *= r_wateralpha.value;
        if (ent->effects & EF_ADDITIVE)
                rendertype = SURFRENDER_ADD;
        else if (currentalpha < 1 || texture->skin.fog != NULL)
@@ -1310,60 +1331,75 @@ static void RSurfShader_Wall_Lightmap(const entity_render_t *ent, const texture_
                        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);
+                               R_MeshQueue_AddTransparent(center, RSurfShader_Wall_Vertex_Callback, ent, surf - ent->model->brushq1.surfaces);
                        }
                }
        }
-       else if (r_shadow_realtime_world.integer)
+       else if (ent->effects & EF_FULLBRIGHT)
        {
-               // opaque base lighting
-               RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, surfchain);
+               RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain);
+               if (r_detailtextures.integer)
+                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
+               if (texture->skin.glow)
+                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
                if (fogenabled)
                        RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
        }
-       else if (r_vertexsurfaces.integer)
+       /*
+       // opaque base lighting
+       else if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0)
        {
-               // opaque vertex shaded from lightmap
-               for (chain = surfchain;(surf = *chain) != NULL;chain++)
-                       if (surf->visframe == r_framecount)
-                               RSurfShader_Wall_Pass_BaseVertex(ent, surf, texture, texture->rendertype, texture->currentalpha);
+               if (r_ambient.value > 0)
+               {
+               }
+               else
+                       RSurfShader_OpaqueWall_Pass_OpaqueGlow(ent, texture, surfchain);
+               if (fogenabled)
+                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
+       }
+       */
+       // opaque lightmapped
+       else if (r_textureunits.integer >= 4 && gl_combine.integer && r_detailtextures.integer && !gl_lightmaps.integer)
+       {
+               RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetailGlow(ent, texture, surfchain);
+               if (fogenabled)
+                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
+       }
+       else if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer && !gl_lightmaps.integer)
+       {
+               RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmapDetail(ent, texture, surfchain);
                if (texture->skin.glow)
-                       for (chain = surfchain;(surf = *chain) != NULL;chain++)
-                               if (surf->visframe == r_framecount)
-                                       RSurfShader_Wall_Pass_Glow(ent, surf, texture, texture->rendertype, texture->currentalpha);
+                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
                if (fogenabled)
-                       for (chain = surfchain;(surf = *chain) != NULL;chain++)
-                               if (surf->visframe == r_framecount)
-                                       RSurfShader_Wall_Pass_Fog(ent, surf, texture, texture->rendertype, texture->currentalpha);
+                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
        }
-       else
+       else if (r_textureunits.integer >= 2 && gl_combine.integer && !gl_lightmaps.integer)
        {
-               // opaque lightmapped
-               if (r_textureunits.integer >= 2)
-               {
-                       if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer)
-                               RSurfShader_OpaqueWall_Pass_BaseTripleTexCombine(ent, texture, surfchain);
-                       else
-                       {
-                               RSurfShader_OpaqueWall_Pass_BaseDoubleTex(ent, texture, surfchain);
-                               if (r_detailtextures.integer)
-                                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
-                       }
-               }
-               else
-               {
-                       RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain);
-                       RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, surfchain);
-                       if (r_detailtextures.integer)
-                               RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
-               }
-               if (!r_dlightmap.integer && !(ent->effects & EF_FULLBRIGHT))
-                       RSurfShader_OpaqueWall_Pass_Light(ent, texture, surfchain);
+               RSurfShader_OpaqueWall_Pass_BaseCombine_TextureLightmap(ent, texture, surfchain);
+               if (r_detailtextures.integer)
+                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
+               if (texture->skin.glow)
+                       RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
+               if (fogenabled)
+                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
+       }
+       else if (!gl_lightmaps.integer)
+       {
+               RSurfShader_OpaqueWall_Pass_BaseTexture(ent, texture, surfchain);
+               RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, texture, surfchain);
+               if (r_detailtextures.integer)
+                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, texture, surfchain);
                if (texture->skin.glow)
                        RSurfShader_OpaqueWall_Pass_Glow(ent, texture, surfchain);
                if (fogenabled)
                        RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
        }
+       else
+       {
+               RSurfShader_OpaqueWall_Pass_BaseLightmapOnly(ent, texture, surfchain);
+               if (fogenabled)
+                       RSurfShader_OpaqueWall_Pass_Fog(ent, texture, surfchain);
+       }
 }
 
 Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, SHADERFLAGS_NEEDLIGHTMAP};
@@ -1388,9 +1424,9 @@ void R_UpdateTextureInfo(entity_render_t *ent)
 
        alttextures = ent->frame != 0;
        texframe = (int)(cl.time * 5.0f);
-       for (i = 0;i < ent->model->numtextures;i++)
+       for (i = 0;i < ent->model->brushq1.numtextures;i++)
        {
-               t = ent->model->textures + i;
+               t = ent->model->brushq1.textures + i;
                t->currentalpha = ent->alpha;
                if (t->flags & SURF_WATERALPHA)
                        t->currentalpha *= r_wateralpha.value;
@@ -1418,31 +1454,30 @@ void R_PrepareSurfaces(entity_render_t *ent)
                return;
 
        model = ent->model;
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
-       numsurfaces = model->nummodelsurfaces;
-       surfaces = model->surfaces + model->firstmodelsurface;
-       surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+       numsurfaces = model->brushq1.nummodelsurfaces;
+       surfaces = model->brushq1.surfaces + model->brushq1.firstmodelsurface;
+       surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
 
        R_UpdateTextureInfo(ent);
 
        if (r_dynamic.integer && !r_shadow_realtime_dlight.integer)
                R_MarkLights(ent);
 
-       if (model->light_ambient != r_ambient.value || model->light_scalebit != r_lightmapscalebit)
+       if (model->brushq1.light_ambient != r_ambient.value)
        {
-               model->light_ambient = r_ambient.value;
-               model->light_scalebit = r_lightmapscalebit;
-               for (i = 0;i < model->nummodelsurfaces;i++)
-                       model->surfaces[i + model->firstmodelsurface].cached_dlight = true;
+               model->brushq1.light_ambient = r_ambient.value;
+               for (i = 0;i < model->brushq1.nummodelsurfaces;i++)
+                       model->brushq1.surfaces[i + model->brushq1.firstmodelsurface].cached_dlight = true;
        }
        else
        {
-               for (i = 0;i < model->light_styles;i++)
+               for (i = 0;i < model->brushq1.light_styles;i++)
                {
-                       if (model->light_stylevalue[i] != d_lightstylevalue[model->light_style[i]])
+                       if (model->brushq1.light_stylevalue[i] != d_lightstylevalue[model->brushq1.light_style[i]])
                        {
-                               model->light_stylevalue[i] = d_lightstylevalue[model->light_style[i]];
-                               for (surfchain = model->light_styleupdatechains[i];*surfchain;surfchain++)
+                               model->brushq1.light_stylevalue[i] = d_lightstylevalue[model->brushq1.light_style[i]];
+                               for (surfchain = model->brushq1.light_styleupdatechains[i];*surfchain;surfchain++)
                                        (**surfchain).cached_dlight = true;
                        }
                }
@@ -1469,7 +1504,7 @@ void R_PrepareSurfaces(entity_render_t *ent)
                        {
                                c_faces++;
                                surf->visframe = r_framecount;
-                               if (surf->cached_dlight && surf->lightmaptexture != NULL && !r_vertexsurfaces.integer)
+                               if (surf->cached_dlight && surf->lightmaptexture != NULL)
                                        R_BuildLightMap(ent, surf);
                        }
                }
@@ -1483,7 +1518,7 @@ void R_DrawSurfaces(entity_render_t *ent, int type, msurface_t ***chains)
        if (ent->model == NULL)
                return;
        R_Mesh_Matrix(&ent->matrix);
-       for (i = 0, t = ent->model->textures;i < ent->model->numtextures;i++, t++)
+       for (i = 0, t = ent->model->brushq1.textures;i < ent->model->brushq1.numtextures;i++, t++)
                if (t->shader->shaderfunc[type] && t->currentframe && chains[i] != NULL)
                        t->shader->shaderfunc[type](ent, t->currentframe, chains[i]);
 }
@@ -1494,19 +1529,22 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
        float *v;
        rmeshstate_t m;
        const entity_render_t *ent = calldata1;
-       const mportal_t *portal = ent->model->portals + calldata2;
-       memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+       const mportal_t *portal = ent->model->brushq1.portals + calldata2;
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
        R_Mesh_Matrix(&ent->matrix);
+
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = varray_vertex3f;
        R_Mesh_State(&m);
-       R_Mesh_GetSpace(portal->numpoints);
-       i = portal - ent->model->portals;
-       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,
+
+       i = portal - ent->model->brushq1.portals;
+       GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f),
+                        ((i & 0x0038) >> 3) * (1.0f / 7.0f),
+                        ((i & 0x01C0) >> 6) * (1.0f / 7.0f),
                         0.125f);
-       if (PlaneDiff(r_origin, (&portal->plane)) > 0)
+       if (PlaneDiff(r_vieworigin, (&portal->plane)) < 0)
        {
                for (i = portal->numpoints - 1, v = varray_vertex3f;i >= 0;i--, v += 3)
                        VectorCopy(portal->points[i].position, v);
@@ -1514,9 +1552,12 @@ static void R_DrawPortal_Callback(const void *calldata1, int calldata2)
        else
                for (i = 0, v = varray_vertex3f;i < portal->numpoints;i++, v += 3)
                        VectorCopy(portal->points[i].position, v);
+       GL_LockArrays(0, portal->numpoints);
        R_Mesh_Draw(portal->numpoints, portal->numpoints - 2, polygonelements);
+       GL_LockArrays(0, 0);
 }
 
+// LordHavoc: this is just a nice debugging tool, very slow
 static void R_DrawPortals(entity_render_t *ent)
 {
        int i;
@@ -1524,9 +1565,9 @@ static void R_DrawPortals(entity_render_t *ent)
        float temp[3], center[3], f;
        if (ent->model == NULL)
                return;
-       for (portal = ent->model->portals, endportal = portal + ent->model->numportals;portal < endportal;portal++)
+       for (portal = ent->model->brushq1.portals, endportal = portal + ent->model->brushq1.numportals;portal < endportal;portal++)
        {
-               if ((portal->here->pvsframe == ent->model->pvsframecount || portal->past->pvsframe == ent->model->pvsframecount) && portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
+               if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
                {
                        VectorClear(temp);
                        for (i = 0;i < portal->numpoints;i++)
@@ -1534,7 +1575,7 @@ static void R_DrawPortals(entity_render_t *ent)
                        f = ixtable[portal->numpoints];
                        VectorScale(temp, f, temp);
                        Matrix4x4_Transform(&ent->matrix, temp, center);
-                       R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->portals);
+                       R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, ent, portal - ent->model->brushq1.portals);
                }
        }
 }
@@ -1554,12 +1595,12 @@ void R_PrepareBrushModel(entity_render_t *ent)
        if (model == NULL)
                return;
 #if WORLDNODECULLBACKFACES
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
 #endif
-       numsurfaces = model->nummodelsurfaces;
-       surf = model->surfaces + model->firstmodelsurface;
-       surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
-       surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface;
+       numsurfaces = model->brushq1.nummodelsurfaces;
+       surf = model->brushq1.surfaces + model->brushq1.firstmodelsurface;
+       surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
+       surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.firstmodelsurface;
        for (i = 0;i < numsurfaces;i++, surf++)
        {
 #if WORLDNODECULLBACKFACES
@@ -1591,11 +1632,11 @@ void R_SurfaceWorldNode (entity_render_t *ent)
        model = ent->model;
        if (model == NULL)
                return;
-       surfacevisframes = model->surfacevisframes + model->firstmodelsurface;
-       surfacepvsframes = model->surfacepvsframes + model->firstmodelsurface;
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       surfacevisframes = model->brushq1.surfacevisframes + model->brushq1.firstmodelsurface;
+       surfacepvsframes = model->brushq1.surfacepvsframes + model->brushq1.firstmodelsurface;
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
 
-       for (leaf = model->pvsleafchain;leaf;leaf = leaf->pvschain)
+       for (leaf = model->brushq1.pvsleafchain;leaf;leaf = leaf->pvschain)
        {
                if (!R_CullBox (leaf->mins, leaf->maxs))
                {
@@ -1604,10 +1645,10 @@ void R_SurfaceWorldNode (entity_render_t *ent)
                }
        }
 
-       for (i = 0;i < model->pvssurflistlength;i++)
+       for (i = 0;i < model->brushq1.pvssurflistlength;i++)
        {
-               surfnum = model->pvssurflist[i];
-               surf = model->surfaces + surfnum;
+               surfnum = model->brushq1.pvssurflist[i];
+               surf = model->brushq1.surfaces + surfnum;
 #if WORLDNODECULLBACKFACES
                if (PlaneDist(modelorg, surf->plane) < surf->plane->dist)
                {
@@ -1643,9 +1684,9 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
        // follows portals leading outward from viewleaf, does not venture
        // offscreen or into leafs that are not visible, faster than Quake's
        // RecursiveWorldNode
-       surfaces = ent->model->surfaces;
-       surfacevisframes = ent->model->surfacevisframes;
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
+       surfaces = ent->model->brushq1.surfaces;
+       surfacevisframes = ent->model->brushq1.surfacevisframes;
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
        viewleaf->worldnodeframe = r_framecount;
        leafstack[0] = viewleaf;
        leafstackpos = 1;
@@ -1692,7 +1733,7 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
                                {
                                        leaf->worldnodeframe = r_framecount;
                                        // FIXME: R_CullBox is absolute, should be done relative
-                                       if (leaf->pvsframe == ent->model->pvsframecount && !R_CullBox(leaf->mins, leaf->maxs))
+                                       if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs))
                                                leafstack[leafstackpos++] = leaf;
                                }
                        }
@@ -1702,58 +1743,45 @@ static void R_PortalWorldNode(entity_render_t *ent, mleaf_t *viewleaf)
 
 void R_PVSUpdate (entity_render_t *ent, mleaf_t *viewleaf)
 {
-       int i, j, l, c, bits, *surfacepvsframes, *mark;
+       int j, c, *surfacepvsframes, *mark;
        mleaf_t *leaf;
-       qbyte *vis;
        model_t *model;
 
        model = ent->model;
-       if (model && (model->pvsviewleaf != viewleaf || model->pvsviewleafnovis != r_novis.integer))
+       if (model && (model->brushq1.pvsviewleaf != viewleaf || model->brushq1.pvsviewleafnovis != r_novis.integer))
        {
-               model->pvsframecount++;
-               model->pvsviewleaf = viewleaf;
-               model->pvsviewleafnovis = r_novis.integer;
-               model->pvsleafchain = NULL;
-               model->pvssurflistlength = 0;
+               model->brushq1.pvsframecount++;
+               model->brushq1.pvsviewleaf = viewleaf;
+               model->brushq1.pvsviewleafnovis = r_novis.integer;
+               model->brushq1.pvsleafchain = NULL;
+               model->brushq1.pvssurflistlength = 0;
                if (viewleaf)
                {
-                       surfacepvsframes = model->surfacepvsframes;
-                       vis = Mod_LeafPVS (viewleaf, model);
-                       for (j = 0;j < model->numleafs;j += 8)
+                       surfacepvsframes = model->brushq1.surfacepvsframes;
+                       for (j = 0, leaf = model->brushq1.data_leafs;j < model->brushq1.num_leafs;j++, leaf++)
                        {
-                               bits = *vis++;
-                               if (bits)
+                               if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex))
                                {
-                                       l = model->numleafs - j;
-                                       if (l > 8)
-                                               l = 8;
-                                       for (i = 0;i < l;i++)
-                                       {
-                                               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++)
-                                                               surfacepvsframes[*mark] = model->pvsframecount;
-                                               }
-                                       }
+                                       leaf->pvsframe = model->brushq1.pvsframecount;
+                                       leaf->pvschain = model->brushq1.pvsleafchain;
+                                       model->brushq1.pvsleafchain = leaf;
+                                       // mark surfaces bounding this leaf as visible
+                                       for (c = leaf->nummarksurfaces, mark = leaf->firstmarksurface;c;c--, mark++)
+                                               surfacepvsframes[*mark] = model->brushq1.pvsframecount;
                                }
                        }
-                       Mod_BuildPVSTextureChains(model);
+                       model->brushq1.BuildPVSTextureChains(model);
                }
        }
 }
 
-void R_WorldVisibility (entity_render_t *ent)
+void R_WorldVisibility(entity_render_t *ent)
 {
        vec3_t modelorg;
        mleaf_t *viewleaf;
 
-       Matrix4x4_Transform(&ent->inversematrix, r_origin, modelorg);
-       viewleaf = Mod_PointInLeaf (modelorg, ent->model);
+       Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+       viewleaf = (ent->model && ent->model->brushq1.PointInLeaf) ? ent->model->brushq1.PointInLeaf(ent->model, modelorg) : NULL;
        R_PVSUpdate(ent, viewleaf);
 
        if (!viewleaf)
@@ -1765,49 +1793,60 @@ void R_WorldVisibility (entity_render_t *ent)
                R_PortalWorldNode (ent, viewleaf);
 }
 
-void R_DrawWorld (entity_render_t *ent)
+void R_DrawWorld(entity_render_t *ent)
 {
        if (ent->model == NULL)
                return;
-       R_PrepareSurfaces(ent);
-       R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains);
-       R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains);
-       if (r_drawportals.integer)
-               R_DrawPortals(ent);
+       if (!ent->model->brushq1.num_leafs)
+       {
+               if (ent->model->DrawSky)
+                       ent->model->DrawSky(ent);
+               if (ent->model->Draw)
+                       ent->model->Draw(ent);
+       }
+       else
+       {
+               R_PrepareSurfaces(ent);
+               R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->brushq1.pvstexturechains);
+               R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->brushq1.pvstexturechains);
+               if (r_drawportals.integer)
+                       R_DrawPortals(ent);
+       }
 }
 
-void R_Model_Brush_DrawSky (entity_render_t *ent)
+void R_Model_Brush_DrawSky(entity_render_t *ent)
 {
        if (ent->model == NULL)
                return;
        if (ent != &cl_entities[0].render)
                R_PrepareBrushModel(ent);
-       R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->pvstexturechains);
+       R_DrawSurfaces(ent, SHADERSTAGE_SKY, ent->model->brushq1.pvstexturechains);
 }
 
-void R_Model_Brush_Draw (entity_render_t *ent)
+void R_Model_Brush_Draw(entity_render_t *ent)
 {
        if (ent->model == NULL)
                return;
        c_bmodels++;
        if (ent != &cl_entities[0].render)
                R_PrepareBrushModel(ent);
-       R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->pvstexturechains);
+       R_DrawSurfaces(ent, SHADERSTAGE_NORMAL, ent->model->brushq1.pvstexturechains);
 }
 
 void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelightorigin, float lightradius)
 {
+#if 0
        int i;
        msurface_t *surf;
        float projectdistance, f, temp[3], lightradius2;
-       surfmesh_t *mesh;
        if (ent->model == NULL)
                return;
        R_Mesh_Matrix(&ent->matrix);
        lightradius2 = lightradius * lightradius;
        R_UpdateTextureInfo(ent);
-       projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
-       for (i = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;i < ent->model->nummodelsurfaces;i++, surf++)
+       projectdistance = lightradius + ent->model->radius;//projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
+       //projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
+       for (i = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;i < ent->model->brushq1.nummodelsurfaces;i++, surf++)
        {
                if (surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && surf->flags & SURF_SHADOWCAST)
                {
@@ -1821,54 +1860,114 @@ void R_Model_Brush_DrawShadowVolume (entity_render_t *ent, vec3_t relativelighto
                                temp[1] = bound(surf->poly_mins[1], relativelightorigin[1], surf->poly_maxs[1]) - relativelightorigin[1];
                                temp[2] = bound(surf->poly_mins[2], relativelightorigin[2], surf->poly_maxs[2]) - relativelightorigin[2];
                                if (DotProduct(temp, temp) < lightradius2)
-                               {
-                                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                                       {
-                                               R_Mesh_GetSpace(mesh->numverts);
-                                               R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numverts);
-                                               R_Shadow_Volume(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->neighbor3i, relativelightorigin, lightradius, projectdistance);
-                                       }
-                               }
+                                       R_Shadow_VolumeFromSphere(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_vertex3f, surf->mesh.data_element3i, surf->mesh.data_neighbor3i, relativelightorigin, projectdistance, lightradius);
                        }
                }
        }
-}
-
-void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, msurface_t **surflist, int numsurfaces, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz)
-{
-       int surfnum;
+#else
+       int t, leafnum, marksurfnum, trianglenum;
+       const int *e;
        msurface_t *surf;
-       texture_t *t;
-       surfmesh_t *mesh;
+       mleaf_t *leaf;
+       const qbyte *pvs;
+       float projectdistance;
+       const float *v[3];
+       vec3_t lightmins, lightmaxs;
        if (ent->model == NULL)
                return;
        R_Mesh_Matrix(&ent->matrix);
        R_UpdateTextureInfo(ent);
-       for (surfnum = 0;surfnum < numsurfaces;surfnum++)
+       projectdistance = lightradius + ent->model->radius;//projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
+       lightmins[0] = relativelightorigin[0] - lightradius;
+       lightmins[1] = relativelightorigin[1] - lightradius;
+       lightmins[2] = relativelightorigin[2] - lightradius;
+       lightmaxs[0] = relativelightorigin[0] + lightradius;
+       lightmaxs[1] = relativelightorigin[1] + lightradius;
+       lightmaxs[2] = relativelightorigin[2] + lightradius;
+       /*
+       R_Shadow_PrepareShadowMark(ent->model->brush.shadowmesh->numtriangles);
+       maxmarksurfaces = sizeof(surfacelist) / sizeof(surfacelist[0]);
+       ent->model->brushq1.GetVisible(ent->model, relativelightorigin, lightmins, lightmaxs, 0, NULL, NULL, maxmarkleafs, markleaf, &nummarkleafs);
+       for (marksurfacenum = 0;marksurfacenum < nummarksurfaces;marksurfacenum++)
+       {
+               surf = marksurface[marksurfacenum];
+               if (surf->shadowmark != shadowmarkcount)
+               {
+                       surf->shadowmark = shadowmarkcount;
+                       if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && (surf->flags & SURF_SHADOWCAST))
+                       {
+                               for (trianglenum = 0, t = surf->num_firstshadowmeshtriangle, e = ent->model->brush.shadowmesh->element3i + t * 3;trianglenum < surf->mesh.num_triangles;trianglenum++, t++, e += 3)
+                               {
+                                       v[0] = ent->model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                       v[1] = ent->model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                       v[2] = ent->model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                       if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
+                                               shadowmarklist[numshadowmark++] = t;
+                               }
+                       }
+               }
+       }
+       */
+       R_Shadow_PrepareShadowMark(ent->model->brush.shadowmesh->numtriangles);
+       if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
        {
-               surf = surflist[surfnum];
-               if (surf->visframe == r_framecount)
+               pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
+               // FIXME: use BSP recursion in q1bsp as dlights are often small
+               for (leafnum = 0, leaf = ent->model->brushq1.data_leafs;leafnum < ent->model->brushq1.num_leafs;leafnum++, leaf++)
+               {
+                       if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
+                       {
+                               for (marksurfnum = 0;marksurfnum < leaf->nummarksurfaces;marksurfnum++)
+                               {
+                                       surf = ent->model->brushq1.surfaces + leaf->firstmarksurface[marksurfnum];
+                                       if (surf->shadowmark != shadowmarkcount)
+                                       {
+                                               surf->shadowmark = shadowmarkcount;
+                                               if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && (surf->flags & SURF_SHADOWCAST))
+                                               {
+                                                       for (trianglenum = 0, t = surf->num_firstshadowmeshtriangle, e = ent->model->brush.shadowmesh->element3i + t * 3;trianglenum < surf->mesh.num_triangles;trianglenum++, t++, e += 3)
+                                                       {
+                                                               v[0] = ent->model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                                               v[1] = ent->model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                                               v[2] = ent->model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                                               if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
+                                                                       shadowmarklist[numshadowmark++] = t;
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+       else
+       {
+               for (marksurfnum = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;marksurfnum < ent->model->brushq1.nummodelsurfaces;marksurfnum++, surf++)
                {
-                       t = surf->texinfo->texture->currentframe;
-                       if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
+                       if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && surf->texinfo->texture->rendertype == SURFRENDER_OPAQUE && (surf->flags & SURF_SHADOWCAST))
                        {
-                               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+                               for (trianglenum = 0, t = surf->num_firstshadowmeshtriangle, e = ent->model->brush.shadowmesh->element3i + t * 3;trianglenum < surf->mesh.num_triangles;trianglenum++, t++, e += 3)
                                {
-                                       R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL);
-                                       R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL);
+                                       v[0] = ent->model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                       v[1] = ent->model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                       v[2] = ent->model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                       if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
+                                               shadowmarklist[numshadowmark++] = t;
                                }
                        }
                }
        }
+       R_Shadow_VolumeFromList(ent->model->brush.shadowmesh->numverts, ent->model->brush.shadowmesh->numtriangles, ent->model->brush.shadowmesh->vertex3f, ent->model->brush.shadowmesh->element3i, ent->model->brush.shadowmesh->neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
+#endif
 }
 
-void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz)
+void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap)
 {
-       int surfnum;
+       int leafnum, marksurfnum;
        msurface_t *surf;
+       mleaf_t *leaf;
+       const qbyte *pvs;
        texture_t *t;
-       float f, lightmins[3], lightmaxs[3];
-       surfmesh_t *mesh;
+       float lightmins[3], lightmaxs[3];
        if (ent->model == NULL)
                return;
        R_Mesh_Matrix(&ent->matrix);
@@ -1879,30 +1978,27 @@ void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, v
        lightmaxs[1] = relativelightorigin[1] + lightradius;
        lightmaxs[2] = relativelightorigin[2] + lightradius;
        R_UpdateTextureInfo(ent);
-       if (ent != &cl_entities[0].render)
+       shadowmarkcount++;
+       if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
        {
-               // bmodel, cull crudely to view and light
-               for (surfnum = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;surfnum < ent->model->nummodelsurfaces;surfnum++, surf++)
+               pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
+               for (leafnum = 0, leaf = ent->model->brushq1.data_leafs;leafnum < ent->model->brushq1.num_leafs;leafnum++, leaf++)
                {
-                       if (BoxesOverlap(surf->poly_mins, surf->poly_maxs, lightmins, lightmaxs))
+                       if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
                        {
-                               f = PlaneDiff(relativelightorigin, surf->plane);
-                               if (surf->flags & SURF_PLANEBACK)
-                                       f = -f;
-                               if (f >= -0.1 && f < lightradius)
+                               for (marksurfnum = 0;marksurfnum < leaf->nummarksurfaces;marksurfnum++)
                                {
-                                       f = PlaneDiff(relativeeyeorigin, surf->plane);
-                                       if (surf->flags & SURF_PLANEBACK)
-                                               f = -f;
-                                       if (f > 0)
+                                       surf = ent->model->brushq1.surfaces + leaf->firstmarksurface[marksurfnum];
+                                       if (surf->shadowmark != shadowmarkcount)
                                        {
-                                               t = surf->texinfo->texture->currentframe;
-                                               if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
+                                               surf->shadowmark = shadowmarkcount;
+                                               if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && (ent != &cl_entities[0].render || surf->visframe == r_framecount))
                                                {
-                                                       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+                                                       t = surf->texinfo->texture->currentframe;
+                                                       if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
                                                        {
-                                                               R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL);
-                                                               R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL);
+                                                               R_Shadow_DiffuseLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, lightcubemap);
+                                                               R_Shadow_SpecularLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, lightcubemap);
                                                        }
                                                }
                                        }
@@ -1912,31 +2008,674 @@ void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, v
        }
        else
        {
-               // world, already culled to view, just cull to light
-               for (surfnum = 0, surf = ent->model->surfaces + ent->model->firstmodelsurface;surfnum < ent->model->nummodelsurfaces;surfnum++, surf++)
+               for (marksurfnum = 0, surf = ent->model->brushq1.surfaces + ent->model->brushq1.firstmodelsurface;marksurfnum < ent->model->brushq1.nummodelsurfaces;marksurfnum++, surf++)
                {
-                       if (surf->visframe == r_framecount && BoxesOverlap(surf->poly_mins, surf->poly_maxs, lightmins, lightmaxs))
+                       if (BoxesOverlap(lightmins, lightmaxs, surf->poly_mins, surf->poly_maxs) && (ent != &cl_entities[0].render || surf->visframe == r_framecount))
                        {
-                               f = PlaneDiff(relativelightorigin, surf->plane);
-                               if (surf->flags & SURF_PLANEBACK)
-                                       f = -f;
-                               if (f >= -0.1 && f < lightradius)
+                               t = surf->texinfo->texture->currentframe;
+                               if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
                                {
-                                       t = surf->texinfo->texture->currentframe;
-                                       if (t->rendertype == SURFRENDER_OPAQUE && t->flags & SURF_SHADOWLIGHT)
-                                       {
-                                               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-                                               {
-                                                       R_Shadow_DiffuseLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, NULL);
-                                                       R_Shadow_SpecularLighting(mesh->numverts, mesh->numtriangles, mesh->element3i, mesh->vertex3f, mesh->svector3f, mesh->tvector3f, mesh->normal3f, mesh->texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, NULL);
-                                               }
-                                       }
+                                       R_Shadow_DiffuseLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.base, t->skin.nmap, lightcubemap);
+                                       R_Shadow_SpecularLighting(surf->mesh.num_vertices, surf->mesh.num_triangles, surf->mesh.data_element3i, surf->mesh.data_vertex3f, surf->mesh.data_svector3f, surf->mesh.data_tvector3f, surf->mesh.data_normal3f, surf->mesh.data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, t->skin.gloss, t->skin.nmap, lightcubemap);
                                }
                        }
                }
        }
 }
 
+void R_DrawCollisionBrush(colbrushf_t *brush)
+{
+       int i;
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = brush->points->v;
+       R_Mesh_State(&m);
+       i = ((int)brush) / sizeof(colbrushf_t);
+       GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f);
+       GL_LockArrays(0, brush->numpoints);
+       R_Mesh_Draw(brush->numpoints, brush->numtriangles, brush->elements);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawCollisionFace(entity_render_t *ent, q3mface_t *face)
+{
+       int i;
+       rmeshstate_t m;
+       if (!face->num_collisiontriangles)
+               return;
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = face->data_collisionvertex3f;
+       R_Mesh_State(&m);
+       i = ((int)face) / sizeof(q3mface_t);
+       GL_Color((i & 31) * (1.0f / 32.0f), ((i >> 5) & 31) * (1.0f / 32.0f), ((i >> 10) & 31) * (1.0f / 32.0f), 0.2f);
+       GL_LockArrays(0, face->num_collisionvertices);
+       R_Mesh_Draw(face->num_collisionvertices, face->num_collisiontriangles, face->data_collisionelement3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawSkyFace(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       if (!face->num_triangles)
+               return;
+       c_faces++;
+       if (skyrendernow)
+       {
+               skyrendernow = false;
+               if (skyrendermasked)
+                       R_Sky();
+       }
+
+       R_Mesh_Matrix(&ent->matrix);
+
+       GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], 1);
+       if (skyrendermasked)
+       {
+               // depth-only (masking)
+               GL_ColorMask(0,0,0,0);
+               // just to make sure that braindead drivers don't draw anything
+               // despite that colormask...
+               GL_BlendFunc(GL_ZERO, GL_ONE);
+       }
+       else
+       {
+               // fog sky
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+       }
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+
+       memset(&m, 0, sizeof(m));
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+       GL_ColorMask(1,1,1,1);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       if (face->texture->skin.glow)
+       {
+               m.tex[0] = R_GetTexture(face->texture->skin.glow);
+               m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+               GL_Color(1, 1, 1, 1);
+       }
+       else
+               GL_Color(0, 0, 0, 1);
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->texture->skin.base);
+       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+       m.tex[1] = R_GetTexture(face->lightmaptexture);
+       m.pointer_texcoord[1] = face->data_texcoordlightmap2f;
+       m.texrgbscale[1] = 2;
+       GL_Color(1, 1, 1, 1);
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->texture->skin.base);
+       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+       GL_Color(1, 1, 1, 1);
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->lightmaptexture);
+       m.pointer_texcoord[0] = face->data_texcoordlightmap2f;
+       GL_Color(1, 1, 1, 1);
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_LightmapOnly(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->lightmaptexture);
+       m.pointer_texcoord[0] = face->data_texcoordlightmap2f;
+       if (r_shadow_realtime_world.integer)
+               GL_Color(r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, r_shadow_realtime_world_lightmaps.value, 1);
+       else
+               GL_Color(1, 1, 1, 1);
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       if (face->texture->skin.glow)
+       {
+               m.tex[0] = R_GetTexture(face->texture->skin.glow);
+               m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+               GL_Color(1, 1, 1, 1);
+       }
+       else
+               GL_Color(0, 0, 0, 1);
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(entity_render_t *ent, q3mface_t *face)
+{
+       int i;
+       float mul;
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->texture->skin.base);
+       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+       mul = 2.0f;
+       if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value != 1)
+               mul *= r_shadow_realtime_world_lightmaps.value;
+       if (mul == 2 && gl_combine.integer)
+       {
+               m.texrgbscale[0] = 2;
+               m.pointer_color = face->data_color4f;
+       }
+       else if (mul == 1)
+               m.pointer_color = face->data_color4f;
+       else
+       {
+               for (i = 0;i < face->num_vertices;i++)
+               {
+                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * mul;
+                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * mul;
+                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * mul;
+                       varray_color4f[i*4+3] = face->data_color4f[i*4+3];
+               }
+               m.pointer_color = varray_color4f;
+       }
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_VertexOnly(entity_render_t *ent, q3mface_t *face)
+{
+       int i;
+       float mul;
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ZERO);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       mul = 2.0f;
+       if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value != 1)
+               mul *= r_shadow_realtime_world_lightmaps.value;
+       if (mul == 1)
+               m.pointer_color = face->data_color4f;
+       else
+       {
+               for (i = 0;i < face->num_vertices;i++)
+               {
+                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
+                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
+                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
+                       varray_color4f[i*4+3] = face->data_color4f[i*4+3];
+               }
+               m.pointer_color = varray_color4f;
+       }
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(entity_render_t *ent, q3mface_t *face)
+{
+       rmeshstate_t m;
+       memset(&m, 0, sizeof(m));
+       GL_BlendFunc(GL_ONE, GL_ONE);
+       GL_DepthMask(true);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->texture->skin.base);
+       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+       GL_Color(r_ambient.value * (1.0f / 128.0f), r_ambient.value * (1.0f / 128.0f), r_ambient.value * (1.0f / 128.0f), 1);
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+}
+
+void R_Q3BSP_DrawFace_TransparentCallback(const void *voident, int facenumber)
+{
+       const entity_render_t *ent = voident;
+       q3mface_t *face = ent->model->brushq3.data_faces + facenumber;
+       rmeshstate_t m;
+       R_Mesh_Matrix(&ent->matrix);
+       memset(&m, 0, sizeof(m));
+       if (ent->effects & EF_ADDITIVE)
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       else
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       GL_DepthMask(false);
+       GL_DepthTest(true);
+       m.tex[0] = R_GetTexture(face->texture->skin.base);
+       m.pointer_texcoord[0] = face->data_texcoordtexture2f;
+       // LordHavoc: quake3 was not able to do this; lit transparent surfaces
+       if (gl_combine.integer)
+       {
+               m.texrgbscale[0] = 2;
+               if (r_textureunits.integer >= 2)
+               {
+                       m.tex[1] = R_GetTexture(face->lightmaptexture);
+                       m.pointer_texcoord[1] = face->data_texcoordlightmap2f;
+                       GL_Color(1, 1, 1, ent->alpha);
+               }
+               else
+               {
+                       if (ent->alpha == 1)
+                               m.pointer_color = face->data_color4f;
+                       else
+                       {
+                               int i;
+                               for (i = 0;i < face->num_vertices;i++)
+                               {
+                                       varray_color4f[i*4+0] = face->data_color4f[i*4+0];
+                                       varray_color4f[i*4+1] = face->data_color4f[i*4+1];
+                                       varray_color4f[i*4+2] = face->data_color4f[i*4+2];
+                                       varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
+                               }
+                               m.pointer_color = varray_color4f;
+                       }
+               }
+       }
+       else
+       {
+               int i;
+               for (i = 0;i < face->num_vertices;i++)
+               {
+                       varray_color4f[i*4+0] = face->data_color4f[i*4+0] * 2.0f;
+                       varray_color4f[i*4+1] = face->data_color4f[i*4+1] * 2.0f;
+                       varray_color4f[i*4+2] = face->data_color4f[i*4+2] * 2.0f;
+                       varray_color4f[i*4+3] = face->data_color4f[i*4+3] * ent->alpha;
+               }
+               m.pointer_color = varray_color4f;
+       }
+       m.pointer_vertex = face->data_vertex3f;
+       R_Mesh_State(&m);
+       qglDisable(GL_CULL_FACE);
+       GL_LockArrays(0, face->num_vertices);
+       R_Mesh_Draw(face->num_vertices, face->num_triangles, face->data_element3i);
+       GL_LockArrays(0, 0);
+       qglEnable(GL_CULL_FACE);
+}
+
+void R_Q3BSP_DrawFace(entity_render_t *ent, q3mface_t *face)
+{
+       if (!face->num_triangles)
+               return;
+       if (face->texture->surfaceparms)
+       {
+               if (face->texture->surfaceflags & (Q3SURFACEFLAG_SKY | Q3SURFACEFLAG_NODRAW))
+                       return;
+       }
+       c_faces++;
+       face->visframe = r_framecount;
+       if ((face->texture->surfaceparms & Q3SURFACEPARM_TRANS) || ent->alpha < 1 || (ent->effects & EF_ADDITIVE))
+       {
+               vec3_t facecenter, center;
+               facecenter[0] = (face->mins[0] + face->maxs[0]) * 0.5f;
+               facecenter[1] = (face->mins[1] + face->maxs[1]) * 0.5f;
+               facecenter[2] = (face->mins[2] + face->maxs[2]) * 0.5f;
+               Matrix4x4_Transform(&ent->matrix, facecenter, center);
+               R_MeshQueue_AddTransparent(center, R_Q3BSP_DrawFace_TransparentCallback, ent, face - ent->model->brushq3.data_faces);
+               return;
+       }
+       R_Mesh_Matrix(&ent->matrix);
+       if (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0)
+               R_Q3BSP_DrawFace_OpaqueWall_Pass_OpaqueGlow(ent, face);
+       else if ((ent->effects & EF_FULLBRIGHT) || r_fullbright.integer)
+       {
+               R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(ent, face);
+               if (face->texture->skin.glow)
+                       R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face);
+       }
+       else if (face->lightmaptexture)
+       {
+               if (gl_lightmaps.integer)
+                       R_Q3BSP_DrawFace_OpaqueWall_Pass_LightmapOnly(ent, face);
+               else
+               {
+                       if (r_textureunits.integer >= 2 && gl_combine.integer)
+                               R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureLightmapCombine(ent, face);
+                       else
+                       {
+                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Texture(ent, face);
+                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Lightmap(ent, face);
+                       }
+                       if (face->texture->skin.glow)
+                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face);
+               }
+       }
+       else
+       {
+               if (gl_lightmaps.integer)
+                       R_Q3BSP_DrawFace_OpaqueWall_Pass_VertexOnly(ent, face);
+               else
+               {
+                       R_Q3BSP_DrawFace_OpaqueWall_Pass_TextureVertex(ent, face);
+                       if (face->texture->skin.glow)
+                               R_Q3BSP_DrawFace_OpaqueWall_Pass_Glow(ent, face);
+               }
+       }
+       if (r_ambient.value)
+               R_Q3BSP_DrawFace_OpaqueWall_Pass_AddTextureAmbient(ent, face);
+}
+
+void R_Q3BSP_RecursiveWorldNode(q3mnode_t *node)
+{
+       int i;
+       q3mleaf_t *leaf;
+       for (;;)
+       {
+               if (R_CullBox(node->mins, node->maxs))
+                       return;
+               if (!node->plane)
+                       break;
+               c_nodes++;
+               R_Q3BSP_RecursiveWorldNode(node->children[0]);
+               node = node->children[1];
+       }
+       leaf = (q3mleaf_t *)node;
+       if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex))
+       {
+               c_leafs++;
+               for (i = 0;i < leaf->numleaffaces;i++)
+                       leaf->firstleafface[i]->visframe = r_framecount;
+       }
+}
+
+// FIXME: num_leafs needs to be recalculated at load time to include only
+// node-referenced leafs, as some maps are incorrectly compiled with leafs for
+// the submodels (which would render the submodels occasionally, as part of
+// the world - not good)
+void R_Q3BSP_MarkLeafPVS(void)
+{
+       int i, j;
+       q3mleaf_t *leaf;
+       for (j = 0, leaf = cl.worldmodel->brushq3.data_leafs;j < cl.worldmodel->brushq3.num_leafs;j++, leaf++)
+       {
+               if (CHECKPVSBIT(r_pvsbits, leaf->clusterindex))
+               {
+                       c_leafs++;
+                       for (i = 0;i < leaf->numleaffaces;i++)
+                               leaf->firstleafface[i]->visframe = r_framecount;
+               }
+       }
+}
+
+static int r_q3bsp_framecount = -1;
+
+void R_Q3BSP_DrawSky(entity_render_t *ent)
+{
+       int i;
+       q3mface_t *face;
+       vec3_t modelorg;
+       model_t *model;
+       qbyte *pvs;
+       R_Mesh_Matrix(&ent->matrix);
+       model = ent->model;
+       if (r_drawcollisionbrushes.integer < 2)
+       {
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+               if (ent == &cl_entities[0].render && model->brush.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg)))
+               {
+                       if (r_q3bsp_framecount != r_framecount)
+                       {
+                               r_q3bsp_framecount = r_framecount;
+                               R_Q3BSP_RecursiveWorldNode(model->brushq3.data_nodes);
+                               //R_Q3BSP_MarkLeafPVS();
+                       }
+                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
+                               if (face->visframe == r_framecount && (face->texture->surfaceflags & Q3SURFACEFLAG_SKY) && !R_CullBox(face->mins, face->maxs))
+                                       R_Q3BSP_DrawSkyFace(ent, face);
+               }
+               else
+                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
+                               if ((face->texture->surfaceflags & Q3SURFACEFLAG_SKY))
+                                       R_Q3BSP_DrawSkyFace(ent, face);
+       }
+}
+
+void R_Q3BSP_Draw(entity_render_t *ent)
+{
+       int i;
+       q3mface_t *face;
+       vec3_t modelorg;
+       model_t *model;
+       qbyte *pvs;
+       R_Mesh_Matrix(&ent->matrix);
+       model = ent->model;
+       if (r_drawcollisionbrushes.integer < 2)
+       {
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+               if (ent == &cl_entities[0].render && model->brush.num_pvsclusters && !r_novis.integer && (pvs = model->brush.GetPVS(model, modelorg)))
+               {
+                       if (r_q3bsp_framecount != r_framecount)
+                       {
+                               r_q3bsp_framecount = r_framecount;
+                               R_Q3BSP_RecursiveWorldNode(model->brushq3.data_nodes);
+                               //R_Q3BSP_MarkLeafPVS();
+                       }
+                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
+                               if (face->visframe == r_framecount && !R_CullBox(face->mins, face->maxs))
+                                       R_Q3BSP_DrawFace(ent, face);
+               }
+               else
+                       for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
+                               R_Q3BSP_DrawFace(ent, face);
+       }
+       if (r_drawcollisionbrushes.integer >= 1)
+       {
+               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+               GL_DepthMask(false);
+               GL_DepthTest(true);
+               qglPolygonOffset(r_drawcollisionbrushes_polygonfactor.value, r_drawcollisionbrushes_polygonoffset.value);
+               for (i = 0;i < model->brushq3.data_thismodel->numbrushes;i++)
+                       if (model->brushq3.data_thismodel->firstbrush[i].colbrushf && model->brushq3.data_thismodel->firstbrush[i].colbrushf->numtriangles)
+                               R_DrawCollisionBrush(model->brushq3.data_thismodel->firstbrush[i].colbrushf);
+               for (i = 0, face = model->brushq3.data_thismodel->firstface;i < model->brushq3.data_thismodel->numfaces;i++, face++)
+                       if (face->num_collisiontriangles)
+                               R_Q3BSP_DrawCollisionFace(ent, face);
+               qglPolygonOffset(0, 0);
+       }
+}
+
+void R_Q3BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius)
+{
+       int j, t, leafnum, marksurfnum;
+       const int *e;
+       const qbyte *pvs;
+       const float *v[3];
+       q3mface_t *face;
+       q3mleaf_t *leaf;
+       vec3_t modelorg, lightmins, lightmaxs;
+       model_t *model;
+       float projectdistance;
+       projectdistance = lightradius + ent->model->radius;//projectdistance = 1000000000.0f;//lightradius + ent->model->radius;
+       if (r_drawcollisionbrushes.integer < 2)
+       {
+               model = ent->model;
+               R_Mesh_Matrix(&ent->matrix);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+               lightmins[0] = relativelightorigin[0] - lightradius;
+               lightmins[1] = relativelightorigin[1] - lightradius;
+               lightmins[2] = relativelightorigin[2] - lightradius;
+               lightmaxs[0] = relativelightorigin[0] + lightradius;
+               lightmaxs[1] = relativelightorigin[1] + lightradius;
+               lightmaxs[2] = relativelightorigin[2] + lightradius;
+               R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
+               if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
+               {       
+                       for (leafnum = 0, leaf = ent->model->brushq3.data_leafs;leafnum < ent->model->brushq3.num_leafs;leafnum++, leaf++)
+                       {
+                               if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
+                               {
+                                       for (marksurfnum = 0;marksurfnum < leaf->numleaffaces;marksurfnum++)
+                                       {
+                                               face = leaf->firstleafface[marksurfnum];
+                                               if (face->shadowmark != shadowmarkcount)
+                                               {
+                                                       face->shadowmark = shadowmarkcount;
+                                                       if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs))
+                                                       {
+                                                               for (j = 0, t = face->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;j < face->num_triangles;j++, t++, e += 3)
+                                                               {
+                                                                       v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                                                       v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                                                       v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                                                       if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
+                                                                               shadowmarklist[numshadowmark++] = t;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+               else
+               {
+                       for (marksurfnum = 0, face = model->brushq3.data_thismodel->firstface;marksurfnum < model->brushq3.data_thismodel->numfaces;marksurfnum++, face++)
+                       {
+                               if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs))
+                               {
+                                       for (j = 0, t = face->num_firstshadowmeshtriangle, e = model->brush.shadowmesh->element3i + t * 3;j < face->num_triangles;j++, t++, e += 3)
+                                       {
+                                               v[0] = model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                               v[1] = model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                               v[2] = model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                               if (PointInfrontOfTriangle(relativelightorigin, v[0], v[1], v[2]) && lightmaxs[0] > min(v[0][0], min(v[1][0], v[2][0])) && lightmins[0] < max(v[0][0], max(v[1][0], v[2][0])) && lightmaxs[1] > min(v[0][1], min(v[1][1], v[2][1])) && lightmins[1] < max(v[0][1], max(v[1][1], v[2][1])) && lightmaxs[2] > min(v[0][2], min(v[1][2], v[2][2])) && lightmins[2] < max(v[0][2], max(v[1][2], v[2][2])))
+                                                       shadowmarklist[numshadowmark++] = t;
+                                       }
+                               }
+                       }
+               }
+               R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, projectdistance, numshadowmark, shadowmarklist);
+       }
+}
+
+void R_Q3BSP_DrawFaceLight(entity_render_t *ent, q3mface_t *face, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap)
+{
+       if ((face->texture->surfaceflags & Q3SURFACEFLAG_NODRAW) || !face->num_triangles)
+               return;
+       R_Shadow_DiffuseLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.base, face->texture->skin.nmap, lightcubemap);
+       R_Shadow_SpecularLighting(face->num_vertices, face->num_triangles, face->data_element3i, face->data_vertex3f, face->data_svector3f, face->data_tvector3f, face->data_normal3f, face->data_texcoordtexture2f, relativelightorigin, relativeeyeorigin, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, face->texture->skin.gloss, face->texture->skin.nmap, lightcubemap);
+}
+
+void R_Q3BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap)
+{
+       int leafnum, marksurfnum;
+       const qbyte *pvs;
+       q3mface_t *face;
+       q3mleaf_t *leaf;
+       vec3_t modelorg, lightmins, lightmaxs;
+       model_t *model;
+       if (r_drawcollisionbrushes.integer < 2)
+       {
+               model = ent->model;
+               R_Mesh_Matrix(&ent->matrix);
+               Matrix4x4_Transform(&ent->inversematrix, r_vieworigin, modelorg);
+               lightmins[0] = relativelightorigin[0] - lightradius;
+               lightmins[1] = relativelightorigin[1] - lightradius;
+               lightmins[2] = relativelightorigin[2] - lightradius;
+               lightmaxs[0] = relativelightorigin[0] + lightradius;
+               lightmaxs[1] = relativelightorigin[1] + lightradius;
+               lightmaxs[2] = relativelightorigin[2] + lightradius;
+
+               if (ent->model->brush.GetPVS && (pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin)))
+               {       
+                       pvs = ent->model->brush.GetPVS(ent->model, relativelightorigin);
+                       for (leafnum = 0, leaf = ent->model->brushq3.data_leafs;leafnum < ent->model->brushq3.num_leafs;leafnum++, leaf++)
+                       {
+                               if (BoxesOverlap(lightmins, lightmaxs, leaf->mins, leaf->maxs) && CHECKPVSBIT(pvs, leaf->clusterindex))
+                               {
+                                       for (marksurfnum = 0;marksurfnum < leaf->numleaffaces;marksurfnum++)
+                                       {
+                                               face = leaf->firstleafface[marksurfnum];
+                                               if (face->shadowmark != shadowmarkcount)
+                                               {
+                                                       face->shadowmark = shadowmarkcount;
+                                                       if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs) && (ent != &cl_entities[0].render || face->visframe == r_framecount))
+                                                               R_Q3BSP_DrawFaceLight(ent, face, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, lightcubemap);
+                                               }
+                                       }
+                               }
+                       }
+               }
+               else
+               {
+                       for (marksurfnum = 0, face = model->brushq3.data_thismodel->firstface;marksurfnum < model->brushq3.data_thismodel->numfaces;marksurfnum++, face++)
+                               if (BoxesOverlap(lightmins, lightmaxs, face->mins, face->maxs) && (ent != &cl_entities[0].render || face->visframe == r_framecount))
+                                       R_Q3BSP_DrawFaceLight(ent, face, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, lightcubemap);
+               }
+       }
+}
+
 static void gl_surf_start(void)
 {
 }
@@ -1957,13 +2696,14 @@ void GL_Surf_Init(void)
                dlightdivtable[i] = 4194304 / (i << 7);
 
        Cvar_RegisterVariable(&r_ambient);
-       Cvar_RegisterVariable(&r_vertexsurfaces);
-       Cvar_RegisterVariable(&r_dlightmap);
        Cvar_RegisterVariable(&r_drawportals);
        Cvar_RegisterVariable(&r_testvis);
        Cvar_RegisterVariable(&r_floatbuildlightmap);
        Cvar_RegisterVariable(&r_detailtextures);
        Cvar_RegisterVariable(&r_surfaceworldnode);
+       Cvar_RegisterVariable(&r_drawcollisionbrushes_polygonfactor);
+       Cvar_RegisterVariable(&r_drawcollisionbrushes_polygonoffset);
+       Cvar_RegisterVariable(&gl_lightmaps);
 
        R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
 }