From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- assets/shaders/test_fshader_full.glsl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'assets/shaders/test_fshader_full.glsl') diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl index ae7d45b2..5fcc280b 100755 --- a/assets/shaders/test_fshader_full.glsl +++ b/assets/shaders/test_fshader_full.glsl @@ -41,7 +41,7 @@ uniform vec4 u_lightAmb; // diffuse map uniform sampler2D colMap; -// environment map +// environment map uniform sampler2D envMap; // normal map @@ -90,15 +90,15 @@ void main() float pf; if(diffuseIntensity == 0.0) - pf = 0.0; + pf = 0.0; else - pf = pow(specularModifier, 76.0); + pf = pow(specularModifier, 76.0); vec4 ambient = u_matAmbient * u_lightAmb; vec4 diffuse = u_matDiffuse * (colMapTexel + envMapTexel); if (u_renderGlow <= 0.5) - diffuse *= u_lightDiff * diffuseIntensity * attenuation; + diffuse *= u_lightDiff * diffuseIntensity * attenuation; vec4 specular = 2.0 * pf * envMapTexel; -- cgit v1.2.3