aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/test_fshader_full.glsl
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:52:06 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch)
tree8f0f55557bd0c47a84e49c1977c950645d284607 /assets/shaders/test_fshader_full.glsl
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz
Expand tabs
Diffstat (limited to 'assets/shaders/test_fshader_full.glsl')
-rwxr-xr-xassets/shaders/test_fshader_full.glsl8
1 files changed, 4 insertions, 4 deletions
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;
41// diffuse map 41// diffuse map
42uniform sampler2D colMap; 42uniform sampler2D colMap;
43 43
44// environment map 44// environment map
45uniform sampler2D envMap; 45uniform sampler2D envMap;
46 46
47// normal map 47// normal map
@@ -90,15 +90,15 @@ void main()
90 90
91 float pf; 91 float pf;
92 if(diffuseIntensity == 0.0) 92 if(diffuseIntensity == 0.0)
93 pf = 0.0; 93 pf = 0.0;
94 else 94 else
95 pf = pow(specularModifier, 76.0); 95 pf = pow(specularModifier, 76.0);
96 96
97 vec4 ambient = u_matAmbient * u_lightAmb; 97 vec4 ambient = u_matAmbient * u_lightAmb;
98 vec4 diffuse = u_matDiffuse * (colMapTexel + envMapTexel); 98 vec4 diffuse = u_matDiffuse * (colMapTexel + envMapTexel);
99 99
100 if (u_renderGlow <= 0.5) 100 if (u_renderGlow <= 0.5)
101 diffuse *= u_lightDiff * diffuseIntensity * attenuation; 101 diffuse *= u_lightDiff * diffuseIntensity * attenuation;
102 102
103 vec4 specular = 2.0 * pf * envMapTexel; 103 vec4 specular = 2.0 * pf * envMapTexel;
104 104