From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- assets/shaders/ub_vshader.glsl | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'assets/shaders/ub_vshader.glsl') diff --git a/assets/shaders/ub_vshader.glsl b/assets/shaders/ub_vshader.glsl index da8a8660..43c7c9fc 100755 --- a/assets/shaders/ub_vshader.glsl +++ b/assets/shaders/ub_vshader.glsl @@ -59,9 +59,9 @@ uniform vec3 u_eye; uniform vec3 u_light0Atten; uniform vec2 u_light0Spot; uniform vec4 u_light0Color; - uniform vec4 u_light0Specular; + uniform vec4 u_light0Specular; varying vec3 v_light0Dir; - varying vec3 v_light0SpotDir; + varying vec3 v_light0SpotDir; #endif #if defined( LIGHT_1 ) @@ -71,9 +71,9 @@ uniform vec3 u_eye; uniform vec3 u_light1Atten; uniform vec2 u_light1Spot; uniform vec3 u_light1Color; - uniform vec4 u_light1Specular; + uniform vec4 u_light1Specular; varying vec3 v_light1Dir; - varying vec3 v_light1SpotDir; + varying vec3 v_light1SpotDir; #endif #if defined( LIGHT_2 ) @@ -83,9 +83,9 @@ uniform vec3 u_eye; uniform vec3 u_light2Atten; uniform vec2 u_light2Spot; // 0 - spot light cutoff angle, 1 - spot light exponent uniform vec3 u_light2Color; - uniform vec4 u_light2Specular; + uniform vec4 u_light2Specular; varying vec3 v_light2Dir; - varying vec3 v_light2SpotDir; + varying vec3 v_light2SpotDir; #endif #if defined( LIGHT_3 ) @@ -95,9 +95,9 @@ uniform vec3 u_eye; uniform vec3 u_light3Atten; uniform vec2 u_light3Spot; uniform vec3 u_light3Color; - uniform vec4 u_light3Specular; + uniform vec4 u_light3Specular; varying vec3 v_light3Dir; - varying vec3 v_light3SpotDir; + varying vec3 v_light3SpotDir; #endif #endif @@ -123,60 +123,60 @@ void main() { v_eyeDir = vec3(-u_viewMatrix[3][0], -u_viewMatrix[3][1], -u_viewMatrix[3][2]); #if defined( LIGHT_0 ) { - vec3 lpos = ( u_viewMatrix * vec4( u_light0Pos, 1.0 ) ).xyz; - + vec3 lpos = ( u_viewMatrix * vec4( u_light0Pos, 1.0 ) ).xyz; + #if ( LIGHT_0 == 0 ) v_light0Dir = ( u_viewMatrix * vec4( -u_light0Dir, 0.0 ) ).xyz; #else v_light0Dir = lpos - v_mvPos; #if ( LIGHT_0 == 2 ) - v_light0SpotDir = (u_viewMatrix * vec4( -u_light0Dir, 0.0 )).xyz; + v_light0SpotDir = (u_viewMatrix * vec4( -u_light0Dir, 0.0 )).xyz; #endif // ( LIGHT_0 == 2 ) #endif // ( LIGHT_0 == 0 ) } - #endif // defined( LIGHT_0 ) + #endif // defined( LIGHT_0 ) #if defined( LIGHT_1 ) { - vec3 lpos = ( u_viewMatrix * vec4( u_light1Pos, 1.0 ) ).xyz; - + vec3 lpos = ( u_viewMatrix * vec4( u_light1Pos, 1.0 ) ).xyz; + #if ( LIGHT_1 == 0 ) v_light1Dir = ( u_viewMatrix * vec4( -u_light1Dir, 0.0 ) ).xyz; #else v_light1Dir = lpos - v_mvPos; #if ( LIGHT_1 == 2 ) - v_light1SpotDir = (u_viewMatrix * vec4( -u_light1Dir, 0.0 )).xyz; + v_light1SpotDir = (u_viewMatrix * vec4( -u_light1Dir, 0.0 )).xyz; #endif // ( LIGHT_1 == 2 ) #endif // ( LIGHT_1 == 0 ) } #endif // defined( LIGHT_1 ) #if defined( LIGHT_2 ) { - vec3 lpos = ( u_viewMatrix * vec4( u_light2Pos, 1.0 ) ).xyz; - + vec3 lpos = ( u_viewMatrix * vec4( u_light2Pos, 1.0 ) ).xyz; + #if ( LIGHT_2 == 0 ) v_light2Dir = ( u_viewMatrix * vec4( -u_light2Dir, 0.0 ) ).xyz; #else v_light2Dir = lpos - v_mvPos; #if ( LIGHT_2 == 2 ) - v_light2SpotDir = (u_viewMatrix * vec4( -u_light2Dir, 0.0 )).xyz; + v_light2SpotDir = (u_viewMatrix * vec4( -u_light2Dir, 0.0 )).xyz; #endif // ( LIGHT_2 == 2 ) #endif // ( LIGHT_2 == 0 ) } #endif // defined( LIGHT_2 ) #if defined( LIGHT_3 ) { - vec3 lpos = ( u_viewMatrix * vec4( u_light3Pos, 1.0 ) ).xyz; - + vec3 lpos = ( u_viewMatrix * vec4( u_light3Pos, 1.0 ) ).xyz; + #if ( LIGHT_3 == 0 ) v_light3Dir = ( u_viewMatrix * vec4( -u_light3Dir, 0.0 ) ).xyz; #else v_light3Dir = lpos - v_mvPos; #if ( LIGHT_3 == 2 ) - v_light3SpotDir = (u_viewMatrix * vec4( -u_light3Dir, 0.0 )).xyz; + v_light3SpotDir = (u_viewMatrix * vec4( -u_light3Dir, 0.0 )).xyz; #endif // ( LIGHT_3 == 2 ) #endif // ( LIGHT_3 == 0 ) } - #endif // defined( LIGHT_3 ) + #endif // defined( LIGHT_3 ) #endif // defined( LIGHTING ) // pass along the geo -- cgit v1.2.3