Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/linear-gradient-material.js

2 files changed, 7 insertions, 2 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;
 uniform float   u_colorStop4;                                                                   
 uniform vec2    u_cos_sin_angle;
 //uniform int           u_colorCount;   // currently using 4
+uniform mat3 u_texTransform;
 
 varying         vec2 v_uv;
 
@@ -44,5 +45,7 @@ varying		vec2 v_uv;
 void main(void)
 {
         gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
-        v_uv = texcoord;
+        //v_uv = texcoord;
+        vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
+        v_uv = tmp.xy;
 }
diff --git a/assets/shaders/radialGradient.vert.glsl b/assets/shaders/radialGradient.vert.glsl
index c3e1b50a..7994ac12 100644
--- a/assets/shaders/radialGradient.vert.glsl
+++ b/assets/shaders/radialGradient.vert.glsl
@@ -18,11 +18,13 @@ attribute vec2 texcoord;
 // matrix uniforms
 uniform mat4 u_mvMatrix;
 uniform mat4 u_projMatrix;
+uniform mat3 u_texTransform;
 
 varying         vec2    v_uv;
 
 void main(void)
 {
         gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
-        v_uv = texcoord;
+        vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
+        v_uv = tmp.xy;
 }
\ No newline at end of file