From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 26 Feb 2011 02:01:41 +0000 (+0200)
Subject: Add the water blur code too
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1803d5365e5877ca538d82cfd9598678227cf0a2;p=xonotic%2Fxonotic-data.pk3dir.git

Add the water blur code too
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 3ff6fe2b7..93754e195 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1454,6 +1454,8 @@ seta hud_postprocessing_maxbluralpha 0.5 "maximum alpha which the blur postproce
 seta hud_postprocessing_maxblurradius 10 "maximum radius which the blur postprocess can be"
 
 seta hud_contents 1 "an improved version of gl_polyblend for liquids such as water/lava/slime, draw a filler when inside the liquid"
+seta hud_contents_blur 10 "Use postprocessing to blur the screen when you are inside a liquid. Higher values = more blur"
+seta hud_contents_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance"
 seta hud_contents_factor 1 "factor at which to multiply the current faded value."
 seta hud_contents_fadeintime 0.02 "factor of time it takes for the alpha level to reach normal value when entering the liquid"
 seta hud_contents_fadeouttime 0.1 "factor of time it takes for the alpha level to reach normal value when leaving the liquid"
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index de8be6af8..4886c571e 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -726,6 +726,22 @@ void CSQC_UpdateView(float w, float h)
 		
 		if(contentavgalpha)
 			drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);
+
+		if(autocvar_hud_postprocessing)
+		{
+			if(autocvar_hud_contents_blur)
+			{
+				content_blurpostprocess_x = 1;
+				content_blurpostprocess_y = contentavgalpha * autocvar_hud_contents_blur;
+				content_blurpostprocess_z = contentavgalpha * autocvar_hud_contents_blur_alpha;
+			}
+			else
+			{
+				content_blurpostprocess_x = 0;
+				content_blurpostprocess_y = 0;
+				content_blurpostprocess_z = 0;
+			}
+		}
 	}
 	
 	if(autocvar_hud_damage)
diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index cb28f2186..008b1c59e 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -149,6 +149,8 @@ float autocvar_hud_configure_grid_xsize;
 float autocvar_hud_configure_grid_ysize;
 float autocvar_hud_configure_teamcolorforced;
 float autocvar_hud_contents;
+float autocvar_hud_contents_blur;
+float autocvar_hud_contents_blur_alpha;
 float autocvar_hud_contents_factor;
 float autocvar_hud_contents_fadeintime;
 float autocvar_hud_contents_fadeouttime;