diff options
| author | Valerio Virgillito | 2012-07-09 14:16:17 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:18:36 -0700 |
| commit | 1bbba17e8605434356de0a477710d6a0136986fc (patch) | |
| tree | 7cdc80226b776c6fb2250e250acdbcd53fdb1ddd /assets/shaders/Flag.vert.glsl | |
| parent | dc5b7a479a185dda8e9a09f4bbe26bd290641624 (diff) | |
| parent | ab80aa9c7da912db384ec48c656f84fd673b5253 (diff) | |
| download | ninja-1bbba17e8605434356de0a477710d6a0136986fc.tar.gz | |
Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal
Conflicts:
js/lib/geom/circle.js
js/lib/rdge/materials/linear-gradient-material.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'assets/shaders/Flag.vert.glsl')
| -rw-r--r-- | assets/shaders/Flag.vert.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl index fe3ff722..2d5c4494 100644 --- a/assets/shaders/Flag.vert.glsl +++ b/assets/shaders/Flag.vert.glsl | |||
| @@ -59,7 +59,8 @@ void main() | |||
| 59 | const float pi = 3.14159; | 59 | const float pi = 3.14159; |
| 60 | float angle = time; | 60 | float angle = time; |
| 61 | 61 | ||
| 62 | v_uv = texcoord; | 62 | v_uv.x = texcoord.x; |
| 63 | v_uv.y = texcoord.y; | ||
| 63 | 64 | ||
| 64 | float x = 2.0*pi*texcoord.x/u_waveWidth; | 65 | float x = 2.0*pi*texcoord.x/u_waveWidth; |
| 65 | float y = 2.0*pi*texcoord.y; | 66 | float y = 2.0*pi*texcoord.y; |