changed cl_stainmaps to be a loadtime cvar which decides whether to

[xonotic/darkplaces.git] / gl_rsurf.c

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 14c2a187acbd6ae17e1091083941e98b03f62da2..23e6f3af66fd6440fe43ad3af964e67cb4c05de9 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 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_useportalculling = {0, "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_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"};
 
 /*
@@ -99,12 +99,25 @@ void R_BuildLightMap (const entity_render_t *ent, msurface_t *surface)
        // 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)
-       for (i = 0;i < size;i++, bl += 3, stain += 3, out += 4)
+       if (stain)
        {
-               l = (bl[0] * stain[0]) >> 16;out[2] = min(l, 255);
-               l = (bl[1] * stain[1]) >> 16;out[1] = min(l, 255);
-               l = (bl[2] * stain[2]) >> 16;out[0] = min(l, 255);
-               out[3] = 255;
+               for (i = 0;i < size;i++, bl += 3, stain += 3, out += 4)
+               {
+                       l = (bl[0] * stain[0]) >> 16;out[2] = min(l, 255);
+                       l = (bl[1] * stain[1]) >> 16;out[1] = min(l, 255);
+                       l = (bl[2] * stain[2]) >> 16;out[0] = min(l, 255);
+                       out[3] = 255;
+               }
+       }
+       else
+       {
+               for (i = 0;i < size;i++, bl += 3, out += 4)
+               {
+                       l = bl[0] >> 8;out[2] = min(l, 255);
+                       l = bl[1] >> 8;out[1] = min(l, 255);
+                       l = bl[2] >> 8;out[0] = min(l, 255);
+                       out[3] = 255;
+               }
        }
 
        R_UpdateTexture(surface->lightmaptexture, templight, surface->lightmapinfo->lightmaporigin[0], surface->lightmapinfo->lightmaporigin[1], smax, tmax);
@@ -450,9 +463,9 @@ void R_View_WorldVisibility(qboolean forcenovis)
                                }
                        }
                }
-               // 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)
+               // just check if each leaf in the PVS is on screen
+               // (unless portal culling is enabled)
+               else if (r_useportalculling.integer < 1 || (r_useportalculling.integer < 2 && !r_novis.integer))
                {
                        // pvs method:
                        // simply check if each leaf is in the Potentially Visible Set,
@@ -471,7 +484,7 @@ void R_View_WorldVisibility(qboolean forcenovis)
                                }
                        }
                }
-               // otherwise use a recursive portal flow, culling each portal to
+               // if desired use a recursive portal flow, culling each portal to
                // frustum and checking if the leaf the portal leads to is in the pvs
                else
                {