]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rsurf.c
implemented support for GL_ARB_texture_compression - this is controlled
[xonotic/darkplaces.git] / gl_rsurf.c
index c0dbab4600164a26156be8cdef6a68a1903837c6..da62f71ecfca406fa0b92d7b24d0d0dc5e16d7af 100644 (file)
@@ -20,437 +20,171 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // r_surf.c: surface-related refresh code
 
 #include "quakedef.h"
+#include "r_shadow.h"
+#include "portals.h"
 
 #define MAX_LIGHTMAP_SIZE 256
 
-static unsigned int intblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
-static float floatblocklights[MAX_LIGHTMAP_SIZE*MAX_LIGHTMAP_SIZE*3]; // LordHavoc: *3 for colored lighting
+cvar_t r_ambient = {0, "r_ambient", "0", "brightens map, value is 0-128"};
+cvar_t r_lockpvs = {0, "r_lockpvs", "0", "disables pvs switching, allows you to walk around and inspect what is visible from a given location in the map (anything not visible from your current location will not be drawn)"};
+cvar_t r_lockvisibility = {0, "r_lockvisibility", "0", "disables visibility updates, allows you to walk around and inspect what is visible from a given viewpoint in the map (anything offscreen at the moment this is enabled will not be drawn)"};
+cvar_t r_useportalculling = {0, "r_useportalculling", "1", "use advanced portal culling visibility method to improve performance over just Potentially Visible Set, provides an even more significant speed improvement in unvised maps"};
+cvar_t r_q3bsp_renderskydepth = {0, "r_q3bsp_renderskydepth", "0", "draws sky depth masking in q3 maps (as in q1 maps), this means for example that sky polygons can hide other things"};
 
-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"};
-
-static int dlightdivtable[32768];
+/*
+===============
+R_BuildLightMap
 
-static int R_IntAddDynamicLights (msurface_t *surf)
+Combine and scale multiple lightmaps into the 8.8 format in blocklights
+===============
+*/
+void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
 {
-       int sdtable[256], lnum, td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, red, green, blue, lit, dist2, impacts, impactt, subtract;
-       unsigned int *bl;
-       float dist, impact[3], local[3];
-
-       // LordHavoc: use 64bit integer...  shame it's not very standardized...
-#if _MSC_VER || __BORLANDC__
-       __int64     k;
-#else
-       long long   k;
-#endif
-
-       lit = false;
-
-       smax = (surf->extents[0] >> 4) + 1;
-       tmax = (surf->extents[1] >> 4) + 1;
-       smax3 = smax * 3;
-
-       for (lnum = 0; lnum < r_numdlights; lnum++)
+       int smax, tmax, i, size, size3, maps, l;
+       int *bl, scale;
+       unsigned char *lightmap, *out, *stain;
+       model_t *model = ent->model;
+       int *intblocklights;
+       unsigned char *templight;
+
+       smax = (surface->lightmapinfo->extents[0]>>4)+1;
+       tmax = (surface->lightmapinfo->extents[1]>>4)+1;
+       size = smax*tmax;
+       size3 = size*3;
+
+       if (cl.buildlightmapmemorysize < size*sizeof(int[3]))
        {
-               if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
-                       continue;                                       // not lit by this light
-
-               softwareuntransform(r_dlight[lnum].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;
-
-               dist2 = dist * dist;
-               dist2 += LIGHTOFFSET;
-               if (dist2 >= maxdist)
-                       continue;
-
-               if (surf->plane->type < 3)
-               {
-                       VectorCopy(local, impact);
-                       impact[surf->plane->type] -= dist;
-               }
-               else
-               {
-                       impact[0] = local[0] - surf->plane->normal[0] * dist;
-                       impact[1] = local[1] - surf->plane->normal[1] * dist;
-                       impact[2] = local[2] - surf->plane->normal[2] * dist;
-               }
-
-               impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
-               impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
-
-               s = bound(0, impacts, smax * 16) - impacts;
-               t = bound(0, impactt, tmax * 16) - impactt;
-               i = s * s + t * t + dist2;
-               if (i > maxdist)
-                       continue;
-
-               // reduce calculations
-               for (s = 0, i = impacts; s < smax; s++, i -= 16)
-                       sdtable[s] = i * i + dist2;
-
-               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 = (int) (r_dlight[lnum].subtract * 4194304.0f);
-               bl = intblocklights;
-
-               i = impactt;
-               for (t = 0;t < tmax;t++, i -= 16)
-               {
-                       td = i * i;
-                       // make sure some part of it is visible on this line
-                       if (td < maxdist3)
-                       {
-                               maxdist2 = maxdist - td;
-                               for (s = 0;s < smax;s++)
-                               {
-                                       if (sdtable[s] < maxdist2)
-                                       {
-                                               k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract;
-                                               if (k > 0)
-                                               {
-                                                       bl[0] += (red   * k) >> 7;
-                                                       bl[1] += (green * k) >> 7;
-                                                       bl[2] += (blue  * k) >> 7;
-                                                       lit = true;
-                                               }
-                                       }
-                                       bl += 3;
-                               }
-                       }
-                       else // skip line
-                               bl += smax3;
-               }
+               cl.buildlightmapmemorysize = size*sizeof(int[3]);
+               if (cl.buildlightmapmemory)
+                       Mem_Free(cl.buildlightmapmemory);
+               cl.buildlightmapmemory = Mem_Alloc(cls.levelmempool, cl.buildlightmapmemorysize);
        }
-       return lit;
-}
 
-static int R_FloatAddDynamicLights (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;
+       // these both point at the same buffer, templight is only used for final
+       // processing and can replace the intblocklights data as it goes
+       intblocklights = (int *)cl.buildlightmapmemory;
+       templight = (unsigned char *)cl.buildlightmapmemory;
 
-       lit = false;
+       // update cached lighting info
+       surface->cached_dlight = 0;
 
-       smax = (surf->extents[0] >> 4) + 1;
-       tmax = (surf->extents[1] >> 4) + 1;
-       smax3 = smax * 3;
+       lightmap = surface->lightmapinfo->samples;
 
-       for (lnum = 0; lnum < r_numdlights; lnum++)
+// set to full bright if no light data
+       bl = intblocklights;
+       if (!model->brushq1.lightdata)
        {
-               if (!(surf->dlightbits[lnum >> 5] & (1 << (lnum & 31))))
-                       continue;                                       // not lit by this light
-
-               softwareuntransform(r_dlight[lnum].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;
-
-               dist2 = dist * dist;
-               dist2 += LIGHTOFFSET;
-               if (dist2 >= maxdist)
-                       continue;
-
-               if (surf->plane->type < 3)
-               {
-                       VectorCopy(local, impact);
-                       impact[surf->plane->type] -= dist;
-               }
-               else
-               {
-                       impact[0] = local[0] - surf->plane->normal[0] * dist;
-                       impact[1] = local[1] - surf->plane->normal[1] * dist;
-                       impact[2] = local[2] - surf->plane->normal[2] * dist;
-               }
-
-               impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
-               impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
-
-               td = bound(0, impacts, smax * 16) - impacts;
-               td1 = bound(0, impactt, tmax * 16) - impactt;
-               td = td * td + td1 * td1 + dist2;
-               if (td > maxdist)
-                       continue;
-
-               // reduce calculations
-               for (s = 0, td1 = impacts; s < smax; s++, td1 -= 16.0f)
-                       sdtable[s] = td1 * td1 + dist2;
-
-               maxdist3 = maxdist - dist2;
+               for (i = 0;i < size3;i++)
+                       bl[i] = 128*256;
+       }
+       else
+       {
+// clear to no light
+               memset(bl, 0, size3*sizeof(*bl));
 
-               // 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;
-               bl = floatblocklights;
+// add all the lightmaps
+               if (lightmap)
+                       for (maps = 0;maps < MAXLIGHTMAPS && surface->lightmapinfo->styles[maps] != 255;maps++, lightmap += size3)
+                               for (scale = r_refdef.lightstylevalue[surface->lightmapinfo->styles[maps]], i = 0;i < size3;i++)
+                                       bl[i] += lightmap[i] * scale;
+       }
 
-               td1 = impactt;
-               for (t = 0;t < tmax;t++, td1 -= 16.0f)
+       stain = surface->lightmapinfo->stainsamples;
+       bl = intblocklights;
+       out = templight;
+       // 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 (model->brushq1.lightmaprgba)
+       {
+               for (i = 0;i < size;i++)
                {
-                       td = td1 * td1;
-                       // make sure some part of it is visible on this line
-                       if (td < maxdist3)
-                       {
-                               maxdist2 = maxdist - td;
-                               for (s = 0;s < smax;s++)
-                               {
-                                       if (sdtable[s] < maxdist2)
-                                       {
-                                               k = (32768.0f / (sdtable[s] + td)) - subtract;
-                                               bl[0] += red   * k;
-                                               bl[1] += green * k;
-                                               bl[2] += blue  * k;
-                                               lit = true;
-                                       }
-                                       bl += 3;
-                               }
-                       }
-                       else // skip line
-                               bl += smax3;
+                       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;
                }
        }
-       return lit;
-}
-
-/*
-===============
-R_BuildLightMap
-
-Combine and scale multiple lightmaps into the 8.8 format in blocklights
-===============
-*/
-static void R_BuildLightMap (entity_render_t *ent, msurface_t *surf, int dlightchanged)
-{
-       if (!r_floatbuildlightmap.integer)
+       else
        {
-               int smax, tmax, i, j, size, size3, shift, maps, stride, l;
-               unsigned int *bl, scale;
-               qbyte *lightmap, *out, *stain;
-
-               // update cached lighting info
-               surf->cached_dlight = 0;
-               surf->cached_lightscalebit = lightscalebit;
-               surf->cached_ambient = r_ambient.value;
-               surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
-               surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
-               surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
-               surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
-
-               smax = (surf->extents[0]>>4)+1;
-               tmax = (surf->extents[1]>>4)+1;
-               size = smax*tmax;
-               size3 = size*3;
-               lightmap = surf->samples;
-
-       // set to full bright if no light data
-               bl = intblocklights;
-               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
+               for (i = 0;i < size;i++)
                {
-                       for (i = 0;i < size3;i++)
-                               bl[i] = 255*256;
+                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
+                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
+                       l = (*bl++ * *stain++) >> 16;*out++ = min(l, 255);
                }
-               else
-               {
-       // clear to no light
-                       j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
-                       if (j)
-                       {
-                               for (i = 0;i < size3;i++)
-                                       *bl++ = j;
-                       }
-                       else
-                               memset(bl, 0, size*3*sizeof(unsigned int));
-
-                       if (surf->dlightframe == r_framecount && r_dlightmap.integer)
-                       {
-                               surf->cached_dlight = R_IntAddDynamicLights(surf);
-                               if (surf->cached_dlight)
-                                       c_light_polys++;
-                               else if (dlightchanged)
-                                       return; // don't upload if only updating dlights and none mattered
-                       }
+       }
 
-       // add all the lightmaps
-                       if (lightmap)
-                       {
-                               bl = intblocklights;
-                               for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
-                                       for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
-                                               bl[i] += lightmap[i] * scale;
-                       }
-               }
+       R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], smax, tmax);
 
-               stain = surf->stainsamples;
+       // update the surface's deluxemap if it has one
+       if (surface->deluxemaptexture != r_texture_blanknormalmap)
+       {
+               vec3_t n;
+               unsigned char *normalmap = surface->lightmapinfo->nmapsamples;
+               lightmap = surface->lightmapinfo->samples;
+               // clear to no normalmap
                bl = intblocklights;
-               out = templight;
-               // deal with lightmap brightness scale
-               shift = 7 + lightscalebit + 8;
-               if (ent->model->lightmaprgba)
+               memset(bl, 0, size3*sizeof(*bl));
+               // add all the normalmaps
+               if (lightmap && normalmap)
                {
-                       stride = (surf->lightmaptexturestride - smax) * 4;
-                       for (i = 0;i < tmax;i++, out += stride)
+                       for (maps = 0;maps < MAXLIGHTMAPS && surface->lightmapinfo->styles[maps] != 255;maps++, lightmap += size3, normalmap += size3)
                        {
-                               for (j = 0;j < smax;j++)
+                               for (scale = r_refdef.lightstylevalue[surface->lightmapinfo->styles[maps]], i = 0;i < size;i++)
                                {
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                                       l = (*bl++ * *stain++) >> shift;*out++ = min(l, 255);
-                                       *out++ = 255;
+                                       // add the normalmap with weighting proportional to the style's lightmap intensity
+                                       l = (int)(VectorLength(lightmap + i*3) * scale);
+                                       bl[i*3+0] += ((int)normalmap[i*3+0] - 128) * l;
+                                       bl[i*3+1] += ((int)normalmap[i*3+1] - 128) * l;
+                                       bl[i*3+2] += ((int)normalmap[i*3+2] - 128) * l;
                                }
                        }
                }
-               else
-               {
-                       stride = (surf->lightmaptexturestride - smax) * 3;
-                       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);
-                               }
-                       }
-               }
-
-               R_UpdateTexture(surf->lightmaptexture, templight);
-       }
-       else
-       {
-               int smax, tmax, i, j, size, size3, maps, stride, l;
-               float *bl, scale;
-               qbyte *lightmap, *out, *stain;
-
-               // update cached lighting info
-               surf->cached_dlight = 0;
-               surf->cached_lightscalebit = lightscalebit;
-               surf->cached_ambient = r_ambient.value;
-               surf->cached_light[0] = d_lightstylevalue[surf->styles[0]];
-               surf->cached_light[1] = d_lightstylevalue[surf->styles[1]];
-               surf->cached_light[2] = d_lightstylevalue[surf->styles[2]];
-               surf->cached_light[3] = d_lightstylevalue[surf->styles[3]];
-
-               smax = (surf->extents[0]>>4)+1;
-               tmax = (surf->extents[1]>>4)+1;
-               size = smax*tmax;
-               size3 = size*3;
-               lightmap = surf->samples;
-
-       // set to full bright if no light data
-               bl = floatblocklights;
-               if ((ent->effects & EF_FULLBRIGHT) || !ent->model->lightdata)
-                       j = 255*256;
-               else
-                       j = r_ambient.value * 512.0f; // would be 128.0f logically, but using 512.0f to match winquake style
-
-               // clear to no light
-               if (j)
-               {
-                       for (i = 0;i < size3;i++)
-                               *bl++ = j;
-               }
-               else
-                       memset(bl, 0, size*3*sizeof(float));
-
-               if (surf->dlightframe == r_framecount && r_dlightmap.integer)
-               {
-                       surf->cached_dlight = R_FloatAddDynamicLights(surf);
-                       if (surf->cached_dlight)
-                               c_light_polys++;
-                       else if (dlightchanged)
-                               return; // don't upload if only updating dlights and none mattered
-               }
-
-               // add all the lightmaps
-               if (lightmap)
-               {
-                       bl = floatblocklights;
-                       for (maps = 0;maps < MAXLIGHTMAPS && surf->styles[maps] != 255;maps++, lightmap += size3)
-                               for (scale = d_lightstylevalue[surf->styles[maps]], i = 0;i < size3;i++)
-                                       bl[i] += lightmap[i] * scale;
-               }
-
-               stain = surf->stainsamples;
-               bl = floatblocklights;
+               bl = intblocklights;
                out = templight;
-               // deal with lightmap brightness scale
-               scale = 1.0f / (1 << (7 + lightscalebit + 8));
-               if (ent->model->lightmaprgba)
+               // we simply renormalize the weighted normals to get a valid deluxemap
+               if (model->brushq1.lightmaprgba)
                {
-                       stride = (surf->lightmaptexturestride - smax) * 4;
-                       for (i = 0;i < tmax;i++, out += stride)
+                       for (i = 0;i < size;i++, bl += 3)
                        {
-                               for (j = 0;j < smax;j++)
-                               {
-                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
-                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
-                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
-                                       *out++ = 255;
-                               }
+                               VectorCopy(bl, n);
+                               VectorNormalize(n);
+                               l = (int)(n[0] * 128 + 128);*out++ = bound(0, l, 255);
+                               l = (int)(n[1] * 128 + 128);*out++ = bound(0, l, 255);
+                               l = (int)(n[2] * 128 + 128);*out++ = bound(0, l, 255);
+                               *out++ = 255;
                        }
                }
                else
                {
-                       stride = (surf->lightmaptexturestride - smax) * 3;
-                       for (i = 0;i < tmax;i++, out += stride)
+                       for (i = 0;i < size;i++, bl += 3)
                        {
-                               for (j = 0;j < smax;j++)
-                               {
-                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
-                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
-                                       l = *bl++ * *stain++ * scale;*out++ = min(l, 255);
-                               }
+                               VectorCopy(bl, n);
+                               VectorNormalize(n);
+                               l = (int)(n[0] * 128 + 128);*out++ = bound(0, l, 255);
+                               l = (int)(n[1] * 128 + 128);*out++ = bound(0, l, 255);
+                               l = (int)(n[2] * 128 + 128);*out++ = bound(0, l, 255);
                        }
                }
-
-               R_UpdateTexture(surf->lightmaptexture, templight);
+               R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], smax, tmax);
        }
 }
 
-void R_StainNode (mnode_t *node, model_t *model, vec3_t origin, float radius, int icolor[8])
+void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radius, const float fcolor[8])
 {
-       float ndist;
-       msurface_t *surf, *endsurf;
-       int sdtable[256], td, maxdist, maxdist2, maxdist3, i, s, t, smax, tmax, smax3, dist2, impacts, impactt, subtract, a, stained, cr, cg, cb, ca, ratio;
-       qbyte *bl;
+       float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2;
+       msurface_t *surface, *endsurface;
+       int i, s, t, smax, tmax, smax3, impacts, impactt, stained;
+       unsigned char *bl;
        vec3_t impact;
-       // LordHavoc: use 64bit integer...  shame it's not very standardized...
-#if _MSC_VER || __BORLANDC__
-       __int64     k;
-#else
-       long long   k;
-#endif
 
-
-       // for comparisons to minimum acceptable light
-       // compensate for 256 offset
-       maxdist = radius * radius + 256.0f;
-
-       // clamp radius to avoid exceeding 32768 entry division table
-       if (maxdist > 4194304)
-               maxdist = 4194304;
-
-       subtract = (int) ((1.0f / maxdist) * 4194304.0f);
+       maxdist = radius * radius;
+       invradius = 1.0f / radius;
 
 loc0:
-       if (node->contents < 0)
+       if (!node->plane)
                return;
        ndist = PlaneDiff(origin, node->plane);
        if (ndist > radius)
@@ -464,97 +198,86 @@ loc0:
                goto loc0;
        }
 
-       dist2 = ndist * ndist + 256.0f;
-       if (dist2 < maxdist)
-       {
-               maxdist3 = maxdist - dist2;
+       dist2 = ndist * ndist;
+       maxdist3 = maxdist - dist2;
 
-               if (node->plane->type < 3)
-               {
-                       VectorCopy(origin, impact);
-                       impact[node->plane->type] -= ndist;
-               }
-               else
-               {
-                       impact[0] = origin[0] - node->plane->normal[0] * ndist;
-                       impact[1] = origin[1] - node->plane->normal[1] * ndist;
-                       impact[2] = origin[2] - node->plane->normal[2] * ndist;
-               }
+       if (node->plane->type < 3)
+       {
+               VectorCopy(origin, impact);
+               impact[node->plane->type] -= ndist;
+       }
+       else
+       {
+               impact[0] = origin[0] - node->plane->normal[0] * ndist;
+               impact[1] = origin[1] - node->plane->normal[1] * ndist;
+               impact[2] = origin[2] - node->plane->normal[2] * ndist;
+       }
 
-               for (surf = model->surfaces + node->firstsurface, endsurf = surf + node->numsurfaces;surf < endsurf;surf++)
+       for (surface = model->data_surfaces + node->firstsurface, endsurface = surface + node->numsurfaces;surface < endsurface;surface++)
+       {
+               if (surface->lightmapinfo->stainsamples)
                {
-                       if (surf->stainsamples)
-                       {
-                               smax = (surf->extents[0] >> 4) + 1;
-                               tmax = (surf->extents[1] >> 4) + 1;
+                       smax = (surface->lightmapinfo->extents[0] >> 4) + 1;
+                       tmax = (surface->lightmapinfo->extents[1] >> 4) + 1;
 
-                               impacts = DotProduct (impact, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3] - surf->texturemins[0];
-                               impactt = DotProduct (impact, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3] - surf->texturemins[1];
+                       impacts = (int)(DotProduct (impact, surface->lightmapinfo->texinfo->vecs[0]) + surface->lightmapinfo->texinfo->vecs[0][3] - surface->lightmapinfo->texturemins[0]);
+                       impactt = (int)(DotProduct (impact, surface->lightmapinfo->texinfo->vecs[1]) + surface->lightmapinfo->texinfo->vecs[1][3] - surface->lightmapinfo->texturemins[1]);
 
-                               s = bound(0, impacts, smax * 16) - impacts;
-                               t = bound(0, impactt, tmax * 16) - impactt;
-                               i = s * s + t * t + dist2;
-                               if (i > maxdist)
-                                       continue;
+                       s = bound(0, impacts, smax * 16) - impacts;
+                       t = bound(0, impactt, tmax * 16) - impactt;
+                       i = (int)(s * s + t * t + dist2);
+                       if (i > maxdist)
+                               continue;
 
-                               // reduce calculations
-                               for (s = 0, i = impacts; s < smax; s++, i -= 16)
-                                       sdtable[s] = i * i + dist2;
+                       // reduce calculations
+                       for (s = 0, i = impacts; s < smax; s++, i -= 16)
+                               sdtable[s] = i * i + dist2;
 
-                               // convert to 8.8 blocklights format
-                               bl = surf->stainsamples;
-                               smax3 = smax * 3;
-                               stained = false;
+                       bl = surface->lightmapinfo->stainsamples;
+                       smax3 = smax * 3;
+                       stained = false;
 
-                               i = impactt;
-                               for (t = 0;t < tmax;t++, i -= 16)
+                       i = impactt;
+                       for (t = 0;t < tmax;t++, i -= 16)
+                       {
+                               td = i * i;
+                               // make sure some part of it is visible on this line
+                               if (td < maxdist3)
                                {
-                                       td = i * i;
-                                       // make sure some part of it is visible on this line
-                                       if (td < maxdist3)
+                                       maxdist2 = maxdist - td;
+                                       for (s = 0;s < smax;s++)
                                        {
-                                               maxdist2 = maxdist - td;
-                                               for (s = 0;s < smax;s++)
+                                               if (sdtable[s] < maxdist2)
                                                {
-                                                       if (sdtable[s] < maxdist2)
+                                                       ratio = lhrandom(0.0f, 1.0f);
+                                                       a = (fcolor[3] + ratio * fcolor[7]) * (1.0f - sqrt(sdtable[s] + td) * invradius);
+                                                       if (a >= (1.0f / 64.0f))
                                                        {
-                                                               k = dlightdivtable[(sdtable[s] + td) >> 7] - subtract;
-                                                               if (k > 0)
-                                                               {
-                                                                       ratio = rand() & 255;
-                                                                       ca = (((icolor[7] - icolor[3]) * ratio) >> 8) + icolor[3];
-                                                                       a = (ca * k) >> 8;
-                                                                       if (a > 0)
-                                                                       {
-                                                                               a = bound(0, a, 256);
-                                                                               cr = (((icolor[4] - icolor[0]) * ratio) >> 8) + icolor[0];
-                                                                               cg = (((icolor[5] - icolor[1]) * ratio) >> 8) + icolor[1];
-                                                                               cb = (((icolor[6] - icolor[2]) * ratio) >> 8) + icolor[2];
-                                                                               bl[0] = (qbyte) ((((cr - (int) bl[0]) * a) >> 8) + (int) bl[0]);
-                                                                               bl[1] = (qbyte) ((((cg - (int) bl[1]) * a) >> 8) + (int) bl[1]);
-                                                                               bl[2] = (qbyte) ((((cb - (int) bl[2]) * a) >> 8) + (int) bl[2]);
-                                                                               stained = true;
-                                                                       }
-                                                               }
+                                                               if (a > 1)
+                                                                       a = 1;
+                                                               bl[0] = (unsigned char) ((float) bl[0] + a * ((fcolor[0] + ratio * fcolor[4]) - (float) bl[0]));
+                                                               bl[1] = (unsigned char) ((float) bl[1] + a * ((fcolor[1] + ratio * fcolor[5]) - (float) bl[1]));
+                                                               bl[2] = (unsigned char) ((float) bl[2] + a * ((fcolor[2] + ratio * fcolor[6]) - (float) bl[2]));
+                                                               stained = true;
                                                        }
-                                                       bl += 3;
                                                }
+                                               bl += 3;
                                        }
-                                       else // skip line
-                                               bl += smax3;
                                }
-                               // force lightmap upload
-                               if (stained)
-                                       surf->cached_dlight = true;
+                               else // skip line
+                                       bl += smax3;
                        }
+                       // force lightmap upload
+                       if (stained)
+                               surface->cached_dlight = true;
                }
        }
 
-       if (node->children[0]->contents >= 0)
+       if (node->children[0]->plane)
        {
-               if (node->children[1]->contents >= 0)
+               if (node->children[1]->plane)
                {
-                       R_StainNode(node->children[0], model, origin, radius, icolor);
+                       R_StainNode(node->children[0], model, origin, radius, fcolor);
                        node = node->children[1];
                        goto loc0;
                }
@@ -564,45 +287,44 @@ loc0:
                        goto loc0;
                }
        }
-       else if (node->children[1]->contents >= 0)
+       else if (node->children[1]->plane)
        {
                node = node->children[1];
                goto loc0;
        }
 }
 
-void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2)
+void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2)
 {
-       int n, icolor[8];
+       int n;
+       float fcolor[8];
        entity_render_t *ent;
        model_t *model;
        vec3_t org;
-       icolor[0] = cr1;
-       icolor[1] = cg1;
-       icolor[2] = cb1;
-       icolor[3] = ca1;
-       icolor[4] = cr2;
-       icolor[5] = cg2;
-       icolor[6] = cb2;
-       icolor[7] = ca2;
-
-       model = cl.worldmodel;
-       softwaretransformidentity();
-       R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, origin, radius, icolor);
+       if (r_refdef.worldmodel == NULL || !r_refdef.worldmodel->brush.data_nodes || !r_refdef.worldmodel->brushq1.lightdata)
+               return;
+       fcolor[0] = cr1;
+       fcolor[1] = cg1;
+       fcolor[2] = cb1;
+       fcolor[3] = ca1 * (1.0f / 64.0f);
+       fcolor[4] = cr2 - cr1;
+       fcolor[5] = cg2 - cg1;
+       fcolor[6] = cb2 - cb1;
+       fcolor[7] = (ca2 - ca1) * (1.0f / 64.0f);
+
+       R_StainNode(r_refdef.worldmodel->brush.data_nodes + r_refdef.worldmodel->brushq1.hulls[0].firstclipnode, r_refdef.worldmodel, origin, radius, fcolor);
 
        // look for embedded bmodels
-       for (n = 0;n < cl_num_brushmodel_entities;n++)
+       for (n = 0;n < cl.num_brushmodel_entities;n++)
        {
-               ent = cl_brushmodel_entities[n];
+               ent = &cl.entities[cl.brushmodel_entities[n]].render;
                model = ent->model;
                if (model && model->name[0] == '*')
                {
-                       Mod_CheckLoaded(model);
-                       if (model->type == mod_brush)
+                       if (model->brush.data_nodes)
                        {
-                               softwaretransformforentity(ent);
-                               softwareuntransform(origin, org);
-                               R_StainNode(model->nodes + model->hulls[0].firstclipnode, model, org, radius, icolor);
+                               Matrix4x4_Transform(&ent->inversematrix, origin, org);
+                               R_StainNode(model->brush.data_nodes + model->brushq1.hulls[0].firstclipnode, model, org, radius, fcolor);
                        }
                }
        }
@@ -617,1444 +339,872 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i
 =============================================================
 */
 
-static void RSurfShader_Sky(entity_render_t *ent, msurface_t *firstsurf)
+static void R_DrawPortal_Callback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
-       msurface_t *surf;
-       int i;
-       surfvertex_t *v;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       float cr, cg, cb, ca;
-       float *outv, *outc;
-
-       // LordHavoc: HalfLife maps have freaky skypolys...
-       if (ent->model->ishlbsp)
-               return;
+       // due to the hacky nature of this function's parameters, this is never
+       // called with a batch, so numsurfaces is always 1, and the surfacelist
+       // contains only a leaf number for coloring purposes
+       const mportal_t *portal = (mportal_t *)ent;
+       int i, numpoints;
+       float *v;
+       float vertex3f[POLYGONELEMENTS_MAXPOINTS*3];
+       CHECKGLERROR
+       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+       GL_DepthMask(false);
+       GL_DepthRange(0, 1);
+       GL_PolygonOffset(r_refdef.polygonfactor, r_refdef.polygonoffset);
+       GL_DepthTest(true);
+       GL_CullFace(GL_NONE);
+       R_Mesh_Matrix(&identitymatrix);
+
+       numpoints = min(portal->numpoints, POLYGONELEMENTS_MAXPOINTS);
+
+       R_Mesh_VertexPointer(vertex3f, 0, 0);
+       R_Mesh_ColorPointer(NULL, 0, 0);
+       R_Mesh_ResetTextureState();
+
+       i = surfacelist[0];
+       GL_Color(((i & 0x0007) >> 0) * (1.0f / 7.0f) * r_view.colorscale,
+                        ((i & 0x0038) >> 3) * (1.0f / 7.0f) * r_view.colorscale,
+                        ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * r_view.colorscale,
+                        0.125f);
+       for (i = 0, v = vertex3f;i < numpoints;i++, v += 3)
+               VectorCopy(portal->points[i].position, v);
+       R_Mesh_Draw(0, numpoints, numpoints - 2, polygonelements, 0, 0);
+}
 
-       if (skyrendernow)
-       {
-               skyrendernow = false;
-               if (skyrendermasked)
-                       R_Sky();
-       }
-       for (surf = firstsurf;surf;surf = surf->chain)
+// LordHavoc: this is just a nice debugging tool, very slow
+void R_DrawPortals(void)
+{
+       int i, leafnum;
+       mportal_t *portal;
+       float center[3], f;
+       model_t *model = r_refdef.worldmodel;
+       if (model == NULL)
+               return;
+       for (leafnum = 0;leafnum < r_refdef.worldmodel->brush.num_leafs;leafnum++)
        {
-               // draw depth-only polys
-               memset(&m, 0, sizeof(m));
-               m.transparent = false;
-               if (skyrendermasked)
+               if (r_viewcache.world_leafvisible[leafnum])
                {
-                       m.blendfunc1 = GL_ZERO;
-                       m.blendfunc2 = GL_ONE;
-                       m.depthwrite = true;
-               }
-               else
-               {
-                       m.blendfunc1 = GL_ONE;
-                       m.blendfunc2 = GL_ZERO;
-                       m.depthwrite = false;
-               }
-               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-               {
-                       m.numtriangles = mesh->numtriangles;
-                       m.numverts = mesh->numverts;
-                       if (R_Mesh_Draw_GetBuffer(&m, false))
+                       //for (portalnum = 0, portal = model->brush.data_portals;portalnum < model->brush.num_portals;portalnum++, portal++)
+                       for (portal = r_refdef.worldmodel->brush.data_leafs[leafnum].portals;portal;portal = portal->next)
                        {
-                               cr = fogcolor[0] * m.colorscale;
-                               cg = fogcolor[1] * m.colorscale;
-                               cb = fogcolor[2] * m.colorscale;
-                               ca = 1;
-                               memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                               for (i = 0, v = mesh->vertex, outv = m.vertex;i < m.numverts;i++, v++, outv += 4, outc += 4)
-                               {
-                                       softwaretransform(v->v, outv);
-                               }
-                               for (i = 0, outc = m.color;i < m.numverts;i++, outc += 4)
+                               if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
+                               if (!R_CullBox(portal->mins, portal->maxs))
                                {
-                                       outc[0] = cr;
-                                       outc[1] = cg;
-                                       outc[2] = cb;
-                                       outc[3] = ca;
+                                       VectorClear(center);
+                                       for (i = 0;i < portal->numpoints;i++)
+                                               VectorAdd(center, portal->points[i].position, center);
+                                       f = ixtable[portal->numpoints];
+                                       VectorScale(center, f, center);
+                                       R_MeshQueue_AddTransparent(center, R_DrawPortal_Callback, (entity_render_t *)portal, leafnum, rsurface.rtlight);
                                }
-                               R_Mesh_Render();
                        }
                }
        }
 }
 
-static int RSurf_LightSeparate(int *dlightbits, int numverts, float *vert, float *color)
+void R_View_WorldVisibility(void)
 {
-       float f, *v, *c;
-       int i, l, lit = false;
-       rdlight_t *rd;
-       vec3_t lightorigin;
-       for (l = 0;l < r_numdlights;l++)
+       int i, j, *mark;
+       mleaf_t *leaf;
+       mleaf_t *viewleaf;
+       model_t *model = r_refdef.worldmodel;
+
+       if (!model)
+               return;
+
+       // if possible find the leaf the view origin is in
+       viewleaf = model->brush.PointInLeaf ? model->brush.PointInLeaf(model, r_view.origin) : NULL;
+       // if possible fetch the visible cluster bits
+       if (!r_lockpvs.integer && model->brush.FatPVS)
+               model->brush.FatPVS(model, r_view.origin, 2, r_viewcache.world_pvsbits, sizeof(r_viewcache.world_pvsbits));
+
+       if (!r_lockvisibility.integer)
        {
-               if (dlightbits[l >> 5] & (1 << (l & 31)))
+               // clear the visible surface and leaf flags arrays
+               memset(r_viewcache.world_surfacevisible, 0, model->num_surfaces);
+               memset(r_viewcache.world_leafvisible, 0, model->brush.num_leafs);
+
+               r_viewcache.world_novis = false;
+
+               // if floating around in the void (no pvs data available, and no
+               // portals available), simply use all on-screen leafs.
+               if (!viewleaf || viewleaf->clusterindex < 0)
+               {
+                       // no visibility method: (used when floating around in the void)
+                       // simply cull each leaf to the frustum (view pyramid)
+                       // similar to quake's RecursiveWorldNode but without cache misses
+                       r_viewcache.world_novis = true;
+                       for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++)
+                       {
+                               // if leaf is in current pvs and on the screen, mark its surfaces
+                               if (!R_CullBox(leaf->mins, leaf->maxs))
+                               {
+                                       r_refdef.stats.world_leafs++;
+                                       r_viewcache.world_leafvisible[j] = true;
+                                       if (leaf->numleafsurfaces)
+                                               for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++)
+                                                       r_viewcache.world_surfacevisible[*mark] = true;
+                               }
+                       }
+               }
+               // if the user prefers to disable portal culling (testing?), simply
+               // use all on-screen leafs that are in the pvs.
+               else if (!r_useportalculling.integer)
+               {
+                       // pvs method:
+                       // simply check if each leaf is in the Potentially Visible Set,
+                       // and cull to frustum (view pyramid)
+                       // similar to quake's RecursiveWorldNode but without cache misses
+                       for (j = 0, leaf = model->brush.data_leafs;j < model->brush.num_leafs;j++, leaf++)
+                       {
+                               // if leaf is in current pvs and on the screen, mark its surfaces
+                               if (CHECKPVSBIT(r_viewcache.world_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs))
+                               {
+                                       r_refdef.stats.world_leafs++;
+                                       r_viewcache.world_leafvisible[j] = true;
+                                       if (leaf->numleafsurfaces)
+                                               for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++)
+                                                       r_viewcache.world_surfacevisible[*mark] = true;
+                               }
+                       }
+               }
+               // otherwise use a recursive portal flow, culling each portal to
+               // frustum and checking if the leaf the portal leads to is in the pvs
+               else
                {
-                       rd = &r_dlight[l];
-                       // FIXME: support softwareuntransform here and make bmodels use hardware transform?
-                       VectorCopy(rd->origin, lightorigin);
-                       for (i = 0, v = vert, c = color;i < numverts;i++, v += 4, c += 4)
+                       int leafstackpos;
+                       mportal_t *p;
+                       mleaf_t *leafstack[8192];
+                       // simple-frustum portal method:
+                       // follows portals leading outward from viewleaf, does not venture
+                       // offscreen or into leafs that are not visible, faster than
+                       // Quake's RecursiveWorldNode and vastly better in unvised maps,
+                       // often culls some surfaces that pvs alone would miss
+                       // (such as a room in pvs that is hidden behind a wall, but the
+                       //  passage leading to the room is off-screen)
+                       leafstack[0] = viewleaf;
+                       leafstackpos = 1;
+                       while (leafstackpos)
                        {
-                               f = VectorDistance2(v, lightorigin) + LIGHTOFFSET;
-                               if (f < rd->cullradius2)
+                               leaf = leafstack[--leafstackpos];
+                               if (r_viewcache.world_leafvisible[leaf - model->brush.data_leafs])
+                                       continue;
+                               r_refdef.stats.world_leafs++;
+                               r_viewcache.world_leafvisible[leaf - model->brush.data_leafs] = true;
+                               // mark any surfaces bounding this leaf
+                               if (leaf->numleafsurfaces)
+                                       for (i = 0, mark = leaf->firstleafsurface;i < leaf->numleafsurfaces;i++, mark++)
+                                               r_viewcache.world_surfacevisible[*mark] = true;
+                               // follow portals into other leafs
+                               // the checks are:
+                               // if viewer is behind portal (portal faces outward into the scene)
+                               // and the portal polygon's bounding box is on the screen
+                               // and the leaf has not been visited yet
+                               // and the leaf is visible in the pvs
+                               // (the first two checks won't cause as many cache misses as the leaf checks)
+                               for (p = leaf->portals;p;p = p->next)
                                {
-                                       f = (1.0f / f) - rd->subtract;
-                                       VectorMA(c, f, rd->light, c);
-                                       lit = true;
+                                       r_refdef.stats.world_portals++;
+                                       if (DotProduct(r_view.origin, p->plane.normal) < (p->plane.dist + 1)
+                                        && !r_viewcache.world_leafvisible[p->past - model->brush.data_leafs]
+                                        && CHECKPVSBIT(r_viewcache.world_pvsbits, p->past->clusterindex)
+                                        && !R_CullBox(p->mins, p->maxs)
+                                        && leafstackpos < (int)(sizeof(leafstack) / sizeof(leafstack[0])))
+                                               leafstack[leafstackpos++] = p->past;
                                }
                        }
                }
        }
-       return lit;
 }
 
-// note: this untransforms lights to do the checking,
-// and takes surf->mesh->vertex data
-static int RSurf_LightCheck(int *dlightbits, surfmesh_t *mesh)
+void R_Q1BSP_DrawSky(entity_render_t *ent)
 {
-       int i, l;
-       rdlight_t *rd;
-       vec3_t lightorigin;
-       surfvertex_t *sv;
-       for (l = 0;l < r_numdlights;l++)
-       {
-               if (dlightbits[l >> 5] & (1 << (l & 31)))
-               {
-                       rd = &r_dlight[l];
-                       softwareuntransform(rd->origin, lightorigin);
-                       for (i = 0, sv = mesh->vertex;i < mesh->numverts;i++, sv++)
-                               if (VectorDistance2(sv->v, lightorigin) < rd->cullradius2)
-                                       return true;
-               }
-       }
-       return false;
+       if (ent->model == NULL)
+               return;
+       if (ent == r_refdef.worldentity)
+               R_DrawWorldSurfaces(true, true, false);
+       else
+               R_DrawModelSurfaces(ent, true, true, false);
+}
+
+void R_Q1BSP_Draw(entity_render_t *ent)
+{
+       model_t *model = ent->model;
+       if (model == NULL)
+               return;
+       if (ent == r_refdef.worldentity)
+               R_DrawWorldSurfaces(false, true, false);
+       else
+               R_DrawModelSurfaces(ent, false, true, false);
+}
+
+void R_Q1BSP_DrawDepth(entity_render_t *ent)
+{
+       model_t *model = ent->model;
+       if (model == NULL)
+               return;
+       if (ent == r_refdef.worldentity)
+               R_DrawWorldSurfaces(false, false, true);
+       else
+               R_DrawModelSurfaces(ent, false, false, true);
+}
+
+typedef struct r_q1bsp_getlightinfo_s
+{
+       model_t *model;
+       vec3_t relativelightorigin;
+       float lightradius;
+       int *outleaflist;
+       unsigned char *outleafpvs;
+       int outnumleafs;
+       int *outsurfacelist;
+       unsigned char *outsurfacepvs;
+       unsigned char *tempsurfacepvs;
+       unsigned char *outshadowtrispvs;
+       unsigned char *outlighttrispvs;
+       int outnumsurfaces;
+       vec3_t outmins;
+       vec3_t outmaxs;
+       vec3_t lightmins;
+       vec3_t lightmaxs;
+       const unsigned char *pvs;
+       qboolean svbsp_active;
+       qboolean svbsp_insertoccluder;
 }
+r_q1bsp_getlightinfo_t;
 
-static void RSurfShader_Water_Pass_Base(entity_render_t *ent, msurface_t *surf)
+void R_Q1BSP_RecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, mnode_t *node)
 {
-       int i, size3;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl, diff[3];
-       float base[3], scale, f;
-       qbyte *lm;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
-       memset(&m, 0, sizeof(m));
-       if (ent->effects & EF_ADDITIVE)
+       int sides;
+       mleaf_t *leaf;
+       for (;;)
        {
-               m.transparent = true;
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE;
+               mplane_t *plane = node->plane;
+               //if (!BoxesOverlap(info->lightmins, info->lightmaxs, node->mins, node->maxs))
+               //      return;
+               if (!plane)
+                       break;
+               //if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rsurface.rtlight_numfrustumplanes, rsurface.rtlight_frustumplanes))
+               //      return;
+               if (plane->type < 3)
+               {
+                       if (info->lightmins[plane->type] > plane->dist)
+                               node = node->children[0];
+                       else if (info->lightmaxs[plane->type] < plane->dist)
+                               node = node->children[1];
+                       else if (info->relativelightorigin[plane->type] >= plane->dist)
+                       {
+                               R_Q1BSP_RecursiveGetLightInfo(info, node->children[0]);
+                               node = node->children[1];
+                       }
+                       else
+                       {
+                               R_Q1BSP_RecursiveGetLightInfo(info, node->children[1]);
+                               node = node->children[0];
+                       }
+               }
+               else
+               {
+                       sides = BoxOnPlaneSide(info->lightmins, info->lightmaxs, plane);
+                       if (sides == 3)
+                       {
+                               // recurse front side first because the svbsp building prefers it
+                               if (PlaneDist(info->relativelightorigin, plane) >= 0)
+                               {
+                                       R_Q1BSP_RecursiveGetLightInfo(info, node->children[0]);
+                                       node = node->children[1];
+                               }
+                               else
+                               {
+                                       R_Q1BSP_RecursiveGetLightInfo(info, node->children[1]);
+                                       node = node->children[0];
+                               }
+                       }
+                       else if (sides == 0)
+                               return; // ERROR: NAN bounding box!
+                       else
+                               node = node->children[sides - 1];
+               }
        }
-       else if (surf->currenttexture->fogtexture != NULL || alpha < 1)
+       if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rsurface.rtlight_numfrustumplanes, rsurface.rtlight_frustumplanes))
+               return;
+       leaf = (mleaf_t *)node;
+       if (info->svbsp_active)
        {
-               m.transparent = true;
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+               int i;
+               mportal_t *portal;
+               double points[128][3];
+               for (portal = leaf->portals;portal;portal = portal->next)
+               {
+                       for (i = 0;i < portal->numpoints;i++)
+                               VectorCopy(portal->points[i].position, points[i]);
+                       if (SVBSP_AddPolygon(&r_svbsp, portal->numpoints, points[0], false, NULL, NULL, 0) & 2)
+                               break;
+               }
+               if (portal == NULL)
+                       return; // no portals of this leaf visible
        }
        else
        {
-               m.transparent = false;
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
+               if (r_shadow_frontsidecasting.integer && info->pvs != NULL && !CHECKPVSBIT(info->pvs, leaf->clusterindex))
+                       return;
        }
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       if (surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT)
+       // inserting occluders does not alter the leaf info
+       if (!info->svbsp_insertoccluder)
        {
-               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+               info->outmins[0] = min(info->outmins[0], leaf->mins[0]);
+               info->outmins[1] = min(info->outmins[1], leaf->mins[1]);
+               info->outmins[2] = min(info->outmins[2], leaf->mins[2]);
+               info->outmaxs[0] = max(info->outmaxs[0], leaf->maxs[0]);
+               info->outmaxs[1] = max(info->outmaxs[1], leaf->maxs[1]);
+               info->outmaxs[2] = max(info->outmaxs[2], leaf->maxs[2]);
+               if (info->outleafpvs)
                {
-                       m.numtriangles = mesh->numtriangles;
-                       m.numverts = mesh->numverts;
-                       if (R_Mesh_Draw_GetBuffer(&m, true))
+                       int leafindex = leaf - info->model->brush.data_leafs;
+                       if (!CHECKPVSBIT(info->outleafpvs, leafindex))
                        {
-                               base[0] = base[1] = base[2] = 1.0f * m.colorscale;
-                               memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                               for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                               {
-                                       softwaretransform(v->v, outv);
-                                       outv[3] = 1;
-                                       VectorCopy(base, outc);
-                                       outc[3] = alpha;
-                                       outst[0] = v->st[0];
-                                       outst[1] = v->st[1];
-                                       if (fogenabled)
-                                       {
-                                               VectorSubtract(outv, r_origin, diff);
-                                               f = 1 - exp(fogdensity/DotProduct(diff, diff));
-                                               VectorScale(outc, f, outc);
-                                       }
-                               }
-                               R_Mesh_Render();
+                               SETPVSBIT(info->outleafpvs, leafindex);
+                               info->outleaflist[info->outnumleafs++] = leafindex;
                        }
                }
        }
-       else
+       if (info->outsurfacepvs)
        {
-               size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3;
-               base[0] = base[1] = base[2] = (r_ambient.value * (1.0f / 64.0f) + ((surf->flags & SURF_LIGHTMAP) ? 0 : 0.5f));
-               for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+               int leafsurfaceindex;
+               int surfaceindex;
+               int triangleindex, t;
+               msurface_t *surface;
+               const int *e;
+               const vec_t *v[3];
+               double v2[3][3];
+               for (leafsurfaceindex = 0;leafsurfaceindex < leaf->numleafsurfaces;leafsurfaceindex++)
                {
-                       m.numtriangles = mesh->numtriangles;
-                       m.numverts = mesh->numverts;
-                       if (R_Mesh_Draw_GetBuffer(&m, true))
+                       surfaceindex = leaf->firstleafsurface[leafsurfaceindex];
+                       if (!CHECKPVSBIT(info->outsurfacepvs, surfaceindex))
                        {
-                               cl = m.colorscale;
-                               memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                               for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                               {
-                                       softwaretransform(v->v, outv);
-                                       outv[3] = 1;
-                                       VectorCopy(base, outc);
-                                       outc[3] = alpha;
-                                       outst[0] = v->st[0];
-                                       outst[1] = v->st[1];
-                               }
-                               if (surf->dlightframe == r_framecount)
-                                       RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color);
-                               for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4)
+                               surface = info->model->data_surfaces + surfaceindex;
+                               if (BoxesOverlap(info->lightmins, info->lightmaxs, surface->mins, surface->maxs)
+                                && (!info->svbsp_insertoccluder || !(surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOSHADOW)))
                                {
-                                       if (surf->flags & SURF_LIGHTMAP)
-                                       if (surf->styles[0] != 255)
+                                       qboolean addedtris = false;
+                                       qboolean insidebox = BoxInsideBox(surface->mins, surface->maxs, info->lightmins, info->lightmaxs);
+                                       for (triangleindex = 0, t = surface->num_firstshadowmeshtriangle, e = info->model->brush.shadowmesh->element3i + t * 3;triangleindex < surface->num_triangles;triangleindex++, t++, e += 3)
                                        {
-                                               lm = surf->samples + v->lightmapoffset;
-                                               scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f);
-                                               VectorMA(outc, scale, lm, outc);
-                                               if (surf->styles[1] != 255)
+                                               v[0] = info->model->brush.shadowmesh->vertex3f + e[0] * 3;
+                                               v[1] = info->model->brush.shadowmesh->vertex3f + e[1] * 3;
+                                               v[2] = info->model->brush.shadowmesh->vertex3f + e[2] * 3;
+                                               if (insidebox || TriangleOverlapsBox(v[0], v[1], v[2], info->lightmins, info->lightmaxs))
                                                {
-                                                       lm += size3;
-                                                       scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f);
-                                                       VectorMA(outc, scale, lm, outc);
-                                                       if (surf->styles[2] != 255)
+                                                       if (info->svbsp_insertoccluder)
+                                                       {
+                                                               if (!(surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOCULLFACE) && r_shadow_frontsidecasting.integer != PointInfrontOfTriangle(info->relativelightorigin, v[0], v[1], v[2]))
+                                                                       continue;
+                                                               if (surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOSHADOW)
+                                                                       continue;
+                                                               VectorCopy(v[0], v2[0]);
+                                                               VectorCopy(v[1], v2[1]);
+                                                               VectorCopy(v[2], v2[2]);
+                                                               if (!(SVBSP_AddPolygon(&r_svbsp, 3, v2[0], true, NULL, NULL, 0) & 2))
+                                                                       continue;
+                                                               addedtris = true;
+                                                       }
+                                                       else
                                                        {
-                                                               lm += size3;
-                                                               scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f);
-                                                               VectorMA(outc, scale, lm, outc);
-                                                               if (surf->styles[3] != 255)
+                                                               if (info->svbsp_active)
+                                                               {
+                                                                       VectorCopy(v[0], v2[0]);
+                                                                       VectorCopy(v[1], v2[1]);
+                                                                       VectorCopy(v[2], v2[2]);
+                                                                       if (!(SVBSP_AddPolygon(&r_svbsp, 3, v2[0], false, NULL, NULL, 0) & 2))
+                                                                               continue;
+                                                               }
+                                                               if (surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOCULLFACE)
+                                                               {
+                                                                       // if the material is double sided we
+                                                                       // can't cull by direction
+                                                                       SETPVSBIT(info->outlighttrispvs, t);
+                                                                       addedtris = true;
+                                                                       if (!(surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOSHADOW))
+                                                                               SETPVSBIT(info->outshadowtrispvs, t);
+                                                               }
+                                                               else if (r_shadow_frontsidecasting.integer)
+                                                               {
+                                                                       // front side casting occludes backfaces,
+                                                                       // so they are completely useless as both
+                                                                       // casters and lit polygons
+                                                                       if (!PointInfrontOfTriangle(info->relativelightorigin, v[0], v[1], v[2]))
+                                                                               continue;
+                                                                       SETPVSBIT(info->outlighttrispvs, t);
+                                                                       addedtris = true;
+                                                                       if (!(surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOSHADOW))
+                                                                               SETPVSBIT(info->outshadowtrispvs, t);
+                                                               }
+                                                               else
                                                                {
-                                                                       lm += size3;
-                                                                       scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f);
-                                                                       VectorMA(outc, scale, lm, outc);
+                                                                       // back side casting does not occlude
+                                                                       // anything so we can't cull lit polygons
+                                                                       SETPVSBIT(info->outlighttrispvs, t);
+                                                                       addedtris = true;
+                                                                       if (!PointInfrontOfTriangle(info->relativelightorigin, v[0], v[1], v[2]) && !(surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOSHADOW))
+                                                                               SETPVSBIT(info->outshadowtrispvs, t);
                                                                }
                                                        }
                                                }
                                        }
-                                       if (fogenabled)
+                                       if (addedtris)
                                        {
-                                               VectorSubtract(outv, r_origin, diff);
-                                               f = cl * (1 - exp(fogdensity/DotProduct(diff, diff)));
-                                               VectorScale(outc, f, outc);
+                                               SETPVSBIT(info->outsurfacepvs, surfaceindex);
+                                               info->outsurfacelist[info->outnumsurfaces++] = surfaceindex;
                                        }
-                                       else
-                                               VectorScale(outc, cl, outc);
                                }
-                               R_Mesh_Render();
                        }
                }
        }
 }
 
-static void RSurfShader_Water_Pass_Fog(entity_render_t *ent, msurface_t *surf)
+void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qboolean use_svbsp)
 {
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, diff[3];
-       float base[3], f;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       float alpha = ent->alpha * (surf->flags & SURF_DRAWNOALPHA ? 1 : r_wateralpha.value);
-       memset(&m, 0, sizeof(m));
-       m.transparent = ent->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || alpha < 1;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       if (use_svbsp)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-               if (R_Mesh_Draw_GetBuffer(&m, false))
+               double origin[3];
+               VectorCopy(info->relativelightorigin, origin);
+               if (!r_svbsp.nodes)
                {
-                       VectorScale(fogcolor, m.colorscale, base);
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               VectorSubtract(outv, r_origin, diff);
-                               f = exp(fogdensity/DotProduct(diff, diff));
-                               VectorScale(base, f, outc);
-                               outc[3] = alpha;
-                       }
-                       if (m.tex[0])
+                       r_svbsp.maxnodes = max(r_svbsp.maxnodes, 1<<18);
+                       r_svbsp.nodes = Mem_Alloc(r_main_mempool, r_svbsp.maxnodes * sizeof(svbsp_node_t));
+               }
+               info->svbsp_active = true;
+               info->svbsp_insertoccluder = true;
+               for (;;)
+               {
+                       SVBSP_Init(&r_svbsp, origin, r_svbsp.maxnodes, r_svbsp.nodes);
+                       R_Q1BSP_RecursiveGetLightInfo(info, info->model->brush.data_nodes);
+                       // if that failed, retry with more nodes
+                       if (r_svbsp.ranoutofnodes)
                        {
-                               for (i = 0, v = mesh->vertex, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outst += 2)
-                               {
-                                       outst[0] = v->st[0];
-                                       outst[1] = v->st[1];
-                               }
+                               // an upper limit is imposed
+                               if (r_svbsp.maxnodes >= 2<<22)
+                                       break;
+                               Mem_Free(r_svbsp.nodes);
+                               r_svbsp.maxnodes *= 2;
+                               r_svbsp.nodes = Mem_Alloc(tempmempool, r_svbsp.maxnodes * sizeof(svbsp_node_t));
                        }
-                       R_Mesh_Render();
+                       else
+                               break;
                }
-       }
-}
-
-static void RSurfShader_Water(entity_render_t *ent, msurface_t *firstsurf)
-{
-       msurface_t *surf;
-       for (surf = firstsurf;surf;surf = surf->chain)
-               RSurfShader_Water_Pass_Base(ent, surf);
-       if (fogenabled)
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       RSurfShader_Water_Pass_Fog(ent, surf);
-}
-
-static void RSurfShader_Wall_Pass_BaseVertex(entity_render_t *ent, msurface_t *surf)
-{
-       int i, size3;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl, ca, diff[3];
-       float base[3], scale, f;
-       qbyte *lm;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       if (ent->effects & EF_ADDITIVE)
-       {
-               m.transparent = true;
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE;
-       }
-       else if (surf->currenttexture->fogtexture != NULL || ent->alpha != 1)
-       {
-               m.transparent = true;
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+               // now clear the surfacepvs array because we need to redo it
+               memset(info->outsurfacepvs, 0, (info->model->nummodelsurfaces + 7) >> 3);
+               info->outnumsurfaces = 0;
        }
        else
-       {
-               m.transparent = false;
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
-       }
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-
-       size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3;
-
-       base[0] = base[1] = base[2] = ent->effects & EF_FULLBRIGHT ? 2.0f : r_ambient.value * (1.0f / 64.0f);
+               info->svbsp_active = false;
 
-       ca = ent->alpha;
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       // we HAVE to mark the leaf the light is in as lit, because portals are
+       // irrelevant to a leaf that the light source is inside of
+       // (and they are all facing away, too)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, true))
+               mnode_t *node = info->model->brush.data_nodes;
+               mleaf_t *leaf;
+               while (node->plane)
+                       node = node->children[(node->plane->type < 3 ? info->relativelightorigin[node->plane->type] : DotProduct(info->relativelightorigin,node->plane->normal)) < node->plane->dist];
+               leaf = (mleaf_t *)node;
+               info->outmins[0] = min(info->outmins[0], leaf->mins[0]);
+               info->outmins[1] = min(info->outmins[1], leaf->mins[1]);
+               info->outmins[2] = min(info->outmins[2], leaf->mins[2]);
+               info->outmaxs[0] = max(info->outmaxs[0], leaf->maxs[0]);
+               info->outmaxs[1] = max(info->outmaxs[1], leaf->maxs[1]);
+               info->outmaxs[2] = max(info->outmaxs[2], leaf->maxs[2]);
+               if (info->outleafpvs)
                {
-                       cl = m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-
-                       if (ent->effects & EF_FULLBRIGHT)
-                       {
-                               for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                               {
-                                       softwaretransform(v->v, outv);
-                                       outv[3] = 1;
-                                       VectorSubtract(outv, r_origin, diff);
-                                       outc[0] = outc[1] = outc[2] = 2.0f * cl * (1 - exp(fogdensity/DotProduct(diff, diff)));
-                                       outc[3] = ca;
-                                       outst[0] = v->st[0];
-                                       outst[1] = v->st[1];
-                               }
-                       }
-                       else
+                       int leafindex = leaf - info->model->brush.data_leafs;
+                       if (!CHECKPVSBIT(info->outleafpvs, leafindex))
                        {
-                               for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                               {
-                                       softwaretransform(v->v, outv);
-                                       outv[3] = 1;
-                                       VectorCopy(base, outc);
-                                       outc[3] = ca;
-                                       outst[0] = v->st[0];
-                                       outst[1] = v->st[1];
-                               }
-
-                               if (surf->dlightframe == r_framecount)
-                                       RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color);
-
-                               for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4)
-                               {
-                                       if (surf->styles[0] != 255)
-                                       {
-                                               lm = surf->samples + v->lightmapoffset;
-                                               scale = d_lightstylevalue[surf->styles[0]] * (1.0f / 32768.0f);
-                                               VectorMA(outc, scale, lm, outc);
-                                               if (surf->styles[1] != 255)
-                                               {
-                                                       lm += size3;
-                                                       scale = d_lightstylevalue[surf->styles[1]] * (1.0f / 32768.0f);
-                                                       VectorMA(outc, scale, lm, outc);
-                                                       if (surf->styles[2] != 255)
-                                                       {
-                                                               lm += size3;
-                                                               scale = d_lightstylevalue[surf->styles[2]] * (1.0f / 32768.0f);
-                                                               VectorMA(outc, scale, lm, outc);
-                                                               if (surf->styles[3] != 255)
-                                                               {
-                                                                       lm += size3;
-                                                                       scale = d_lightstylevalue[surf->styles[3]] * (1.0f / 32768.0f);
-                                                                       VectorMA(outc, scale, lm, outc);
-                                                               }
-                                                       }
-                                               }
-                                       }
-                                       if (fogenabled)
-                                       {
-                                               VectorSubtract(outv, r_origin, diff);
-                                               f = cl * (1 - exp(fogdensity/DotProduct(diff, diff)));
-                                               VectorScale(outc, f, outc);
-                                       }
-                                       else
-                                               VectorScale(outc, cl, outc);
-                               }
+                               SETPVSBIT(info->outleafpvs, leafindex);
+                               info->outleaflist[info->outnumleafs++] = leafindex;
                        }
-                       R_Mesh_Render();
                }
        }
-}
 
-static void RSurfShader_Wall_Pass_BaseFullbright(entity_render_t *ent, msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl, ca, diff[3];
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       if (ent->effects & EF_ADDITIVE)
-       {
-               m.transparent = true;
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE;
-       }
-       else if (surf->currenttexture->fogtexture != NULL || ent->alpha != 1)
-       {
-               m.transparent = true;
-               m.blendfunc1 = GL_SRC_ALPHA;
-               m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       }
-       else
-       {
-               m.transparent = false;
-               m.blendfunc1 = GL_ONE;
-               m.blendfunc2 = GL_ZERO;
-       }
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       ca = ent->alpha;
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       info->svbsp_insertoccluder = false;
+       R_Q1BSP_RecursiveGetLightInfo(info, info->model->brush.data_nodes);
+       if (developer.integer >= 100 && use_svbsp)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, false))
-               {
-                       cl = m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               if (fogenabled)
-                               {
-                                       VectorSubtract(outv, r_origin, diff);
-                                       outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff)));
-                               }
-                               else
-                                       outc[0] = outc[1] = outc[2] = cl;
-                               outc[3] = ca;
-                               outst[0] = v->st[0];
-                               outst[1] = v->st[1];
-                       }
-                       R_Mesh_Render();
-               }
+               Con_Printf("GetLightInfo: svbsp built with %i nodes, polygon stats:\n", r_svbsp.numnodes);
+               Con_Printf("occluders: %i accepted, %i rejected, %i fragments accepted, %i fragments rejected.\n", r_svbsp.stat_occluders_accepted, r_svbsp.stat_occluders_rejected, r_svbsp.stat_occluders_fragments_accepted, r_svbsp.stat_occluders_fragments_rejected);
+               Con_Printf("queries  : %i accepted, %i rejected, %i fragments accepted, %i fragments rejected.\n", r_svbsp.stat_queries_accepted, r_svbsp.stat_queries_rejected, r_svbsp.stat_queries_fragments_accepted, r_svbsp.stat_queries_fragments_rejected);
        }
 }
 
-static void RSurfShader_Wall_Pass_Glow(entity_render_t *ent, msurface_t *surf)
+void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs)
 {
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl, ca, diff[3];
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = ent->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || ent->alpha != 1;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
-       ca = ent->alpha;
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       r_q1bsp_getlightinfo_t info;
+       VectorCopy(relativelightorigin, info.relativelightorigin);
+       info.lightradius = lightradius;
+       info.lightmins[0] = info.relativelightorigin[0] - info.lightradius;
+       info.lightmins[1] = info.relativelightorigin[1] - info.lightradius;
+       info.lightmins[2] = info.relativelightorigin[2] - info.lightradius;
+       info.lightmaxs[0] = info.relativelightorigin[0] + info.lightradius;
+       info.lightmaxs[1] = info.relativelightorigin[1] + info.lightradius;
+       info.lightmaxs[2] = info.relativelightorigin[2] + info.lightradius;
+       if (ent->model == NULL)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, false))
-               {
-                       cl = m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               if (fogenabled)
-                               {
-                                       VectorSubtract(outv, r_origin, diff);
-                                       outc[0] = outc[1] = outc[2] = cl * (1 - exp(fogdensity/DotProduct(diff, diff)));
-                               }
-                               else
-                                       outc[0] = outc[1] = outc[2] = cl;
-                               outc[3] = ca;
-                               outst[0] = v->st[0];
-                               outst[1] = v->st[1];
-                       }
-                       R_Mesh_Render();
-               }
+               VectorCopy(info.lightmins, outmins);
+               VectorCopy(info.lightmaxs, outmaxs);
+               *outnumleafspointer = 0;
+               *outnumsurfacespointer = 0;
+               return;
        }
-}
+       info.model = ent->model;
+       info.outleaflist = outleaflist;
+       info.outleafpvs = outleafpvs;
+       info.outnumleafs = 0;
+       info.outsurfacelist = outsurfacelist;
+       info.outsurfacepvs = outsurfacepvs;
+       info.outshadowtrispvs = outshadowtrispvs;
+       info.outlighttrispvs = outlighttrispvs;
+       info.outnumsurfaces = 0;
+       VectorCopy(info.relativelightorigin, info.outmins);
+       VectorCopy(info.relativelightorigin, info.outmaxs);
+       memset(outleafpvs, 0, (info.model->brush.num_leafs + 7) >> 3);
+       memset(outsurfacepvs, 0, (info.model->nummodelsurfaces + 7) >> 3);
+       if (info.model->brush.shadowmesh)
+               memset(outshadowtrispvs, 0, (info.model->brush.shadowmesh->numtriangles + 7) >> 3);
+       else
+               memset(outshadowtrispvs, 0, (info.model->surfmesh.num_triangles + 7) >> 3);
+       memset(outlighttrispvs, 0, (info.model->surfmesh.num_triangles + 7) >> 3);
+       if (info.model->brush.GetPVS && r_shadow_frontsidecasting.integer)
+               info.pvs = info.model->brush.GetPVS(info.model, info.relativelightorigin);
+       else
+               info.pvs = NULL;
+       R_UpdateAllTextureInfo(ent);
 
-static void RSurfShader_Wall_Pass_Fog(entity_render_t *ent, msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl, ca, diff[3], f;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = ent->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || ent->alpha != 1;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       ca = ent->alpha;
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       if (r_shadow_frontsidecasting.integer && r_shadow_compilingrtlight && r_shadow_realtime_world_compileportalculling.integer)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, false))
-               {
-                       cl = m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               VectorSubtract(outv, r_origin, diff);
-                               f = cl * exp(fogdensity/DotProduct(diff, diff));
-                               VectorScale(fogcolor, f, outc);
-                               outc[3] = ca;
-                               outst[0] = v->st[0];
-                               outst[1] = v->st[1];
-                       }
-                       R_Mesh_Render();
-               }
+               // use portal recursion for exact light volume culling, and exact surface checking
+               Portal_Visibility(info.model, info.relativelightorigin, info.outleaflist, info.outleafpvs, &info.outnumleafs, info.outsurfacelist, info.outsurfacepvs, &info.outnumsurfaces, NULL, 0, true, info.lightmins, info.lightmaxs, info.outmins, info.outmaxs, info.outshadowtrispvs, info.outlighttrispvs);
        }
-}
-
-static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(entity_render_t *ent, msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, *outuv, *outab, cl;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_ONE;
-       m.blendfunc2 = GL_ZERO;
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.texrgbscale[0] = 1.0f;
-       m.tex[1] = R_GetTexture(surf->lightmaptexture);
-       m.texrgbscale[1] = 4.0f;
-       m.tex[2] = R_GetTexture(surf->currenttexture->detailtexture);
-       m.texrgbscale[2] = 2.0f;
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       else if (r_shadow_frontsidecasting.integer && r_shadow_realtime_dlight_portalculling.integer)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, false))
-               {
-                       cl = (float) (1 << lightscalebit) * m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1], outab = m.texcoords[2];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2, outab += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               outc[0] = outc[1] = outc[2] = cl;
-                               outc[3] = 1;
-                               outst[0] = v->st[0];
-                               outst[1] = v->st[1];
-                               outuv[0] = v->uv[0];
-                               outuv[1] = v->uv[1];
-                               outab[0] = v->ab[0];
-                               outab[1] = v->ab[1];
-                       }
-                       R_Mesh_Render();
-               }
+               // use portal recursion for exact light volume culling, but not the expensive exact surface checking
+               Portal_Visibility(info.model, info.relativelightorigin, info.outleaflist, info.outleafpvs, &info.outnumleafs, info.outsurfacelist, info.outsurfacepvs, &info.outnumsurfaces, NULL, 0, r_shadow_realtime_dlight_portalculling.integer >= 2, info.lightmins, info.lightmaxs, info.outmins, info.outmaxs, info.outshadowtrispvs, info.outlighttrispvs);
        }
-}
-
-static void RSurfShader_OpaqueWall_Pass_BaseMTex(entity_render_t *ent, msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, *outuv, cl;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_ONE;
-       m.blendfunc2 = GL_ZERO;
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       m.tex[1] = R_GetTexture(surf->lightmaptexture);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       else
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, true))
-               {
-                       cl = (float) (1 << lightscalebit) * m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0], outuv = m.texcoords[1];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2, outuv += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               outc[0] = outc[1] = outc[2] = cl;
-                               outc[3] = 1;
-                               outst[0] = v->st[0];
-                               outst[1] = v->st[1];
-                               outuv[0] = v->uv[0];
-                               outuv[1] = v->uv[1];
-                       }
-                       R_Mesh_Render();
-               }
+               // recurse the bsp tree, checking leafs and surfaces for visibility
+               // optionally using svbsp for exact culling of compiled lights
+               // (or if the user enables dlight svbsp culling, which is mostly for
+               //  debugging not actual use)
+               R_Q1BSP_CallRecursiveGetLightInfo(&info, r_shadow_compilingrtlight ? r_shadow_realtime_world_compilesvbsp.integer : r_shadow_realtime_dlight_svbspculling.integer);
        }
-}
 
-static void RSurfShader_OpaqueWall_Pass_BaseTexture(entity_render_t *ent, msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_ONE;
-       m.blendfunc2 = GL_ZERO;
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-       {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
+       // limit combined leaf box to light boundaries
+       outmins[0] = max(info.outmins[0] - 1, info.lightmins[0]);
+       outmins[1] = max(info.outmins[1] - 1, info.lightmins[1]);
+       outmins[2] = max(info.outmins[2] - 1, info.lightmins[2]);
+       outmaxs[0] = min(info.outmaxs[0] + 1, info.lightmaxs[0]);
+       outmaxs[1] = min(info.outmaxs[1] + 1, info.lightmaxs[1]);
+       outmaxs[2] = min(info.outmaxs[2] + 1, info.lightmaxs[2]);
 
-               if (R_Mesh_Draw_GetBuffer(&m, false))
-               {
-                       cl = (float) (1 << lightscalebit) * m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               outc[0] = outc[1] = outc[2] = cl;
-                               outc[3] = 1;
-                               outst[0] = v->st[0];
-                               outst[1] = v->st[1];
-                       }
-                       R_Mesh_Render();
-               }
-       }
+       *outnumleafspointer = info.outnumleafs;
+       *outnumsurfacespointer = info.outnumsurfaces;
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseLightmap(entity_render_t *ent, msurface_t *surf)
+void R_Q1BSP_CompileShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
 {
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outuv, cl;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_ZERO;
-       m.blendfunc2 = GL_SRC_COLOR;
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->lightmaptexture);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       model_t *model = ent->model;
+       msurface_t *surface;
+       int surfacelistindex;
+       float projectdistance = relativelightdirection ? lightradius : lightradius + model->radius*2 + r_shadow_projectdistance.value;
+       r_shadow_compilingrtlight->static_meshchain_shadow = Mod_ShadowMesh_Begin(r_main_mempool, 32768, 32768, NULL, NULL, NULL, false, false, true);
+       R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
+       for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, true))
-               {
-                       cl = (float) (1 << lightscalebit) * m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outuv = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outuv += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               outc[0] = outc[1] = outc[2] = cl;
-                               outc[3] = 1;
-                               outuv[0] = v->uv[0];
-                               outuv[1] = v->uv[1];
-                       }
-                       R_Mesh_Render();
-               }
+               surface = model->data_surfaces + surfacelist[surfacelistindex];
+               if (surface->texture->currentframe->basematerialflags & MATERIALFLAG_NOSHADOW)
+                       continue;
+               R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, relativelightdirection, r_shadow_compilingrtlight->cullmins, r_shadow_compilingrtlight->cullmaxs, surface->mins, surface->maxs);
        }
+       R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, relativelightdirection, projectdistance, numshadowmark, shadowmarklist);
+       r_shadow_compilingrtlight->static_meshchain_shadow = Mod_ShadowMesh_Finish(r_main_mempool, r_shadow_compilingrtlight->static_meshchain_shadow, false, false, true);
 }
 
-static void RSurfShader_OpaqueWall_Pass_Light(entity_render_t *ent, msurface_t *surf)
+extern cvar_t r_polygonoffset_submodel_factor;
+extern cvar_t r_polygonoffset_submodel_offset;
+void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const vec3_t lightmins, const vec3_t lightmaxs)
 {
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-
-       if (surf->dlightframe != r_framecount)
+       model_t *model = ent->model;
+       msurface_t *surface;
+       int modelsurfacelistindex;
+       float projectdistance = relativelightdirection ? lightradius : lightradius + model->radius*2 + r_shadow_projectdistance.value;
+       // check the box in modelspace, it was already checked in worldspace
+       if (!BoxesOverlap(model->normalmins, model->normalmaxs, lightmins, lightmaxs))
                return;
-       if (ent->effects & EF_FULLBRIGHT)
-               return;
-
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->texture);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       R_UpdateAllTextureInfo(ent);
+       if (ent->model->brush.submodel)
+               GL_PolygonOffset(r_refdef.shadowpolygonfactor + r_polygonoffset_submodel_factor.value, r_refdef.shadowpolygonoffset + r_polygonoffset_submodel_offset.value);
+       if (model->brush.shadowmesh)
        {
-               if (RSurf_LightCheck(surf->dlightbits, mesh))
+               R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
+               for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
                {
-                       m.numtriangles = mesh->numtriangles;
-                       m.numverts = mesh->numverts;
-
-                       if (R_Mesh_Draw_GetBuffer(&m, true))
-                       {
-                               cl = m.colorscale;
-                               memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                               for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                               {
-                                       softwaretransform(v->v, outv);
-                                       outv[3] = 1;
-                                       VectorClear(outc);
-                                       outc[3] = 1;
-                                       outst[0] = v->st[0];
-                                       outst[1] = v->st[1];
-                               }
-                               RSurf_LightSeparate(surf->dlightbits, m.numverts, m.vertex, m.color);
-                               if (cl != 1)
-                                       for (i = 0, outc = m.color;i < m.numverts;i++, outc += 4)
-                                               VectorScale(outc, cl, outc);
-                               R_Mesh_Render();
-                       }
+                       surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
+                       if (surface->texture->currentframe->currentmaterialflags & MATERIALFLAG_NOSHADOW)
+                               continue;
+                       R_Shadow_MarkVolumeFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, relativelightorigin, relativelightdirection, lightmins, lightmaxs, surface->mins, surface->maxs);
                }
+               R_Shadow_VolumeFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, model->brush.shadowmesh->neighbor3i, relativelightorigin, relativelightdirection, projectdistance, numshadowmark, shadowmarklist);
        }
-}
-
-static void RSurfShader_OpaqueWall_Pass_Fog(entity_render_t *ent, msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, cl, diff[3], fcolor[3];
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       else
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, false))
+               projectdistance = lightradius + model->radius*2;
+               R_Shadow_PrepareShadowMark(model->surfmesh.num_triangles);
+               // identify lit faces within the bounding box
+               for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
                {
-                       cl = m.colorscale;
-                       VectorScale(fogcolor, cl, fcolor);
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color;i < m.numverts;i++, v++, outv += 4, outc += 4)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               VectorCopy(fcolor, outc);
-                               VectorSubtract(outv, r_origin, diff);
-                               outc[3] = exp(fogdensity/DotProduct(diff, diff));
-                       }
-                       R_Mesh_Render();
+                       surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
+                       rsurface.texture = surface->texture->currentframe;
+                       if (rsurface.texture->currentmaterialflags & MATERIALFLAG_NOSHADOW)
+                               continue;
+                       RSurf_PrepareVerticesForBatch(false, false, 1, &surface);
+                       R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface.vertex3f, rsurface.modelelement3i, relativelightorigin, relativelightdirection, lightmins, lightmaxs, surface->mins, surface->maxs);
                }
+               R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface.vertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, relativelightdirection, projectdistance, numshadowmark, shadowmarklist);
        }
+       if (ent->model->brush.submodel)
+               GL_PolygonOffset(r_refdef.shadowpolygonfactor, r_refdef.shadowpolygonoffset);
 }
 
-static void RSurfShader_OpaqueWall_Pass_BaseDetail(entity_render_t *ent, msurface_t *surf)
-{
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_DST_COLOR;
-       m.blendfunc2 = GL_SRC_COLOR;
-       m.depthwrite = false;
-       m.depthdisable = false;
-       m.tex[0] = R_GetTexture(surf->currenttexture->detailtexture);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
-       {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
+#define BATCHSIZE 1024
 
-               if (R_Mesh_Draw_GetBuffer(&m, false))
-               {
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               outc[0] = outc[1] = outc[2] = outc[3] = 1;
-                               outst[0] = v->ab[0];
-                               outst[1] = v->ab[1];
-                       }
-                       R_Mesh_Render();
-               }
-       }
-}
-
-static void RSurfShader_OpaqueWall_Pass_Glow(entity_render_t *ent, msurface_t *surf)
+static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
 {
-       int i;
-       surfvertex_t *v;
-       float *outv, *outc, *outst, cl;
-       surfmesh_t *mesh;
-       rmeshbufferinfo_t m;
-       memset(&m, 0, sizeof(m));
-       m.transparent = false;
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);
-       for (mesh = surf->mesh;mesh;mesh = mesh->chain)
+       int i, j, endsurface;
+       texture_t *t;
+       msurface_t *surface;
+       // note: in practice this never actually receives batches), oh well
+       R_Shadow_RenderMode_Begin();
+       R_Shadow_RenderMode_ActiveLight((rtlight_t *)rtlight);
+       R_Shadow_RenderMode_Lighting(false, true);
+       R_Shadow_SetupEntityLight(ent);
+       for (i = 0;i < numsurfaces;i = j)
        {
-               m.numtriangles = mesh->numtriangles;
-               m.numverts = mesh->numverts;
-
-               if (R_Mesh_Draw_GetBuffer(&m, false))
+               j = i + 1;
+               surface = rsurface.modelsurfaces + surfacelist[i];
+               t = surface->texture;
+               R_UpdateTextureInfo(ent, t);
+               rsurface.texture = t->currentframe;
+               endsurface = min(j + BATCHSIZE, numsurfaces);
+               for (j = i;j < endsurface;j++)
                {
-                       cl = m.colorscale;
-                       memcpy(m.index, mesh->index, m.numtriangles * sizeof(int[3]));
-                       for (i = 0, v = mesh->vertex, outv = m.vertex, outc = m.color, outst = m.texcoords[0];i < m.numverts;i++, v++, outv += 4, outc += 4, outst += 2)
-                       {
-                               softwaretransform(v->v, outv);
-                               outv[3] = 1;
-                               outc[0] = outc[1] = outc[2] = cl;
-                               outc[3] = 1;
-                               outst[0] = v->st[0];
-                               outst[1] = v->st[1];
-                       }
-                       R_Mesh_Render();
+                       surface = rsurface.modelsurfaces + surfacelist[j];
+                       if (t != surface->texture)
+                               break;
+                       RSurf_PrepareVerticesForBatch(true, true, 1, &surface);
+                       R_Shadow_RenderLighting(surface->num_firstvertex, surface->num_vertices, surface->num_triangles, ent->model->surfmesh.data_element3i + surface->num_firsttriangle * 3, ent->model->surfmesh.ebo, (sizeof(int[3]) * surface->num_firsttriangle));
                }
        }
+       R_Shadow_RenderMode_End();
 }
 
-static void RSurfShader_Wall_Fullbright(entity_render_t *ent, msurface_t *firstsurf)
-{
-       msurface_t *surf;
-       for (surf = firstsurf;surf;surf = surf->chain)
-       {
-               c_brush_polys++;
-               RSurfShader_Wall_Pass_BaseFullbright(ent, surf);
-       }
-       for (surf = firstsurf;surf;surf = surf->chain)
-               if (surf->currenttexture->glowtexture)
-                       RSurfShader_Wall_Pass_Glow(ent, surf);
-       if (fogenabled)
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       RSurfShader_Wall_Pass_Fog(ent, surf);
-}
-
-static void RSurfShader_Wall_Vertex(entity_render_t *ent, msurface_t *firstsurf)
-{
-       msurface_t *surf;
-       for (surf = firstsurf;surf;surf = surf->chain)
-       {
-               c_brush_polys++;
-               RSurfShader_Wall_Pass_BaseVertex(ent, surf);
-       }
-       for (surf = firstsurf;surf;surf = surf->chain)
-               if (surf->currenttexture->glowtexture)
-                       RSurfShader_Wall_Pass_Glow(ent, surf);
-       if (fogenabled)
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       RSurfShader_Wall_Pass_Fog(ent, surf);
-}
+#define RSURF_MAX_BATCHSURFACES 1024
 
-static void RSurfShader_Wall_Lightmap(entity_render_t *ent, msurface_t *firstsurf)
+void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs)
 {
-       msurface_t *surf;
-       if (r_vertexsurfaces.integer || firstsurf->currenttexture->fogtexture != NULL || ent->alpha != 1 || ent->effects & EF_ADDITIVE)
+       model_t *model = ent->model;
+       msurface_t *surface;
+       int i, k, l, m, mend, endsurface, batchnumsurfaces, batchnumtriangles, batchfirstvertex, batchlastvertex;
+       qboolean usebufferobject, culltriangles;
+       const int *element3i;
+       msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES];
+       int batchelements[BATCHSIZE*3];
+       texture_t *tex;
+       CHECKGLERROR
+       RSurf_ActiveModelEntity(ent, true, true);
+       R_UpdateAllTextureInfo(ent);
+       CHECKGLERROR
+       culltriangles = r_shadow_culltriangles.integer && !(ent->flags & RENDER_NOSELFSHADOW);
+       element3i = rsurface.modelelement3i;
+       // this is a double loop because non-visible surface skipping has to be
+       // fast, and even if this is not the world model (and hence no visibility
+       // checking) the input surface list and batch buffer are different formats
+       // so some processing is necessary.  (luckily models have few surfaces)
+       for (i = 0;i < numsurfaces;)
        {
-               for (surf = firstsurf;surf;surf = surf->chain)
+               batchnumsurfaces = 0;
+               endsurface = min(i + RSURF_MAX_BATCHSURFACES, numsurfaces);
+               if (ent == r_refdef.worldentity)
                {
-                       c_brush_polys++;
-                       RSurfShader_Wall_Pass_BaseVertex(ent, surf);
-               }
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       if (surf->currenttexture->glowtexture)
-                               RSurfShader_Wall_Pass_Glow(ent, surf);
-               if (fogenabled)
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               RSurfShader_Wall_Pass_Fog(ent, surf);
-       }
-       else
-       {
-               if (r_textureunits.integer >= 2)
-               {
-                       if (r_textureunits.integer >= 3 && gl_combine.integer && r_detailtextures.integer)
-                       {
-                               for (surf = firstsurf;surf;surf = surf->chain)
-                               {
-                                       c_brush_polys++;
-                                       RSurfShader_OpaqueWall_Pass_TripleTexCombine(ent, surf);
-                               }
-                       }
-                       else
-                       {
-                               for (surf = firstsurf;surf;surf = surf->chain)
-                               {
-                                       c_brush_polys++;
-                                       RSurfShader_OpaqueWall_Pass_BaseMTex(ent, surf);
-                               }
-                               if (r_detailtextures.integer)
-                                       for (surf = firstsurf;surf;surf = surf->chain)
-                                               RSurfShader_OpaqueWall_Pass_BaseDetail(ent, surf);
-                       }
+                       for (;i < endsurface;i++)
+                               if (r_viewcache.world_surfacevisible[surfacelist[i]])
+                                       batchsurfacelist[batchnumsurfaces++] = model->data_surfaces + surfacelist[i];
                }
                else
                {
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                       {
-                               c_brush_polys++;
-                               RSurfShader_OpaqueWall_Pass_BaseTexture(ent, surf);
-                       }
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               RSurfShader_OpaqueWall_Pass_BaseLightmap(ent, surf);
-                       if (r_detailtextures.integer)
-                               for (surf = firstsurf;surf;surf = surf->chain)
-                                       RSurfShader_OpaqueWall_Pass_BaseDetail(ent, surf);
+                       for (;i < endsurface;i++)
+                               batchsurfacelist[batchnumsurfaces++] = model->data_surfaces + surfacelist[i];
                }
-               if (!r_dlightmap.integer)
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               if (surf->dlightframe == r_framecount)
-                                       RSurfShader_OpaqueWall_Pass_Light(ent, surf);
-               for (surf = firstsurf;surf;surf = surf->chain)
-                       if (surf->currenttexture->glowtexture)
-                               RSurfShader_OpaqueWall_Pass_Glow(ent, surf);
-               if (fogenabled)
-                       for (surf = firstsurf;surf;surf = surf->chain)
-                               RSurfShader_OpaqueWall_Pass_Fog(ent, surf);
-       }
-}
-
-/*
-=============================================================
-
-       WORLD MODEL
-
-=============================================================
-*/
-
-static void R_SolidWorldNode (entity_render_t *ent)
-{
-       if (r_viewleaf->contents != CONTENTS_SOLID)
-       {
-               int portalstack;
-               mportal_t *p, *pstack[8192];
-               msurface_t *surf, **mark, **endmark;
-               mleaf_t *leaf;
-               // LordHavoc: portal-passage worldnode; follows portals leading
-               // outward from viewleaf, if a portal leads offscreen it is not
-               // followed, in indoor maps this can often cull a great deal of
-               // geometry away when pvs data is not present (useful with pvs as well)
-
-               leaf = r_viewleaf;
-               leaf->worldnodeframe = r_framecount;
-               portalstack = 0;
-       loc0:
-               c_leafs++;
-
-               leaf->visframe = r_framecount;
-
-               if (leaf->nummarksurfaces)
+               if (!batchnumsurfaces)
+                       continue;
+               for (k = 0;k < batchnumsurfaces;k = l)
                {
-                       mark = leaf->firstmarksurface;
-                       endmark = mark + leaf->nummarksurfaces;
-                       do
+                       surface = batchsurfacelist[k];
+                       tex = surface->texture;
+                       rsurface.texture = tex->currentframe;
+                       if (rsurface.texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_WATER))
                        {
-                               surf = *mark++;
-                               // make sure surfaces are only processed once
-                               if (surf->worldnodeframe == r_framecount)
-                                       continue;
-                               surf->worldnodeframe = r_framecount;
-                               if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
+                               if (rsurface.texture->currentmaterialflags & MATERIALFLAGMASK_DEPTHSORTED)
                                {
-                                       if (surf->flags & SURF_PLANEBACK)
-                                               surf->visframe = r_framecount;
+                                       vec3_t tempcenter, center;
+                                       for (l = k;l < batchnumsurfaces && tex == batchsurfacelist[l]->texture;l++)
+                                       {
+                                               surface = batchsurfacelist[l];
+                                               tempcenter[0] = (surface->mins[0] + surface->maxs[0]) * 0.5f;
+                                               tempcenter[1] = (surface->mins[1] + surface->maxs[1]) * 0.5f;
+                                               tempcenter[2] = (surface->mins[2] + surface->maxs[2]) * 0.5f;
+                                               Matrix4x4_Transform(&rsurface.matrix, tempcenter, center);
+                                               R_MeshQueue_AddTransparent(rsurface.texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_view.origin : center, R_Q1BSP_DrawLight_TransparentCallback, ent, surface - rsurface.modelsurfaces, rsurface.rtlight);
+                                       }
                                }
                                else
                                {
-                                       if (!(surf->flags & SURF_PLANEBACK))
-                                               surf->visframe = r_framecount;
-                               }
-                       }
-                       while (mark < endmark);
-               }
-
-               // follow portals into other leafs
-               p = leaf->portals;
-               for (;p;p = p->next)
-               {
-                       if (DotProduct(r_origin, p->plane.normal) < p->plane.dist)
-                       {
-                               leaf = p->past;
-                               if (leaf->worldnodeframe != r_framecount)
-                               {
-                                       leaf->worldnodeframe = r_framecount;
-                                       if (leaf->contents != CONTENTS_SOLID)
+                                       // use the bufferobject if all triangles are accepted
+                                       usebufferobject = true;
+                                       batchnumtriangles = 0;
+                                       // note: this only accepts consecutive surfaces because
+                                       // non-consecutive surfaces often have extreme vertex
+                                       // ranges (due to large numbers of surfaces omitted
+                                       // between them)
+                                       surface = batchsurfacelist[k];
+                                       for (l = k;l < batchnumsurfaces && surface == batchsurfacelist[l] && tex == surface->texture;l++, surface++)
                                        {
-                                               if (R_NotCulledBox(leaf->mins, leaf->maxs))
+                                               RSurf_PrepareVerticesForBatch(true, true, 1, &surface);
+                                               for (m = surface->num_firsttriangle, mend = m + surface->num_triangles;m < mend;m++)
                                                {
-                                                       p->visframe = r_framecount;
-                                                       pstack[portalstack++] = p;
-                                                       goto loc0;
-
-       loc1:
-                                                       p = pstack[--portalstack];
+                                                       if (culltriangles)
+                                                       {
+                                                               if (trispvs)
+                                                               {
+                                                                       if (!CHECKPVSBIT(trispvs, m))
+                                                                       {
+                                                                               usebufferobject = false;
+                                                                               continue;
+                                                                       }
+                                                               }
+                                                               else
+                                                               {
+                                                                       if (r_shadow_frontsidecasting.integer && !PointInfrontOfTriangle(rsurface.entitylightorigin, rsurface.vertex3f + element3i[m*3+0]*3, rsurface.vertex3f + element3i[m*3+1]*3, rsurface.vertex3f + element3i[m*3+2]*3))
+                                                                       {
+                                                                               usebufferobject = false;
+                                                                               continue;
+                                                                       }
+                                                               }
+                                                       }
+                                                       batchelements[batchnumtriangles*3+0] = element3i[m*3+0];
+                                                       batchelements[batchnumtriangles*3+1] = element3i[m*3+1];
+                                                       batchelements[batchnumtriangles*3+2] = element3i[m*3+2];
+                                                       batchnumtriangles++;
+                                                       r_refdef.stats.lights_lighttriangles++;
+                                                       if (batchnumtriangles >= BATCHSIZE)
+                                                       {
+                                                               Mod_VertexRangeFromElements(batchnumtriangles*3, batchelements, &batchfirstvertex, &batchlastvertex);
+                                                               R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, 0, 0);
+                                                               batchnumtriangles = 0;
+                                                               usebufferobject = false;
+                                                       }
                                                }
+                                               r_refdef.stats.lights_lighttriangles += batchsurfacelist[l]->num_triangles;
                                        }
-                               }
-                       }
-               }
-
-               if (portalstack)
-                       goto loc1;
-       }
-       else
-       {
-               mnode_t *nodestack[8192], *node = cl.worldmodel->nodes;
-               int nodestackpos = 0;
-               // LordHavoc: recursive descending worldnode; if portals are not
-               // available, this is a good last resort, can cull large amounts of
-               // geometry, but is more time consuming than portal-passage and renders
-               // things behind walls
-
-loc2:
-               if (R_NotCulledBox(node->mins, node->maxs))
-               {
-                       if (node->numsurfaces)
-                       {
-                               msurface_t *surf = cl.worldmodel->surfaces + node->firstsurface, *surfend = surf + node->numsurfaces;
-                               if (PlaneDiff (r_origin, node->plane) < 0)
-                               {
-                                       for (;surf < surfend;surf++)
-                                       {
-                                               if (surf->flags & SURF_PLANEBACK)
-                                                       surf->visframe = r_framecount;
-                                       }
-                               }
-                               else
-                               {
-                                       for (;surf < surfend;surf++)
+                                       if (batchnumtriangles > 0)
                                        {
-                                               if (!(surf->flags & SURF_PLANEBACK))
-                                                       surf->visframe = r_framecount;
+                                               Mod_VertexRangeFromElements(batchnumtriangles*3, batchelements, &batchfirstvertex, &batchlastvertex);
+                                               if (usebufferobject)
+                                                       R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, ent->model->surfmesh.ebo, sizeof(int[3]) * batchsurfacelist[k]->num_firsttriangle);
+                                               else
+                                                       R_Shadow_RenderLighting(batchfirstvertex, batchlastvertex + 1 - batchfirstvertex, batchnumtriangles, batchelements, 0, 0);
                                        }
                                }
                        }
-
-                       // recurse down the children
-                       if (node->children[0]->contents >= 0)
-                       {
-                               if (node->children[1]->contents >= 0)
-                               {
-                                       if (nodestackpos < 8192)
-                                               nodestack[nodestackpos++] = node->children[1];
-                                       node = node->children[0];
-                                       goto loc2;
-                               }
-                               else
-                                       ((mleaf_t *)node->children[1])->visframe = r_framecount;
-                               node = node->children[0];
-                               goto loc2;
-                       }
                        else
                        {
-                               ((mleaf_t *)node->children[0])->visframe = r_framecount;
-                               if (node->children[1]->contents >= 0)
-                               {
-                                       node = node->children[1];
-                                       goto loc2;
-                               }
-                               else if (nodestackpos > 0)
-                               {
-                                       ((mleaf_t *)node->children[1])->visframe = r_framecount;
-                                       node = nodestack[--nodestackpos];
-                                       goto loc2;
-                               }
+                               // skip ahead to the next texture
+                               for (l = k;l < batchnumsurfaces && tex == batchsurfacelist[l]->texture;l++)
+                                       ;
                        }
                }
-               else if (nodestackpos > 0)
-               {
-                       node = nodestack[--nodestackpos];
-                       goto loc2;
-               }
        }
 }
 
-static int r_portalframecount = 0;
-
-static void R_PVSWorldNode()
+//Made by [515]
+void R_ReplaceWorldTexture (void)
 {
-       int portalstack, i;
-       mportal_t *p, *pstack[8192];
-       msurface_t *surf, **mark, **endmark;
-       mleaf_t *leaf;
-       qbyte *worldvis;
-
-       worldvis = Mod_LeafPVS (r_viewleaf, cl.worldmodel);
-
-       leaf = r_viewleaf;
-       leaf->worldnodeframe = r_framecount;
-       portalstack = 0;
-loc0:
-       c_leafs++;
-
-       leaf->visframe = r_framecount;
-
-       if (leaf->nummarksurfaces)
-       {
-               mark = leaf->firstmarksurface;
-               endmark = mark + leaf->nummarksurfaces;
-               do
-               {
-                       surf = *mark++;
-                       // make sure surfaces are only processed once
-                       if (surf->worldnodeframe == r_framecount)
-                               continue;
-                       surf->worldnodeframe = r_framecount;
-                       if (PlaneDist(r_origin, surf->plane) < surf->plane->dist)
-                       {
-                               if (surf->flags & SURF_PLANEBACK)
-                                       surf->visframe = r_framecount;
-                       }
-                       else
-                       {
-                               if (!(surf->flags & SURF_PLANEBACK))
-                                       surf->visframe = r_framecount;
-                       }
-               }
-               while (mark < endmark);
-       }
-
-       // follow portals into other leafs
-       for (p = leaf->portals;p;p = p->next)
+       model_t         *m;
+       texture_t       *t;
+       int                     i;
+       const char      *r, *newt;
+       skinframe_t *skinframe;
+       if (!r_refdef.worldmodel)
        {
-               if (DotProduct(r_origin, p->plane.normal) < p->plane.dist)
-               {
-                       leaf = p->past;
-                       if (leaf->worldnodeframe != r_framecount)
-                       {
-                               leaf->worldnodeframe = r_framecount;
-                               if (leaf->contents != CONTENTS_SOLID)
-                               {
-                                       i = (leaf - cl.worldmodel->leafs) - 1;
-                                       if (worldvis[i>>3] & (1<<(i&7)))
-                                       {
-                                               if (R_NotCulledBox(leaf->mins, leaf->maxs))
-                                               {
-                                                       pstack[portalstack++] = p;
-                                                       goto loc0;
-
-loc1:
-                                                       p = pstack[--portalstack];
-                                               }
-                                       }
-                               }
-                       }
-               }
+               Con_Printf("There is no worldmodel\n");
+               return;
        }
+       m = r_refdef.worldmodel;
 
-       if (portalstack)
-               goto loc1;
-}
-
-Cshader_t Cshader_wall_vertex = {{NULL, RSurfShader_Wall_Vertex}, NULL};
-Cshader_t Cshader_wall_lightmap = {{NULL, RSurfShader_Wall_Lightmap}, NULL};
-Cshader_t Cshader_wall_fullbright = {{NULL, RSurfShader_Wall_Fullbright}, NULL};
-Cshader_t Cshader_water = {{NULL, RSurfShader_Water}, NULL};
-Cshader_t Cshader_sky = {{RSurfShader_Sky, NULL}, NULL};
-
-int Cshader_count = 5;
-Cshader_t *Cshaders[5] =
-{
-       &Cshader_wall_vertex,
-       &Cshader_wall_lightmap,
-       &Cshader_wall_fullbright,
-       &Cshader_water,
-       &Cshader_sky
-};
-
-void R_PrepareSurfaces(entity_render_t *ent)
-{
-       int i, alttextures, texframe, framecount;
-       texture_t *t;
-       model_t *model;
-       msurface_t *surf;
-
-       for (i = 0;i < Cshader_count;i++)
-               Cshaders[i]->chain = NULL;
-
-       model = ent->model;
-       alttextures = ent->frame != 0;
-       texframe = (int)(cl.time * 5.0f);
-
-       for (i = 0;i < model->nummodelsurfaces;i++)
+       if(Cmd_Argc() < 2)
        {
-               surf = model->modelsortedsurfaces[i];
-               if (surf->visframe == r_framecount)
-               {
-                       if (surf->insertframe != r_framecount)
-                       {
-                               surf->insertframe = r_framecount;
-                               c_faces++;
-                               t = surf->texinfo->texture;
-                               if (t->animated)
-                               {
-                                       framecount = t->anim_total[alttextures];
-                                       if (framecount >= 2)
-                                               surf->currenttexture = t->anim_frames[alttextures][texframe % framecount];
-                                       else
-                                               surf->currenttexture = t->anim_frames[alttextures][0];
-                               }
-                               else
-                                       surf->currenttexture = t;
-                       }
-
-                       surf->chain = surf->shader->chain;
-                       surf->shader->chain = surf;
-               }
+               Con_Print("r_replacemaptexture <texname> <newtexname> - replaces texture\n");
+               Con_Print("r_replacemaptexture <texname> - switch back to default texture\n");
+               return;
        }
-}
-
-void R_DrawSurfaces (entity_render_t *ent, int type)
-{
-       int                     i;
-       Cshader_t       *shader;
-
-       for (i = 0;i < Cshader_count;i++)
+       if(!cl.islocalgame || !cl.worldmodel)
        {
-               shader = Cshaders[i];
-               if (shader->chain && shader->shaderfunc[type])
-                       shader->shaderfunc[type](ent, shader->chain);
-       }
-}
-
-void R_DrawPortals(entity_render_t *ent)
-{
-       int drawportals, i;
-       float *v;
-       mportal_t *portal, *endportal;
-       rmeshbufferinfo_t m;
-       drawportals = r_drawportals.integer;
-
-       if (drawportals < 1)
+               Con_Print("This command works only in singleplayer\n");
                return;
-
-       for (portal = cl.worldmodel->portals, endportal = portal + cl.worldmodel->numportals;portal < endportal;portal++)
+       }
+       r = Cmd_Argv(1);
+       newt = Cmd_Argv(2);
+       if(!newt[0])
+               newt = r;
+       for(i=0,t=m->data_textures;i<m->num_textures;i++,t++)
        {
-               if (portal->visframe == r_portalframecount)
+               if(t->width && !strcasecmp(t->name, r))
                {
-                       memset(&m, 0, sizeof(m));
-                       m.transparent = true;
-                       m.blendfunc1 = GL_SRC_ALPHA;
-                       m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-                       m.numverts = portal->numpoints;
-                       m.numtriangles = portal->numpoints - 2;
-                       if (R_Mesh_Draw_GetBuffer(&m, false))
+                       if ((skinframe = R_SkinFrame_LoadExternal((char*)newt, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS, true)))
                        {
-                               for (i = 0;i < m.numtriangles;i++)
-                               {
-                                       m.index[i * 3 + 0] = 0;
-                                       m.index[i * 3 + 1] = i + 1;
-                                       m.index[i * 3 + 2] = i + 2;
-                               }
-                               i = portal - cl.worldmodel->portals;
-                               R_FillColors(m.color, m.numverts,
-                                       ((i & 0x0007) >> 0) * (1.0f / 7.0f) * m.colorscale,
-                                       ((i & 0x0038) >> 3) * (1.0f / 7.0f) * m.colorscale,
-                                       ((i & 0x01C0) >> 6) * (1.0f / 7.0f) * m.colorscale,
-                                       0.125f);
-                               if (PlaneDiff(r_origin, (&portal->plane)) > 0)
-                               {
-                                       for (i = portal->numpoints - 1, v = m.vertex;i >= 0;i--, v += 4)
-                                               VectorCopy(portal->points[i].position, v);
-                               }
-                               else
-                                       for (i = 0, v = m.vertex;i < portal->numpoints;i++, v += 4)
-                                               VectorCopy(portal->points[i].position, v);
-                               R_Mesh_Render();
+                               t->skinframes[0] = skinframe;
+                               Con_Printf("%s replaced with %s\n", r, newt);
+                               return;
+                       }
+                       else
+                       {
+                               Con_Printf("%s was not found\n", newt);
+                               return;
                        }
                }
        }
 }
 
-void R_SetupForBModelRendering(entity_render_t *ent)
+//Made by [515]
+void R_ListWorldTextures (void)
 {
+       model_t         *m;
+       texture_t       *t;
        int                     i;
-       msurface_t      *surf;
-       model_t         *model;
-       vec3_t          modelorg;
-
-       // because bmodels can be reused, we have to decide which things to render
-       // from scratch every time
-
-       model = ent->model;
-
-       softwaretransformforentity (ent);
-       softwareuntransform(r_origin, modelorg);
-
-       for (i = 0;i < model->nummodelsurfaces;i++)
+       if (!r_refdef.worldmodel)
        {
-               surf = model->modelsortedsurfaces[i];
-               if (((surf->flags & SURF_PLANEBACK) == 0) == (PlaneDiff(modelorg, surf->plane) >= 0))
-                       surf->visframe = r_framecount;
-               else
-                       surf->visframe = -1;
-               surf->worldnodeframe = -1;
-               surf->lightframe = -1;
-               surf->dlightframe = -1;
-               surf->insertframe = -1;
-       }
-}
-
-void R_SetupForWorldRendering(entity_render_t *ent)
-{
-       // there is only one instance of the world, but it can be rendered in
-       // multiple stages
-       softwaretransformidentity();
-}
-
-static void R_SurfMarkLights (entity_render_t *ent)
-{
-       int                     i;
-       msurface_t      *surf;
-
-       if (r_dynamic.integer)
-               R_MarkLights(ent);
-
-       if (!r_vertexsurfaces.integer)
-       {
-               for (i = 0;i < ent->model->nummodelsurfaces;i++)
-               {
-                       surf = ent->model->modelsortedsurfaces[i];
-                       if (surf->visframe == r_framecount && surf->lightmaptexture != NULL)
-                       {
-                               if (surf->cached_dlight
-                                || surf->cached_ambient != r_ambient.value
-                                || surf->cached_lightscalebit != lightscalebit)
-                                       R_BuildLightMap(ent, surf, false); // base lighting changed
-                               else if (r_dynamic.integer)
-                               {
-                                       if  (surf->styles[0] != 255 && (d_lightstylevalue[surf->styles[0]] != surf->cached_light[0]
-                                        || (surf->styles[1] != 255 && (d_lightstylevalue[surf->styles[1]] != surf->cached_light[1]
-                                        || (surf->styles[2] != 255 && (d_lightstylevalue[surf->styles[2]] != surf->cached_light[2]
-                                        || (surf->styles[3] != 255 && (d_lightstylevalue[surf->styles[3]] != surf->cached_light[3]))))))))
-                                               R_BuildLightMap(ent, surf, false); // base lighting changed
-                                       else if (surf->dlightframe == r_framecount && r_dlightmap.integer)
-                                               R_BuildLightMap(ent, surf, true); // only dlights
-                               }
-                       }
-               }
+               Con_Printf("There is no worldmodel\n");
+               return;
        }
-}
+       m = r_refdef.worldmodel;
 
-void R_MarkWorldLights(entity_render_t *ent)
-{
-       R_SetupForWorldRendering(ent);
-       R_SurfMarkLights(ent);
-}
-
-/*
-=============
-R_DrawWorld
-=============
-*/
-void R_DrawWorld (entity_render_t *ent)
-{
-       R_SetupForWorldRendering(ent);
-
-       if (r_viewleaf->contents == CONTENTS_SOLID || r_novis.integer || r_viewleaf->compressed_vis == NULL)
-               R_SolidWorldNode (ent);
-       else
-               R_PVSWorldNode (ent);
-}
-
-/*
-=================
-R_DrawBrushModel
-=================
-*/
-void R_DrawBrushModelSky (entity_render_t *ent)
-{
-       R_SetupForBModelRendering(ent);
-
-       R_PrepareSurfaces(ent);
-       R_DrawSurfaces(ent, SHADERSTAGE_SKY);
-}
-
-void R_DrawBrushModelNormal (entity_render_t *ent)
-{
-       c_bmodels++;
-
-       // have to flush queue because of possible lightmap reuse
-       R_Mesh_Render();
-
-       R_SetupForBModelRendering(ent);
-
-       R_SurfMarkLights(ent);
-
-       R_PrepareSurfaces(ent);
-
-       if (!skyrendermasked)
-               R_DrawSurfaces(ent, SHADERSTAGE_SKY);
-       R_DrawSurfaces(ent, SHADERSTAGE_NORMAL);
+       Con_Print("Worldmodel textures :\n");
+       for(i=0,t=m->data_textures;i<m->num_textures;i++,t++)
+               if (t->numskinframes)
+                       Con_Printf("%s\n", t->name);
 }
 
+#if 0
 static void gl_surf_start(void)
 {
 }
@@ -2066,22 +1216,20 @@ static void gl_surf_shutdown(void)
 static void gl_surf_newmap(void)
 {
 }
+#endif
 
 void GL_Surf_Init(void)
 {
-       int i;
-       dlightdivtable[0] = 4194304;
-       for (i = 1;i < 32768;i++)
-               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);
-
-       R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
+       Cvar_RegisterVariable(&r_lockpvs);
+       Cvar_RegisterVariable(&r_lockvisibility);
+       Cvar_RegisterVariable(&r_useportalculling);
+       Cvar_RegisterVariable(&r_q3bsp_renderskydepth);
+
+       Cmd_AddCommand ("r_replacemaptexture", R_ReplaceWorldTexture, "override a map texture for testing purposes");
+       Cmd_AddCommand ("r_listmaptextures", R_ListWorldTextures, "list all textures used by the current map");
+
+       //R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
 }