aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/linearGradient.vert.glsl
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 17:16:21 -0700
committerPushkar Joshi2012-05-31 17:16:21 -0700
commit8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch)
tree19a8af74c58c9ea261f0842f36efdab959be3256 /assets/shaders/linearGradient.vert.glsl
parenteea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff)
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
downloadninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'assets/shaders/linearGradient.vert.glsl')
-rwxr-xr-xassets/shaders/linearGradient.vert.glsl5
1 files changed, 4 insertions, 1 deletions
diff --git a/assets/shaders/linearGradient.vert.glsl b/assets/shaders/linearGradient.vert.glsl
index aac9cbee..f0800812 100755
--- a/assets/shaders/linearGradient.vert.glsl
+++ b/assets/shaders/linearGradient.vert.glsl
@@ -37,6 +37,7 @@ uniform float u_colorStop3;
37uniform float u_colorStop4; 37uniform float u_colorStop4;
38uniform vec2 u_cos_sin_angle; 38uniform vec2 u_cos_sin_angle;
39//uniform int u_colorCount; // currently using 4 39//uniform int u_colorCount; // currently using 4
40uniform mat3 u_texTransform;
40 41
41varying vec2 v_uv; 42varying vec2 v_uv;
42 43
@@ -44,5 +45,7 @@ varying vec2 v_uv;
44void main(void) 45void main(void)
45{ 46{
46 gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ; 47 gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
47 v_uv = texcoord; 48 //v_uv = texcoord;
49 vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
50 v_uv = tmp.xy;
48} 51}