From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 11 Oct 2009 10:00:47 +0000 (+0000)
Subject: increase the accuracy of r_bloom_brighten a bit (or make high values work at all)
X-Git-Tag: xonotic-v0.1.0preview~1305
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7ebc633e565d1767312dab70793948b9c4efd75;p=xonotic%2Fdarkplaces.git

increase the accuracy of r_bloom_brighten a bit (or make high values work at all)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9329 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 993ac166..9d3026b3 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4073,8 +4073,9 @@ void R_Bloom_MakeTexture(void)
 	brighten = r_bloom_brighten.value;
 	if (r_hdr.integer)
 		brighten *= r_hdr_range.value;
+	brighten = sqrt(brighten);
 	if(range >= 1)
-		brighten *= pow((3 * range) / (2 * range - 1), 2); // compensate for the "dot particle"
+		brighten *= (3 * range) / (2 * range - 1); // compensate for the "dot particle"
 	R_Mesh_TexBind(0, R_GetTexture(r_bloomstate.texture_bloom));
 	R_Mesh_TexCoordPointer(0, 2, r_bloomstate.offsettexcoord2f, 0, 0);
 
@@ -4103,8 +4104,8 @@ void R_Bloom_MakeTexture(void)
 			// black at the edges
 			// (probably not realistic but looks good enough)
 			//r = ((range*range+1)/((float)(x*x+1)))/(range*2+1);
-			//r = (dir ? 1.0f : brighten)/(range*2+1);
-			r = (dir ? 1.0f : brighten) / (range * 2 + 1);
+			//r = brighten/(range*2+1);
+			r = brighten / (range * 2 + 1);
 			if(range >= 1)
 				r *= (1 - x*x/(float)(range*range));
 			GL_Color(r, r, r, 1);