From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 2 May 2010 12:33:58 +0000 (+0000)
Subject: uservec2.x is now the scene, .y the sobel strength, .z the threshold for sobel
X-Git-Tag: xonotic-v0.1.0preview~230^2~360
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ab94ccd8a97f2443c0fcd77053c230fe3591318;p=xonotic%2Fdarkplaces.git

uservec2.x is now the scene, .y the sobel strength, .z the threshold for sobel

From: Wolfgang (Blub) Bumiller <blub@speed.at>

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

diff --git a/gl_rmain.c b/gl_rmain.c
index dd00c8fe..1084bab1 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -730,8 +730,7 @@ static const char *builtinshaderstring =
 "	gl_FragColor += texture2D(Texture_First, TexCoord1 + PixelSize*UserVec1.x*vec2( 0.707107,  0.707107)) * UserVec1.y;\n"
 "	gl_FragColor += texture2D(Texture_First, TexCoord1 + PixelSize*UserVec1.x*vec2(-0.453990,  0.891007)) * UserVec1.y;\n"
 "	gl_FragColor /= (1.0 + 5.0 * UserVec1.y);\n"
-"	//gl_FragColor = mix(gl_FragColor, vec4(vec3(sobel), 1), UseSobel);\n"
-"	gl_FragColor.rgb = gl_FragColor.rgb * UserVec2.y + vec3(sobel)*UserVec2.x;\n"
+"	gl_FragColor.rgb = gl_FragColor.rgb * UserVec2.x + vec3(max(0, sobel - UserVec2.z))*UserVec2.y;\n"
 "#endif\n"
 "\n"
 "#ifdef USESATURATION\n"