From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 26 Feb 2011 01:57:02 +0000 (+0200)
Subject: Oops! Forgot the underwater blur code. Blur postprocessing will properly work now.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f684875593425909f1ba814ad9118ae173723e52;p=voretournament%2Fvoretournament.git

Oops! Forgot the underwater blur code. Blur postprocessing will properly work now.
---

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 41434050..866a6cbc 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1094,6 +1094,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/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 73a9f4da..b8f17b1c 100644
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -512,6 +512,22 @@ void CSQC_UpdateView(float w, float h)
 		
 		if(contentavgalpha)
 			drawfill('0 0 0', '1 0 0' * vid_conwidth + '0 1 0' * vid_conheight, liquidcolor_prev, contentavgalpha * liquidalpha_prev, DRAWFLAG_NORMAL);
+
+		if(cvar("hud_postprocessing"))
+		{
+			if(cvar("hud_contents_blur"))
+			{
+				content_blurpostprocess_x = 1;
+				content_blurpostprocess_y = contentavgalpha * cvar("hud_contents_blur");
+				content_blurpostprocess_z = contentavgalpha * cvar("hud_contents_blur_alpha");
+			}
+			else
+			{
+				content_blurpostprocess_x = 0;
+				content_blurpostprocess_y = 0;
+				content_blurpostprocess_z = 0;
+			}
+		}
 	}
 
 	if(cvar("hud_damage"))