From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- libraries/irrlicht-1.8/media/opengl.vert | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'libraries/irrlicht-1.8/media/opengl.vert') diff --git a/libraries/irrlicht-1.8/media/opengl.vert b/libraries/irrlicht-1.8/media/opengl.vert index bfee816..dc507ae 100644 --- a/libraries/irrlicht-1.8/media/opengl.vert +++ b/libraries/irrlicht-1.8/media/opengl.vert @@ -1,27 +1,27 @@ - -uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; -uniform vec3 mLightPos; -uniform vec4 mLightColor; - -void main(void) -{ - gl_Position = mWorldViewProj * gl_Vertex; - - vec4 normal = vec4(gl_Normal, 0.0); - normal = mInvWorld * normal; - normal = normalize(normal); - - vec4 worldpos = gl_Vertex * mTransWorld; - - vec4 lightVector = worldpos - vec4(mLightPos,1.0); - lightVector = normalize(lightVector); - - float tmp2 = dot(-lightVector, normal); - - vec4 tmp = mLightColor * tmp2; - gl_FrontColor = gl_BackColor = vec4(tmp.x, tmp.y, tmp.z, 0.0); - - gl_TexCoord[0] = gl_MultiTexCoord0; -} + +uniform mat4 mWorldViewProj; +uniform mat4 mInvWorld; +uniform mat4 mTransWorld; +uniform vec3 mLightPos; +uniform vec4 mLightColor; + +void main(void) +{ + gl_Position = mWorldViewProj * gl_Vertex; + + vec4 normal = vec4(gl_Normal, 0.0); + normal = mInvWorld * normal; + normal = normalize(normal); + + vec4 worldpos = gl_Vertex * mTransWorld; + + vec4 lightVector = worldpos - vec4(mLightPos,1.0); + lightVector = normalize(lightVector); + + float tmp2 = dot(-lightVector, normal); + + vec4 tmp = mLightColor * tmp2; + gl_FrontColor = gl_BackColor = vec4(tmp.x, tmp.y, tmp.z, 0.0); + + gl_TexCoord[0] = gl_MultiTexCoord0; +} -- cgit v1.1