yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert 971713 - it can be done easier.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=971719
This commit is contained in:
Martin Gräßlin 2009-05-23 09:28:17 +00:00
parent 339895beac
commit 61e619c83b
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
effects/cube/data/cylinder.frag
View file

@ -26,30 +26,14 @@ void main()
gl_TexCoord[0].y < 0.0 || gl_TexCoord[0].y > textureHeight ) gl_TexCoord[0].y < 0.0 || gl_TexCoord[0].y > textureHeight )
discard; discard;
vec4 tex = texture2D(winTexture, pix2tex(gl_TexCoord[0].xy)); vec4 tex = texture2D(winTexture, pix2tex(gl_TexCoord[0].xy));
tex = vec4( tex.rgb, tex.a * opacity );
// change saturation, brightness and opacity
// in the exactly same way as in SceneOpenGL::Window::prepareRenderStates()
// see scene_opengl.cpp
float sourceAlpha = tex.a;
float opacityByBrightness = opacity * brightness;
if( saturation != 1.0 ) if( saturation != 1.0 )
{ {
vec3 desaturated = tex.rgb * vec3( 0.30, 0.59, 0.11 ); vec3 desaturated = tex.rgb * vec3( 0.30, 0.59, 0.11 );
desaturated = vec3( dot( desaturated, tex.rgb )); desaturated = vec3( dot( desaturated, tex.rgb ));
tex.rgb = tex.rgb * saturation + desaturated * ( 1.0 - saturation ); tex.rgb = tex.rgb * vec3( saturation ) + desaturated * vec3( 1.0 - saturation );
tex.a = opacity;
if( sourceAlpha != 1.0 || brightness != 1.0 )
{
tex.rgb = tex.rgb * opacityByBrightness;
if( sourceAlpha != 1.0 )
tex.a = sourceAlpha * opacity;
}
}
else if( opacity != 1.0 || brightness != 1.0 )
{
tex.rgb = tex.rgb * opacityByBrightness;
tex.a = tex.a * opacity;
} }
tex.rgb = tex.rgb * vec3( brightness );
gl_FragColor = tex; gl_FragColor = tex;
} }
else else