]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_rsurf.c
cvar: Rename Cvar_RegisterAlias to Cvar_RegisterVirtual
[xonotic/darkplaces.git] / gl_rsurf.c
index 0c9e85dc7ae6465f83d5ca0b0e6c4f01a2e92ebe..723e9fb4ce3ee2028ffcc20b6924f1e02955dedd 100644 (file)
@@ -25,12 +25,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "csprogs.h"
 #include "image.h"
 
-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", "2", "improve framerate with r_novis 1 by using portal culling - still not as good as compiled visibility data in the map, but it helps (a value of 2 forces use of this even with vis data, which improves framerates in maps without too much complexity, but hurts in extremely complex maps, which is why 2 is not the default mode)"};
-cvar_t r_usesurfaceculling = {0, "r_usesurfaceculling", "1", "skip off-screen surfaces (1 = cull surfaces if the map is likely to benefit, 2 = always cull surfaces)"};
-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"};
+cvar_t r_ambient = {CF_CLIENT, "r_ambient", "0", "brightens map, value is 0-128"};
+cvar_t r_lockpvs = {CF_CLIENT, "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 = {CF_CLIENT, "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 = {CF_CLIENT, "r_useportalculling", "1", "improve framerate with r_novis 1 by using portal culling - still not as good as compiled visibility data in the map, but it helps (a value of 2 forces use of this even with vis data, which improves framerates in maps without too much complexity, but hurts in extremely complex maps, which is why 2 is not the default mode)"};
+cvar_t r_usesurfaceculling = {CF_CLIENT, "r_usesurfaceculling", "1", "skip off-screen surfaces (1 = cull surfaces if the map is likely to benefit, 2 = always cull surfaces)"};
+cvar_t r_vis_trace = {CF_CLIENT, "r_vis_trace", "0", "test if each portal or leaf is visible using tracelines"};
+cvar_t r_vis_trace_samples = {CF_CLIENT, "r_vis_trace_samples", "1", "use this many randomly positioned tracelines each frame to refresh the visible timer"};
+cvar_t r_vis_trace_delay = {CF_CLIENT, "r_vis_trace_delay", "1", "keep a portal visible for this many seconds"};
+cvar_t r_vis_trace_eyejitter = {CF_CLIENT, "r_vis_trace_eyejitter", "8", "use a random offset of this much on the start of each traceline"};
+cvar_t r_vis_trace_enlarge = {CF_CLIENT, "r_vis_trace_enlarge", "0", "make portal bounds bigger for tests by (1+this)*size"};
+cvar_t r_vis_trace_expand = {CF_CLIENT, "r_vis_trace_expand", "0", "make portal bounds bigger for tests by this many units"};
+cvar_t r_vis_trace_pad = {CF_CLIENT, "r_vis_trace_pad", "8", "accept traces that hit within this many units of the portal"};
+cvar_t r_vis_trace_surfaces = {CF_CLIENT, "r_vis_trace_surfaces", "0", "also use tracelines to cull surfaces"};
+cvar_t r_q3bsp_renderskydepth = {CF_CLIENT, "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"};
 
 /*
 ===============
@@ -39,12 +47,12 @@ R_BuildLightMap
 Combine and scale multiple lightmaps into the 8.8 format in blocklights
 ===============
 */
-void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
+void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface, int combine)
 {
        int smax, tmax, i, size, size3, maps, l;
        int *bl, scale;
        unsigned char *lightmap, *out, *stain;
-       dp_model_t *model = ent->model;
+       model_t *model = ent->model;
        int *intblocklights;
        unsigned char *templight;
 
@@ -123,7 +131,7 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
 
        if(vid_sRGB.integer && vid_sRGB_fallback.integer && !vid.sRGB3D)
                Image_MakesRGBColorsFromLinear_Lightmap(templight, templight, size);
-       R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1);
+       R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1, combine);
 
        // update the surface's deluxemap if it has one
        if (surface->deluxemaptexture != r_texture_blanknormalmap)
@@ -161,11 +169,11 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
                        l = (int)(n[2] * 128 + 128);out[0] = bound(0, l, 255);
                        out[3] = 255;
                }
-               R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1);
+               R_UpdateTexture(surface->deluxemaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], 0, smax, tmax, 1, r_q1bsp_lightmap_updates_combine.integer);
        }
 }
 
-static void R_StainNode (mnode_t *node, dp_model_t *model, const vec3_t origin, float radius, const float fcolor[8])
+static void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radius, const float fcolor[8])
 {
        float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2;
        msurface_t *surface, *endsurface;
@@ -292,7 +300,7 @@ void R_Stain (const vec3_t origin, float radius, int cr1, int cg1, int cb1, int
        int n;
        float fcolor[8];
        entity_render_t *ent;
-       dp_model_t *model;
+       model_t *model;
        vec3_t org;
        if (r_refdef.scene.worldmodel == NULL || !r_refdef.scene.worldmodel->brush.data_nodes || !r_refdef.scene.worldmodel->brushq1.lightdata)
                return;
@@ -338,7 +346,7 @@ static void R_DrawPortal_Callback(const entity_render_t *ent, const rtlight_t *r
        // 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;
-       qboolean isvis;
+       qbool isvis;
        int i, numpoints;
        float *v;
        float vertex3f[POLYGONELEMENTS_MAXPOINTS*3];
@@ -369,24 +377,24 @@ static void R_DrawPortal_Callback(const entity_render_t *ent, const rtlight_t *r
        R_Mesh_Draw(0, numpoints, 0, numpoints - 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 }
 
-// LordHavoc: this is just a nice debugging tool, very slow
+// LadyHavoc: this is just a nice debugging tool, very slow
 void R_DrawPortals(void)
 {
        int i, leafnum;
        mportal_t *portal;
        float center[3], f;
-       dp_model_t *model = r_refdef.scene.worldmodel;
+       model_t *model = r_refdef.scene.worldmodel;
        if (model == NULL)
                return;
-       for (leafnum = 0;leafnum < r_refdef.scene.worldmodel->brush.num_leafs;leafnum++)
+       for (leafnum = 0;leafnum < model->brush.num_leafs;leafnum++)
        {
                if (r_refdef.viewcache.world_leafvisible[leafnum])
                {
                        //for (portalnum = 0, portal = model->brush.data_portals;portalnum < model->brush.num_portals;portalnum++, portal++)
-                       for (portal = r_refdef.scene.worldmodel->brush.data_leafs[leafnum].portals;portal;portal = portal->next)
+                       for (portal = model->brush.data_leafs[leafnum].portals;portal;portal = portal->next)
                        {
                                if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
-                               if (!R_CullBox(portal->mins, portal->maxs))
+                               if (!R_CullFrustum(portal->mins, portal->maxs))
                                {
                                        VectorClear(center);
                                        for (i = 0;i < portal->numpoints;i++)
@@ -403,48 +411,55 @@ void R_DrawPortals(void)
 static void R_View_WorldVisibility_CullSurfaces(void)
 {
        int surfaceindex;
-       int surfaceindexstart;
-       int surfaceindexend;
        unsigned char *surfacevisible;
        msurface_t *surfaces;
-       dp_model_t *model = r_refdef.scene.worldmodel;
+       model_t *model = r_refdef.scene.worldmodel;
        if (!model)
                return;
        if (r_trippy.integer)
                return;
        if (r_usesurfaceculling.integer < 1)
                return;
-       surfaceindexstart = model->firstmodelsurface;
-       surfaceindexend = surfaceindexstart + model->nummodelsurfaces;
        surfaces = model->data_surfaces;
        surfacevisible = r_refdef.viewcache.world_surfacevisible;
-       for (surfaceindex = surfaceindexstart;surfaceindex < surfaceindexend;surfaceindex++)
-               if (surfacevisible[surfaceindex] && R_CullBox(surfaces[surfaceindex].mins, surfaces[surfaceindex].maxs))
-                       surfacevisible[surfaceindex] = 0;
+       for (surfaceindex = model->submodelsurfaces_start; surfaceindex < model->submodelsurfaces_end; surfaceindex++)
+       {
+               if (surfacevisible[surfaceindex])
+               {
+                       if (R_CullFrustum(surfaces[surfaceindex].mins, surfaces[surfaceindex].maxs)
+                        || (r_vis_trace_surfaces.integer && !R_CanSeeBox(r_vis_trace_samples.integer, r_vis_trace_eyejitter.value, r_vis_trace_enlarge.value, r_vis_trace_expand.value, r_vis_trace_pad.value, r_refdef.view.origin, surfaces[surfaceindex].mins, surfaces[surfaceindex].maxs)))
+                               surfacevisible[surfaceindex] = 0;
+               }
+       }
 }
 
-void R_View_WorldVisibility(qboolean forcenovis)
+void R_View_WorldVisibility(qbool forcenovis)
 {
        int i, j, *mark;
        mleaf_t *leaf;
        mleaf_t *viewleaf;
-       dp_model_t *model = r_refdef.scene.worldmodel;
+       model_t *model = r_refdef.scene.worldmodel;
 
        if (!model)
                return;
 
-       if (r_refdef.view.usecustompvs)
-       {
-               // clear the visible surface and leaf flags arrays
-               memset(r_refdef.viewcache.world_surfacevisible, 0, model->num_surfaces);
+       if (r_lockvisibility.integer)
+               return;
+
+       // clear the visible surface and leaf flags arrays
+       memset(r_refdef.viewcache.world_surfacevisible, 0, model->num_surfaces);
+       if(!r_lockpvs.integer)
                memset(r_refdef.viewcache.world_leafvisible, 0, model->brush.num_leafs);
-               r_refdef.viewcache.world_novis = false;
 
+       r_refdef.viewcache.world_novis = false;
+
+       if (r_refdef.view.usecustompvs)
+       {
                // simply cull each marked leaf to the frustum (view pyramid)
                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_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs))
+                       if (CHECKPVSBIT(r_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullFrustum(leaf->mins, leaf->maxs))
                        {
                                r_refdef.stats[r_stat_world_leafs]++;
                                r_refdef.viewcache.world_leafvisible[j] = true;
@@ -453,27 +468,18 @@ void R_View_WorldVisibility(qboolean forcenovis)
                                                r_refdef.viewcache.world_surfacevisible[*mark] = true;
                        }
                }
-               R_View_WorldVisibility_CullSurfaces();
-               return;
        }
-
-       // if possible find the leaf the view origin is in
-       viewleaf = model->brush.PointInLeaf ? model->brush.PointInLeaf(model, r_refdef.view.origin) : NULL;
-       // if possible fetch the visible cluster bits
-       if (!r_lockpvs.integer && model->brush.FatPVS)
-               model->brush.FatPVS(model, r_refdef.view.origin, 2, r_refdef.viewcache.world_pvsbits, (r_refdef.viewcache.world_numclusters+7)>>3, false);
-
-       if (!r_lockvisibility.integer)
+       else
        {
-               // clear the visible surface and leaf flags arrays
-               memset(r_refdef.viewcache.world_surfacevisible, 0, model->num_surfaces);
-               memset(r_refdef.viewcache.world_leafvisible, 0, model->brush.num_leafs);
-
-               r_refdef.viewcache.world_novis = false;
+               // if possible find the leaf the view origin is in
+               viewleaf = model->brush.PointInLeaf ? model->brush.PointInLeaf(model, r_refdef.view.origin) : NULL;
+               // if possible fetch the visible cluster bits
+               if (!r_lockpvs.integer && model->brush.FatPVS)
+                       model->brush.FatPVS(model, r_refdef.view.origin, 2, r_refdef.viewcache.world_pvsbits, (r_refdef.viewcache.world_numclusters+7)>>3, 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 || forcenovis || r_trippy.integer)
+               if (!viewleaf || viewleaf->clusterindex < 0 || forcenovis || !r_refdef.view.usevieworiginculling)
                {
                        // no visibility method: (used when floating around in the void)
                        // simply cull each leaf to the frustum (view pyramid)
@@ -484,7 +490,7 @@ void R_View_WorldVisibility(qboolean forcenovis)
                                if (leaf->clusterindex < 0)
                                        continue;
                                // if leaf is in current pvs and on the screen, mark its surfaces
-                               if (!R_CullBox(leaf->mins, leaf->maxs))
+                               if (!R_CullFrustum(leaf->mins, leaf->maxs))
                                {
                                        r_refdef.stats[r_stat_world_leafs]++;
                                        r_refdef.viewcache.world_leafvisible[j] = true;
@@ -507,7 +513,7 @@ void R_View_WorldVisibility(qboolean forcenovis)
                                if (leaf->clusterindex < 0)
                                        continue;
                                // if leaf is in current pvs and on the screen, mark its surfaces
-                               if (CHECKPVSBIT(r_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullBox(leaf->mins, leaf->maxs))
+                               if (CHECKPVSBIT(r_refdef.viewcache.world_pvsbits, leaf->clusterindex) && !R_CullFrustum(leaf->mins, leaf->maxs))
                                {
                                        r_refdef.stats[r_stat_world_leafs]++;
                                        r_refdef.viewcache.world_leafvisible[j] = true;
@@ -566,8 +572,15 @@ void R_View_WorldVisibility(qboolean forcenovis)
                                        cullmaxs[0] = p->maxs[0] + cullbias;
                                        cullmaxs[1] = p->maxs[1] + cullbias;
                                        cullmaxs[2] = p->maxs[2] + cullbias;
-                                       if (R_CullBox(cullmins, cullmaxs))
+                                       if (R_CullFrustum(cullmins, cullmaxs))
                                                continue;
+                                       if (r_vis_trace.integer)
+                                       {
+                                               if (p->tracetime != host.realtime && R_CanSeeBox(r_vis_trace_samples.value, r_vis_trace_eyejitter.value, r_vis_trace_enlarge.value, r_vis_trace_expand.value, r_vis_trace_pad.value, r_refdef.view.origin, cullmins, cullmaxs))
+                                                       p->tracetime = host.realtime;
+                                               if (host.realtime - p->tracetime > r_vis_trace_delay.value)
+                                                       continue;
+                                       }
                                        if (leafstackpos >= (int)(sizeof(leafstack) / sizeof(leafstack[0])))
                                                break;
                                        leafstack[leafstackpos++] = p->past;
@@ -576,31 +589,26 @@ void R_View_WorldVisibility(qboolean forcenovis)
                }
        }
 
-        R_View_WorldVisibility_CullSurfaces();
+       // Cull the rest
+       R_View_WorldVisibility_CullSurfaces();
 }
 
-void R_Q1BSP_DrawSky(entity_render_t *ent)
+void R_Mod_DrawSky(entity_render_t *ent)
 {
        if (ent->model == NULL)
                return;
-       if (ent == r_refdef.scene.worldentity)
-               R_DrawWorldSurfaces(true, true, false, false, false);
-       else
-               R_DrawModelSurfaces(ent, true, true, false, false, false);
+       R_DrawModelSurfaces(ent, true, true, false, false, false, false);
 }
 
-void R_Q1BSP_DrawAddWaterPlanes(entity_render_t *ent)
+void R_Mod_DrawAddWaterPlanes(entity_render_t *ent)
 {
-       int i, j, n, flagsmask;
-       dp_model_t *model = ent->model;
+       int i, n, flagsmask;
+       model_t *model = ent->model;
        msurface_t *surfaces;
        if (model == NULL)
                return;
 
-       if (ent == r_refdef.scene.worldentity)
-               RSurf_ActiveWorldEntity();
-       else
-               RSurf_ActiveModelEntity(ent, true, false, false);
+       RSurf_ActiveModelEntity(ent, true, false, false);
 
        surfaces = model->data_surfaces;
        flagsmask = MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA;
@@ -608,13 +616,10 @@ void R_Q1BSP_DrawAddWaterPlanes(entity_render_t *ent)
        // add visible surfaces to draw list
        if (ent == r_refdef.scene.worldentity)
        {
-               for (i = 0;i < model->nummodelsurfaces;i++)
-               {
-                       j = model->sortedmodelsurfaces[i];
-                       if (r_refdef.viewcache.world_surfacevisible[j])
-                               if (surfaces[j].texture->basematerialflags & flagsmask)
-                                       R_Water_AddWaterPlane(surfaces + j, 0);
-               }
+               for (i = model->submodelsurfaces_start;i < model->submodelsurfaces_end;i++)
+                       if (r_refdef.viewcache.world_surfacevisible[i])
+                               if (surfaces[i].texture->basematerialflags & flagsmask)
+                                       R_Water_AddWaterPlane(surfaces + i, 0);
        }
        else
        {
@@ -622,30 +627,24 @@ void R_Q1BSP_DrawAddWaterPlanes(entity_render_t *ent)
                        n = ent->entitynumber;
                else
                        n = 0;
-               for (i = 0;i < model->nummodelsurfaces;i++)
-               {
-                       j = model->sortedmodelsurfaces[i];
-                       if (surfaces[j].texture->basematerialflags & flagsmask)
-                               R_Water_AddWaterPlane(surfaces + j, n);
-               }
+               for (i = model->submodelsurfaces_start;i < model->submodelsurfaces_end;i++)
+                       if (surfaces[i].texture->basematerialflags & flagsmask)
+                               R_Water_AddWaterPlane(surfaces + i, n);
        }
-       rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveWorldEntity/RSurf_ActiveModelEntity
+       rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveModelEntity
 }
 
-void R_Q1BSP_Draw(entity_render_t *ent)
+void R_Mod_Draw(entity_render_t *ent)
 {
-       dp_model_t *model = ent->model;
+       model_t *model = ent->model;
        if (model == NULL)
                return;
-       if (ent == r_refdef.scene.worldentity)
-               R_DrawWorldSurfaces(false, true, false, false, false);
-       else
-               R_DrawModelSurfaces(ent, false, true, false, false, false);
+       R_DrawModelSurfaces(ent, false, true, false, false, false, false);
 }
 
-void R_Q1BSP_DrawDepth(entity_render_t *ent)
+void R_Mod_DrawDepth(entity_render_t *ent)
 {
-       dp_model_t *model = ent->model;
+       model_t *model = ent->model;
        if (model == NULL || model->surfmesh.isanimated)
                return;
        GL_ColorMask(0,0,0,0);
@@ -654,37 +653,28 @@ void R_Q1BSP_DrawDepth(entity_render_t *ent)
        GL_BlendFunc(GL_ONE, GL_ZERO);
        GL_DepthMask(true);
 //     R_Mesh_ResetTextureState();
-       if (ent == r_refdef.scene.worldentity)
-               R_DrawWorldSurfaces(false, false, true, false, false);
-       else
-               R_DrawModelSurfaces(ent, false, false, true, false, false);
+       R_DrawModelSurfaces(ent, false, false, true, false, false, false);
        GL_ColorMask(r_refdef.view.colormask[0], r_refdef.view.colormask[1], r_refdef.view.colormask[2], 1);
 }
 
-void R_Q1BSP_DrawDebug(entity_render_t *ent)
+void R_Mod_DrawDebug(entity_render_t *ent)
 {
        if (ent->model == NULL)
                return;
-       if (ent == r_refdef.scene.worldentity)
-               R_DrawWorldSurfaces(false, false, false, true, false);
-       else
-               R_DrawModelSurfaces(ent, false, false, false, true, false);
+       R_DrawModelSurfaces(ent, false, false, false, true, false, false);
 }
 
-void R_Q1BSP_DrawPrepass(entity_render_t *ent)
+void R_Mod_DrawPrepass(entity_render_t *ent)
 {
-       dp_model_t *model = ent->model;
+       model_t *model = ent->model;
        if (model == NULL)
                return;
-       if (ent == r_refdef.scene.worldentity)
-               R_DrawWorldSurfaces(false, true, false, false, true);
-       else
-               R_DrawModelSurfaces(ent, false, true, false, false, true);
+       R_DrawModelSurfaces(ent, false, true, false, false, true, false);
 }
 
 typedef struct r_q1bsp_getlightinfo_s
 {
-       dp_model_t *model;
+       model_t *model;
        vec3_t relativelightorigin;
        float lightradius;
        int *outleaflist;
@@ -702,10 +692,10 @@ typedef struct r_q1bsp_getlightinfo_s
        vec3_t lightmins;
        vec3_t lightmaxs;
        const unsigned char *pvs;
-       qboolean svbsp_active;
-       qboolean svbsp_insertoccluder;
-       qboolean noocclusion; // avoids PVS culling
-       qboolean frontsidecasting; // casts shadows from surfaces facing the light (otherwise ones facing away)
+       qbool svbsp_active;
+       qbool svbsp_insertoccluder;
+       qbool noocclusion; // avoids PVS culling
+       qbool frontsidecasting; // casts shadows from surfaces facing the light (otherwise ones facing away)
        int numfrustumplanes;
        const mplane_t *frustumplanes;
 }
@@ -713,7 +703,7 @@ r_q1bsp_getlightinfo_t;
 
 #define GETLIGHTINFO_MAXNODESTACK 4096
 
-static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboolean skipsurfaces)
+static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qbool skipsurfaces)
 {
        // nodestack
        mnode_t *nodestack[GETLIGHTINFO_MAXNODESTACK];
@@ -731,17 +721,17 @@ static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboo
        int surfaceindex;
        int triangleindex, t;
        int currentmaterialflags;
-       qboolean castshadow;
+       qbool castshadow;
        const int *e;
        const vec_t *v[3];
        float v2[3][3];
-       qboolean insidebox;
-       qboolean noocclusion = info->noocclusion;
-       qboolean frontsidecasting = info->frontsidecasting;
-       qboolean svbspactive = info->svbsp_active;
-       qboolean svbspinsertoccluder = info->svbsp_insertoccluder;
+       qbool insidebox;
+       qbool noocclusion = info->noocclusion;
+       qbool frontsidecasting = info->frontsidecasting;
+       qbool svbspactive = info->svbsp_active;
+       qbool svbspinsertoccluder = info->svbsp_insertoccluder;
        const int *leafsurfaceindices;
-       qboolean addedtris;
+       qbool addedtris;
        int i;
        mportal_t *portal;
        static float points[128][3];
@@ -762,7 +752,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboo
                                continue;
 #endif
 #if 0
-                       if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes))
+                       if (!r_shadow_compilingrtlight && R_CullBox(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes))
                                continue;
 #endif
                        // axial planes can be processed much more quickly
@@ -835,7 +825,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboo
                                continue;
 #endif
 #if 1
-                       if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes))
+                       if (!r_shadow_compilingrtlight && R_CullBox(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes))
                                continue;
 #endif
 
@@ -897,11 +887,11 @@ static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboo
                                        if (!castshadow)
                                                continue;
                                        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)
+                                       for (triangleindex = 0, t = surface->num_firsttriangle, e = info->model->surfmesh.data_element3i + t * 3;triangleindex < surface->num_triangles;triangleindex++, t++, e += 3)
                                        {
-                                               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;
+                                               v[0] = info->model->surfmesh.data_vertex3f + e[0] * 3;
+                                               v[1] = info->model->surfmesh.data_vertex3f + e[1] * 3;
+                                               v[2] = info->model->surfmesh.data_vertex3f + e[2] * 3;
                                                VectorCopy(v[0], v2[0]);
                                                VectorCopy(v[1], v2[1]);
                                                VectorCopy(v[2], v2[2]);
@@ -915,21 +905,23 @@ static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboo
                                for (leafsurfaceindex = 0;leafsurfaceindex < numleafsurfaces;leafsurfaceindex++)
                                {
                                        surfaceindex = leafsurfaceindices[leafsurfaceindex];
+                                       surface = surfaces + surfaceindex;
+                                       if(!surface->texture)
+                                               continue;       
                                        if (CHECKPVSBIT(info->outsurfacepvs, surfaceindex))
                                                continue;
                                        SETPVSBIT(info->outsurfacepvs, surfaceindex);
-                                       surface = surfaces + surfaceindex;
                                        if (!BoxesOverlap(info->lightmins, info->lightmaxs, surface->mins, surface->maxs))
                                                continue;
                                        addedtris = false;
                                        currentmaterialflags = R_GetCurrentTexture(surface->texture)->currentmaterialflags;
                                        castshadow = !(currentmaterialflags & MATERIALFLAG_NOSHADOW);
                                        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)
+                                       for (triangleindex = 0, t = surface->num_firsttriangle, e = info->model->surfmesh.data_element3i + t * 3;triangleindex < surface->num_triangles;triangleindex++, t++, e += 3)
                                        {
-                                               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;
+                                               v[0] = info->model->surfmesh.data_vertex3f + e[0] * 3;
+                                               v[1] = info->model->surfmesh.data_vertex3f + e[1] * 3;
+                                               v[2] = info->model->surfmesh.data_vertex3f + e[2] * 3;
                                                VectorCopy(v[0], v2[0]);
                                                VectorCopy(v[1], v2[1]);
                                                VectorCopy(v[2], v2[2]);
@@ -985,9 +977,9 @@ static void R_Q1BSP_RecursiveGetLightInfo_BIH(r_q1bsp_getlightinfo_t *info, cons
        int t;
        int nodeleafindex;
        int currentmaterialflags;
-       qboolean castshadow;
-       qboolean noocclusion = info->noocclusion;
-       qboolean frontsidecasting = info->frontsidecasting;
+       qbool castshadow;
+       qbool noocclusion = info->noocclusion;
+       qbool frontsidecasting = info->frontsidecasting;
        msurface_t *surface;
        const int *e;
        const vec_t *v[3];
@@ -1017,18 +1009,18 @@ static void R_Q1BSP_RecursiveGetLightInfo_BIH(r_q1bsp_getlightinfo_t *info, cons
                                        continue;
 #endif
 #if 1
-                               if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes))
+                               if (!r_shadow_compilingrtlight && R_CullBox(leaf->mins, leaf->maxs, info->numfrustumplanes, info->frustumplanes))
                                        continue;
 #endif
                                surfaceindex = leaf->surfaceindex;
                                surface = info->model->data_surfaces + surfaceindex;
                                currentmaterialflags = R_GetCurrentTexture(surface->texture)->currentmaterialflags;
                                castshadow = !(currentmaterialflags & MATERIALFLAG_NOSHADOW);
-                               t = leaf->itemindex + surface->num_firstshadowmeshtriangle - surface->num_firsttriangle;
-                               e = info->model->brush.shadowmesh->element3i + t * 3;
-                               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;
+                               t = leaf->itemindex;
+                               e = info->model->surfmesh.data_element3i + t * 3;
+                               v[0] = info->model->surfmesh.data_vertex3f + e[0] * 3;
+                               v[1] = info->model->surfmesh.data_vertex3f + e[1] * 3;
+                               v[2] = info->model->surfmesh.data_vertex3f + e[2] * 3;
                                VectorCopy(v[0], v2[0]);
                                VectorCopy(v[1], v2[1]);
                                VectorCopy(v[2], v2[2]);
@@ -1084,7 +1076,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BIH(r_q1bsp_getlightinfo_t *info, cons
                                continue;
 #endif
 #if 0
-                       if (!r_shadow_compilingrtlight && R_CullBoxCustomPlanes(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes))
+                       if (!r_shadow_compilingrtlight && R_CullBox(node->mins, node->maxs, rtlight->cached_numfrustumplanes, rtlight->cached_frustumplanes))
                                continue;
 #endif
                        if (info->lightmins[axis] <= node->backmax)
@@ -1105,7 +1097,7 @@ static void R_Q1BSP_RecursiveGetLightInfo_BIH(r_q1bsp_getlightinfo_t *info, cons
        }
 }
 
-static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qboolean use_svbsp)
+static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qbool use_svbsp)
 {
        extern cvar_t r_shadow_usebihculling;
        if (use_svbsp)
@@ -1138,11 +1130,8 @@ static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qboo
                info->outnumleafs = 0;
                info->outnumsurfaces = 0;
                memset(info->outleafpvs, 0, (info->model->brush.num_leafs + 7) >> 3);
-               memset(info->outsurfacepvs, 0, (info->model->nummodelsurfaces + 7) >> 3);
-               if (info->model->brush.shadowmesh)
-                       memset(info->outshadowtrispvs, 0, (info->model->brush.shadowmesh->numtriangles + 7) >> 3);
-               else
-                       memset(info->outshadowtrispvs, 0, (info->model->surfmesh.num_triangles + 7) >> 3);
+               memset(info->outsurfacepvs, 0, (info->model->num_surfaces + 7) >> 3);
+               memset(info->outshadowtrispvs, 0, (info->model->surfmesh.num_triangles + 7) >> 3);
                memset(info->outlighttrispvs, 0, (info->model->surfmesh.num_triangles + 7) >> 3);
        }
        else
@@ -1210,7 +1199,7 @@ static int R_Q1BSP_GetLightInfo_comparefunc(const void *ap, const void *bp)
 
 extern cvar_t r_shadow_sortsurfaces;
 
-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, unsigned char *visitingleafpvs, int numfrustumplanes, const mplane_t *frustumplanes, qboolean noocclusion)
+void R_Mod_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, unsigned char *visitingleafpvs, int numfrustumplanes, const mplane_t *frustumplanes, qbool noocclusion)
 {
        r_q1bsp_getlightinfo_t info;
        info.frontsidecasting = r_shadow_frontsidecasting.integer != 0;
@@ -1247,17 +1236,14 @@ void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa
        VectorCopy(info.relativelightorigin, info.outmaxs);
        memset(visitingleafpvs, 0, (info.model->brush.num_leafs + 7) >> 3);
        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(outsurfacepvs, 0, (info.model->num_surfaces + 7) >> 3);
+       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 && !info.noocclusion)
                info.pvs = info.model->brush.GetPVS(info.model, info.relativelightorigin);
        else
                info.pvs = NULL;
-       RSurf_ActiveWorldEntity();
+       RSurf_ActiveModelEntity(r_refdef.scene.worldentity, false, false, false);
 
        if (!info.noocclusion && r_shadow_compilingrtlight && r_shadow_realtime_world_compileportalculling.integer && info.model->brush.data_portals)
        {
@@ -1278,7 +1264,7 @@ void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa
                R_Q1BSP_CallRecursiveGetLightInfo(&info, !info.noocclusion && (r_shadow_compilingrtlight ? r_shadow_realtime_world_compilesvbsp.integer : r_shadow_realtime_dlight_svbspculling.integer) != 0);
        }
 
-       rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveWorldEntity/RSurf_ActiveModelEntity
+       rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveModelEntity
 
        // limit combined leaf box to light boundaries
        outmins[0] = max(info.outmins[0] - 1, info.lightmins[0]);
@@ -1297,98 +1283,27 @@ void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, floa
                qsort(info.outsurfacelist, info.outnumsurfaces, sizeof(*info.outsurfacelist), R_Q1BSP_GetLightInfo_comparefunc);
 }
 
-void R_Q1BSP_CompileShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
+void R_Mod_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
 {
-       dp_model_t *model = ent->model;
-       msurface_t *surface;
-       int surfacelistindex;
-       float projectdistance = relativelightdirection ? lightradius : lightradius + model->radius*2 + r_shadow_projectdistance.value;
-       // if triangle neighbors are disabled, shadowvolumes are disabled
-       if (!model->brush.shadowmesh->neighbor3i)
-               return;
-       r_shadow_compilingrtlight->static_meshchain_shadow_zfail = 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++)
-       {
-               surface = model->data_surfaces + surfacelist[surfacelistindex];
-               if (surface->texture->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, ent->mins, ent->maxs);
-       r_shadow_compilingrtlight->static_meshchain_shadow_zfail = Mod_ShadowMesh_Finish(r_main_mempool, r_shadow_compilingrtlight->static_meshchain_shadow_zfail, false, false, true);
-}
-
-extern cvar_t r_polygonoffset_submodel_factor;
-extern cvar_t r_polygonoffset_submodel_offset;
-void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const vec3_t lightmins, const vec3_t lightmaxs)
-{
-       dp_model_t *model = ent->model;
-       const 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;
-       R_FrameData_SetMark();
-       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 triangle neighbors are disabled, shadowvolumes are disabled
-               if (!model->brush.shadowmesh->neighbor3i)
-                       return;
-               R_Shadow_PrepareShadowMark(model->brush.shadowmesh->numtriangles);
-               for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
-               {
-                       surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
-                       if (R_GetCurrentTexture(surface->texture)->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, ent->mins, ent->maxs);
-       }
-       else
-       {
-               // if triangle neighbors are disabled, shadowvolumes are disabled
-               if (!model->surfmesh.data_neighbor3i)
-                       return;
-               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++)
-               {
-                       surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
-                       rsurface.texture = R_GetCurrentTexture(surface->texture);
-                       if (rsurface.texture->currentmaterialflags & MATERIALFLAG_NOSHADOW)
-                               continue;
-                       R_Shadow_MarkVolumeFromBox(surface->num_firsttriangle, surface->num_triangles, rsurface.modelvertex3f, rsurface.modelelement3i, relativelightorigin, relativelightdirection, lightmins, lightmaxs, surface->mins, surface->maxs);
-               }
-               R_Shadow_VolumeFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, rsurface.modelvertex3f, model->surfmesh.data_element3i, model->surfmesh.data_neighbor3i, relativelightorigin, relativelightdirection, projectdistance, numshadowmark, shadowmarklist, ent->mins, ent->maxs);
-       }
-       if (ent->model->brush.submodel)
-               GL_PolygonOffset(r_refdef.shadowpolygonfactor, r_refdef.shadowpolygonoffset);
-       R_FrameData_ReturnToMark();
-}
-
-void R_Q1BSP_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
-{
-       dp_model_t *model = ent->model;
+       model_t *model = ent->model;
        msurface_t *surface;
        int surfacelistindex;
        int sidetotals[6] = { 0, 0, 0, 0, 0, 0 }, sidemasks = 0;
        int i;
-       if (!model->brush.shadowmesh)
-               return;
-       r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Begin(r_main_mempool, 32768, 32768, NULL, NULL, NULL, false, false, true);
-       R_Shadow_PrepareShadowSides(model->brush.shadowmesh->numtriangles);
+       // FIXME: the sidetotals code incorrectly assumes that static_meshchain is
+       // a single mesh - to prevent that from crashing (sideoffsets, sidetotals
+       // exceeding the number of triangles in a single mesh) we have to make sure
+       // that we make only a single mesh - so over-estimate the size of the mesh
+       // to match the model.
+       r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Begin(r_main_mempool, model->surfmesh.num_vertices, model->surfmesh.num_triangles);
+       R_Shadow_PrepareShadowSides(model->surfmesh.num_triangles);
        for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
        {
                surface = model->data_surfaces + surfacelist[surfacelistindex];
-               sidemasks |= R_Shadow_ChooseSidesFromBox(surface->num_firstshadowmeshtriangle, surface->num_triangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, &r_shadow_compilingrtlight->matrix_worldtolight, relativelightorigin, relativelightdirection, r_shadow_compilingrtlight->cullmins, r_shadow_compilingrtlight->cullmaxs, surface->mins, surface->maxs, surface->texture->basematerialflags & MATERIALFLAG_NOSHADOW ? NULL : sidetotals);
+               sidemasks |= R_Shadow_ChooseSidesFromBox(surface->num_firsttriangle, surface->num_triangles, model->surfmesh.data_vertex3f, model->surfmesh.data_element3i, &r_shadow_compilingrtlight->matrix_worldtolight, relativelightorigin, relativelightdirection, r_shadow_compilingrtlight->cullmins, r_shadow_compilingrtlight->cullmaxs, surface->mins, surface->maxs, surface->texture->basematerialflags & MATERIALFLAG_NOSHADOW ? NULL : sidetotals);
        }
-       R_Shadow_ShadowMapFromList(model->brush.shadowmesh->numverts, model->brush.shadowmesh->numtriangles, model->brush.shadowmesh->vertex3f, model->brush.shadowmesh->element3i, numshadowsides, sidetotals, shadowsides, shadowsideslist);
-       r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Finish(r_main_mempool, r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap, false, false, true);
+       R_Shadow_ShadowMapFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, model->surfmesh.data_vertex3f, model->surfmesh.data_element3i, numshadowsides, sidetotals, shadowsides, shadowsideslist);
+       r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Finish(r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap, true);
        r_shadow_compilingrtlight->static_shadowmap_receivers &= sidemasks;
        for(i = 0;i<6;i++)
                if(!sidetotals[i])
@@ -1399,9 +1314,9 @@ void R_Q1BSP_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin,
 
 static const msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES];
 
-void R_Q1BSP_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const unsigned char *surfacesides, const vec3_t lightmins, const vec3_t lightmaxs)
+void R_Mod_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const unsigned char *surfacesides, const vec3_t lightmins, const vec3_t lightmaxs)
 {
-       dp_model_t *model = ent->model;
+       model_t *model = ent->model;
        const msurface_t *surface;
        int modelsurfacelistindex, batchnumsurfaces;
        // check the box in modelspace, it was already checked in worldspace
@@ -1412,7 +1327,7 @@ void R_Q1BSP_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relative
        for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
        {
                surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
-               if (surfacesides && !(surfacesides[modelsurfacelistindex] && (1 << side)))
+               if (surfacesides && !(surfacesides[modelsurfacelistindex] & (1 << side)))
                        continue;
                rsurface.texture = R_GetCurrentTexture(surface->texture);
                if (rsurface.texture->currentmaterialflags & MATERIALFLAG_NOSHADOW)
@@ -1456,7 +1371,7 @@ static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, co
        // note: in practice this never actually receives batches
        R_Shadow_RenderMode_Begin();
        R_Shadow_RenderMode_ActiveLight(rtlight);
-       R_Shadow_RenderMode_Lighting(false, true, rtlight->shadowmapatlassidesize != 0, (ent->flags & RENDER_NOSELFSHADOW) != 0);
+       R_Shadow_RenderMode_Lighting(true, rtlight->shadowmapatlassidesize != 0, (ent->flags & RENDER_NOSELFSHADOW) != 0);
        R_Shadow_SetupEntityLight(ent);
        for (i = 0;i < numsurfaces;i = j)
        {
@@ -1477,10 +1392,10 @@ static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, co
        R_FrameData_ReturnToMark();
 }
 
-extern qboolean r_shadow_usingdeferredprepass;
-void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *lighttrispvs)
+extern qbool r_shadow_usingdeferredprepass;
+void R_Mod_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *lighttrispvs)
 {
-       dp_model_t *model = ent->model;
+       model_t *model = ent->model;
        const msurface_t *surface;
        int i, k, kend, l, endsurface, batchnumsurfaces, texturenumsurfaces;
        const msurface_t **texturesurfacelist;
@@ -1518,7 +1433,7 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
                                ;
                        // now figure out what to do with this particular range of surfaces
                        // VorteX: added MATERIALFLAG_NORTLIGHT
-                       if ((rsurface.texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NORTLIGHT)) != MATERIALFLAG_WALL)
+                       if ((rsurface.texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_NORTLIGHT)) != MATERIALFLAG_WALL)
                                continue;
                        if (r_fb.water.renderingscene && (rsurface.texture->currentmaterialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA)))
                                continue;
@@ -1562,9 +1477,9 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
 }
 
 //Made by [515]
-static void R_ReplaceWorldTexture (void)
+static void R_ReplaceWorldTexture_f(cmd_state_t *cmd)
 {
-       dp_model_t              *m;
+       model_t         *m;
        texture_t       *t;
        int                     i;
        const char      *r, *newt;
@@ -1576,7 +1491,7 @@ static void R_ReplaceWorldTexture (void)
        }
        m = r_refdef.scene.worldmodel;
 
-       if(Cmd_Argc() < 2)
+       if(Cmd_Argc(cmd) < 2)
        {
                Con_Print("r_replacemaptexture <texname> <newtexname> - replaces texture\n");
                Con_Print("r_replacemaptexture <texname> - switch back to default texture\n");
@@ -1587,15 +1502,15 @@ static void R_ReplaceWorldTexture (void)
                Con_Print("This command works only in singleplayer\n");
                return;
        }
-       r = Cmd_Argv(1);
-       newt = Cmd_Argv(2);
+       r = Cmd_Argv(cmd, 1);
+       newt = Cmd_Argv(cmd, 2);
        if(!newt[0])
                newt = r;
        for(i=0,t=m->data_textures;i<m->num_textures;i++,t++)
        {
                if(/*t->width && !strcasecmp(t->name, r)*/ matchpattern( t->name, r, true ) )
                {
-                       if ((skinframe = R_SkinFrame_LoadExternal(newt, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PICMIP, true)))
+                       if ((skinframe = R_SkinFrame_LoadExternal(newt, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PICMIP, true, false)))
                        {
 //                             t->skinframes[0] = skinframe;
                                t->currentskinframe = skinframe;
@@ -1611,9 +1526,9 @@ static void R_ReplaceWorldTexture (void)
 }
 
 //Made by [515]
-static void R_ListWorldTextures (void)
+static void R_ListWorldTextures_f(cmd_state_t *cmd)
 {
-       dp_model_t              *m;
+       model_t         *m;
        texture_t       *t;
        int                     i;
        if (!r_refdef.scene.worldmodel)
@@ -1651,10 +1566,18 @@ void GL_Surf_Init(void)
        Cvar_RegisterVariable(&r_lockvisibility);
        Cvar_RegisterVariable(&r_useportalculling);
        Cvar_RegisterVariable(&r_usesurfaceculling);
+       Cvar_RegisterVariable(&r_vis_trace);
+       Cvar_RegisterVariable(&r_vis_trace_samples);
+       Cvar_RegisterVariable(&r_vis_trace_delay);
+       Cvar_RegisterVariable(&r_vis_trace_eyejitter);
+       Cvar_RegisterVariable(&r_vis_trace_enlarge);
+       Cvar_RegisterVariable(&r_vis_trace_expand);
+       Cvar_RegisterVariable(&r_vis_trace_pad);
+       Cvar_RegisterVariable(&r_vis_trace_surfaces);
        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");
+       Cmd_AddCommand(CF_CLIENT, "r_replacemaptexture", R_ReplaceWorldTexture_f, "override a map texture for testing purposes");
+       Cmd_AddCommand(CF_CLIENT, "r_listmaptextures", R_ListWorldTextures_f, "list all textures used by the current map");
 
        //R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
 }