Stealth will not make the world fully grey, itwill only tarnish the colors a bit

git-svn-id: http://svn.net-core.org/repos/t-engine4@2935 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Player.lua

@@ -239,13 +239,13 @@ function _M:updateMainShader()
 		end
 
 		-- Colorize shader
-		if self:attr("stealth") then game.fbo_shader:setUniform("colorize", {0.9,0.9,0.9})
-		elseif self:attr("invisible") then game.fbo_shader:setUniform("colorize", {0.4,0.5,0.7})
-		elseif self:attr("unstoppable") then game.fbo_shader:setUniform("colorize", {1,0.2,0})
-		elseif self:attr("lightning_speed") then game.fbo_shader:setUniform("colorize", {0.2,0.3,1})
-		elseif game.level and game.level.data.is_eidolon_plane then game.fbo_shader:setUniform("colorize", {1,1,1})
+		if self:attr("stealth") then game.fbo_shader:setUniform("colorize", {0.9,0.9,0.9,0.6})
+		elseif self:attr("invisible") then game.fbo_shader:setUniform("colorize", {0.2,0.3,0.6,1})
+		elseif self:attr("unstoppable") then game.fbo_shader:setUniform("colorize", {1,0.2,0,1})
+		elseif self:attr("lightning_speed") then game.fbo_shader:setUniform("colorize", {0.2,0.3,1,1})
+		elseif game.level and game.level.data.is_eidolon_plane then game.fbo_shader:setUniform("colorize", {1,1,1,1})
 --		elseif game:hasDialogUp() then game.fbo_shader:setUniform("colorize", {0.9,0.9,0.9})
-		else game.fbo_shader:setUniform("colorize", {0,0,0}) -- Disable
+		else game.fbo_shader:setUniform("colorize", {0,0,0,0}) -- Disable
 		end
 
 		-- Blur shader

game/modules/tome/data/gfx/shaders/main_fbo.frag

@@ -5,7 +5,7 @@ uniform float tick;
 uniform sampler2D noisevol;
 uniform vec2 texSize;
 uniform sampler2D tex;
-uniform vec3 colorize;
+uniform vec4 colorize;
 
 void main(void)
 {
@@ -95,8 +95,8 @@ void main(void)
 
 	if (colorize.r > 0.0 || colorize.g > 0.0 || colorize.b > 0.0)
 	{
-		float grey = gl_FragColor.r*0.3+gl_FragColor.g*0.59+gl_FragColor.b*0.11;
-		gl_FragColor = vec4(vec3(colorize*grey),1.0);
+		float grey = (gl_FragColor.r*0.3+gl_FragColor.g*0.59+gl_FragColor.b*0.11) * colorize.a;
+		gl_FragColor = gl_FragColor * (1.0 - colorize.a) + (vec4(colorize.r, colorize.g, colorize.b, 1.0) * grey);
 	}
 
 	if (hp_warning > 0.0)