fly/fgdata
1
0
Fork 0
Code Activity

restore transition.frag that got broken

Browse source 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
This commit is contained in:
Emilian Huminiuc 2012-08-20 13:35:10 +03:00
parent b3922c08c1
commit cc770cecb7
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Shaders/transition.frag
View file

@ -3,8 +3,6 @@
// based on earlier work by Frederic Bouvier, Tim Moore, and Yves Sablonier. // based on earlier work by Frederic Bouvier, Tim Moore, and Yves Sablonier.
// © Emilian Huminiuc 2011 // © Emilian Huminiuc 2011
// Ambient term comes in gl_Color.rgb.
#version 120 #version 120
varying vec4 RawPos; varying vec4 RawPos;
@ -69,19 +67,12 @@ void main()
if (gl_FrontMaterial.shininess > 0.0) if (gl_FrontMaterial.shininess > 0.0)
specular = gl_FrontMaterial.specular * gl_LightSource[0].specular * pf; specular = gl_FrontMaterial.specular * gl_LightSource[0].specular * pf;
<<<<<<< HEAD
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 diffuseColor = gl_FrontMaterial.emission +
// vec4(1.0) * (gl_LightModel.ambient + gl_LightSource[0].ambient) + // vec4(1.0) * (gl_LightModel.ambient + gl_LightSource[0].ambient) +
// Diffuse * gl_FrontMaterial.diffuse; // Diffuse * gl_FrontMaterial.diffuse;
vec4 ambientColor = gl_LightModel.ambient + gl_LightSource[0].ambient; vec4 ambientColor = gl_LightModel.ambient + gl_LightSource[0].ambient;
//vec4 diffuseColor = gl_Color + Diffuse * gl_FrontMaterial.diffuse + ambientColor; //vec4 diffuseColor = gl_Color + Diffuse * gl_FrontMaterial.diffuse + ambientColor;
vec4 diffuseColor = vec4(Diffuse) + ambientColor; //ATI workaround vec4 diffuseColor = vec4(Diffuse) + ambientColor; //ATI workaround
>>>>>>> 458720af8eb7ffa022b5b8dcc51d3cde60e5dded
diffuseColor += specular * gl_FrontMaterial.specular; diffuseColor += specular * gl_FrontMaterial.specular;
// This shouldn't be necessary, but our lighting becomes very // This shouldn't be necessary, but our lighting becomes very