From 56d84d24da467036e706cbb2d2c8503d5b9a5e43 Mon Sep 17 00:00:00 2001 From: Emilian Huminiuc Date: Mon, 13 Aug 2012 16:44:41 +0300 Subject: [PATCH] Hopefuly fix yet another weird behaviour on ATI gpus Signed-off-by: Emilian Huminiuc --- Shaders/transition.frag | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Shaders/transition.frag b/Shaders/transition.frag index 933699968..829420711 100644 --- a/Shaders/transition.frag +++ b/Shaders/transition.frag @@ -3,8 +3,6 @@ // based on earlier work by Frederic Bouvier, Tim Moore, and Yves Sablonier. // © Emilian Huminiuc 2011 -// Ambient term comes in gl_Color.rgb. - #version 120 varying vec4 RawPos; @@ -69,10 +67,11 @@ void main() if (gl_FrontMaterial.shininess > 0.0) specular = gl_FrontMaterial.specular * gl_LightSource[0].specular * pf; - vec4 diffuseColor = gl_FrontMaterial.emission + - vec4(1.0) * (gl_LightModel.ambient + gl_LightSource[0].ambient) + - Diffuse * gl_FrontMaterial.diffuse; - +// vec4 diffuseColor = gl_FrontMaterial.emission + +// vec4(1.0) * (gl_LightModel.ambient + gl_LightSource[0].ambient) + +// Diffuse * gl_FrontMaterial.diffuse; + vec4 ambientColor = gl_LightModel.ambient + gl_LightSource[0].ambient; + vec4 diffuseColor = gl_Color + Diffuse * gl_FrontMaterial.diffuse + ambientColor; diffuseColor += specular * gl_FrontMaterial.specular; // This shouldn't be necessary, but our lighting becomes very