diff options
| author | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:00:34 -0700 |
| commit | 38f571d1fdf02d36c3816637af7b2ca2493809da (patch) | |
| tree | 69b97839be8b2b6fb65e9150d4dc02856041fb1d /assets/shaders/test_fshader.glsl | |
| parent | f7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff) | |
| parent | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff) | |
| download | ninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz | |
Merge branch 'refs/heads/master' into binding
Diffstat (limited to 'assets/shaders/test_fshader.glsl')
| -rwxr-xr-x | assets/shaders/test_fshader.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/shaders/test_fshader.glsl b/assets/shaders/test_fshader.glsl index 629d1878..229b8989 100755 --- a/assets/shaders/test_fshader.glsl +++ b/assets/shaders/test_fshader.glsl | |||
| @@ -32,7 +32,7 @@ uniform sampler2D depthMap; | |||
| 32 | uniform vec4 u_matAmbient; | 32 | uniform vec4 u_matAmbient; |
| 33 | uniform vec4 u_matDiffuse; | 33 | uniform vec4 u_matDiffuse; |
| 34 | uniform vec4 u_matSpecular; | 34 | uniform vec4 u_matSpecular; |
| 35 | uniform float u_matShininess; | 35 | //uniform float u_matShininess; |
| 36 | uniform vec4 u_matEmission; | 36 | uniform vec4 u_matEmission; |
| 37 | uniform float u_renderGlow; | 37 | uniform float u_renderGlow; |
| 38 | 38 | ||