diff options
| author | Eric Guzman | 2012-06-20 19:42:03 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-20 19:42:03 -0700 |
| commit | 3270aac4980c908f305fb53abadda5121ff6b9cb (patch) | |
| tree | 6255aaab239fde71b1f4862dd70de7be62f48b85 /assets/shaders/test_fshader.glsl | |
| parent | a5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff) | |
| parent | 87377c81da06abf6d656017859830a3ab2902f0e (diff) | |
| download | ninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal 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 | ||