From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 13 Oct 2010 17:22:56 +0000 (+0000)
Subject: r_water_scissormode: 0 = none, 1 = scissor only, 2 = cull only, 3 = both
X-Git-Tag: xonotic-v0.1.0preview~131
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=353384ab2cd5feaff10f87167fee1857986ce31e;p=xonotic%2Fdarkplaces.git

r_water_scissormode: 0 = none, 1 = scissor only, 2 = cull only, 3 = both

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10522 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=82673bcd65394c9a261c9396e14f15f384c1f9a2
---

diff --git a/gl_rmain.c b/gl_rmain.c
index bb6ae168..66602f20 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -149,7 +149,7 @@ cvar_t r_water_clippingplanebias = {CVAR_SAVE, "r_water_clippingplanebias", "1",
 cvar_t r_water_resolutionmultiplier = {CVAR_SAVE, "r_water_resolutionmultiplier", "0.5", "multiplier for screen resolution when rendering refracted/reflected scenes, 1 is full quality, lower values are faster"};
 cvar_t r_water_refractdistort = {CVAR_SAVE, "r_water_refractdistort", "0.01", "how much water refractions shimmer"};
 cvar_t r_water_reflectdistort = {CVAR_SAVE, "r_water_reflectdistort", "0.01", "how much water reflections shimmer"};
-cvar_t r_water_scissormode = {CVAR_SAVE, "r_water_scissormode", "2", "scissor (1) and cull (2) water renders"};
+cvar_t r_water_scissormode = {CVAR_SAVE, "r_water_scissormode", "3", "scissor (1) or cull (2) or both (3) water renders"};
 
 cvar_t r_lerpsprites = {CVAR_SAVE, "r_lerpsprites", "0", "enables animation smoothing on sprites"};
 cvar_t r_lerpmodels = {CVAR_SAVE, "r_lerpmodels", "1", "enables animation smoothing on models"};
@@ -7907,11 +7907,11 @@ static void R_Water_ProcessPlanes(void)
 
 			R_ResetViewRendering3D();
 			R_ClearScreen(r_refdef.fogenabled);
-			if(r_water_scissormode.integer >= 2)
+			if(r_water_scissormode.integer & 2)
 				R_View_UpdateWithScissor(myscissor);
 			else
 				R_View_Update();
-			if(r_water_scissormode.integer)
+			if(r_water_scissormode.integer & 1)
 				GL_Scissor(myscissor[0], myscissor[1], myscissor[2], myscissor[3]);
 			R_RenderScene();
 
@@ -7953,11 +7953,11 @@ static void R_Water_ProcessPlanes(void)
 
 			R_ResetViewRendering3D();
 			R_ClearScreen(r_refdef.fogenabled);
-			if(r_water_scissormode.integer >= 2)
+			if(r_water_scissormode.integer & 2)
 				R_View_UpdateWithScissor(myscissor);
 			else
 				R_View_Update();
-			if(r_water_scissormode.integer)
+			if(r_water_scissormode.integer & 1)
 				GL_Scissor(myscissor[0], myscissor[1], myscissor[2], myscissor[3]);
 			R_RenderScene();