diff options
| author | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
| commit | 483ad57efcd6475776f580c3af5b60e6deeaf781 (patch) | |
| tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /assets/shaders/Taper.vert.glsl | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| parent | c65c532d081afd73e4a325abe4ab97c6726c02db (diff) | |
| download | ninja-483ad57efcd6475776f580c3af5b60e6deeaf781.tar.gz | |
Merge pull request #298 from ericmueller/Textures
Textures
Diffstat (limited to 'assets/shaders/Taper.vert.glsl')
| -rw-r--r-- | assets/shaders/Taper.vert.glsl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl index 30b73456..eb562c2f 100644 --- a/assets/shaders/Taper.vert.glsl +++ b/assets/shaders/Taper.vert.glsl | |||
| @@ -24,8 +24,6 @@ uniform float u_minVal; | |||
| 24 | uniform float u_maxVal; | 24 | uniform float u_maxVal; |
| 25 | uniform float u_center; | 25 | uniform float u_center; |
| 26 | 26 | ||
| 27 | uniform vec4 color; | ||
| 28 | |||
| 29 | 27 | ||
| 30 | // matrix uniforms | 28 | // matrix uniforms |
| 31 | uniform mat4 u_mvMatrix; | 29 | uniform mat4 u_mvMatrix; |