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

Conflicts:
	js/helper-classes/3D/StageLine.js

18 files changed, 654 insertions, 652 deletions

diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index ae454411..80b2f088 100755
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -39,7 +39,7 @@ attribute vec3 a_pos;
 attribute vec2 texcoord;
 
 // varying
-varying vec2    v_texCoord0;
+varying vec2    v_texCoord0;
 
 // matrix uniforms
 uniform mat4 u_mvMatrix;
@@ -48,6 +48,6 @@ uniform mat4 u_worldMatrix;
 
 void main(void)
 {
-        v_texCoord0 = texcoord;
-        gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
+    v_texCoord0 = texcoord;
+    gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
 }
diff --git a/assets/shaders/BasicTex.frag.glsl b/assets/shaders/BasicTex.frag.glsl
index 4fee288d..d89e2ead 100644
--- a/assets/shaders/BasicTex.frag.glsl
+++ b/assets/shaders/BasicTex.frag.glsl
@@ -35,7 +35,7 @@ precision highp float;
 
 uniform sampler2D u_tex0;
 
-varying vec2    v_texCoord0;
+varying vec2    v_texCoord0;
 
 
 void main() {
diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
index 85a43699..1149f11b 100644
--- a/assets/shaders/Cloud.frag.glsl
+++ b/assets/shaders/Cloud.frag.glsl
@@ -36,12 +36,12 @@ precision highp float;
 uniform sampler2D u_tex0;
 uniform float u_surfaceAlpha;
 
-varying vec2    v_texCoord0;
+varying vec2    v_texCoord0;
 
 
 void main()
 {
-        vec4 c = texture2D(u_tex0, v_texCoord0);
-        gl_FragColor = c;
-}    
-  
+    vec4 c = texture2D(u_tex0, v_texCoord0);
+    gl_FragColor = c;
+}
+
diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl
index 95c14132..a33429fe 100644
--- a/assets/shaders/Cloud.vert.glsl
+++ b/assets/shaders/Cloud.vert.glsl
@@ -34,7 +34,7 @@ precision highp float;
 #endif
 
 // attributes
-attribute vec3  a_pos;
+attribute vec3  a_pos;
 attribute vec2  texcoord;
 
 // uniforms
@@ -48,7 +48,7 @@ uniform mat4 u_mvMatrix;
 uniform mat4 u_projMatrix;
 
 // varying
-varying vec2    v_texCoord0;
+varying vec2    v_texCoord0;
 
 // constants
 const float zSpeed = 10.0;
@@ -57,19 +57,19 @@ const float zSpeed = 10.0;
 void main()
 {
     // Transform position
-        vec4 pos = vec4(a_pos,1);
+    vec4 pos = vec4(a_pos,1);
 
-        float dz = u_time*zSpeed;
-        float n = floor( dz/(u_zmax-u_zmin) );
-        dz -= n*(u_zmax - u_zmin);
-        float z = pos.z + dz;
-        if (z > u_zmax)
-        {
-                z = u_zmin + (z - u_zmax);
-        }
-        pos.z = z;
+    float dz = u_time*zSpeed;
+    float n = floor( dz/(u_zmax-u_zmin) );
+    dz -= n*(u_zmax - u_zmin);
+    float z = pos.z + dz;
+    if (z > u_zmax)
+    {
+        z = u_zmin + (z - u_zmax);
+    }
+    pos.z = z;
+
+    gl_Position = u_projMatrix * u_mvMatrix * pos;
 
-        gl_Position = u_projMatrix * u_mvMatrix * pos;
-            
     v_texCoord0 = texcoord;
 }
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
index fe3ff722..6e2854ee 100644
--- a/assets/shaders/Flag.vert.glsl
+++ b/assets/shaders/Flag.vert.glsl
@@ -55,21 +55,22 @@ varying vec2 v_uv;
 
 void main()
 {
-        float time = u_time * u_speed;
-        const float pi = 3.14159;
-        float angle = time;
+    float time = u_time * u_speed;
+    const float pi = 3.14159;
+    float angle = time;
 
-    v_uv = texcoord;
+    v_uv.x = texcoord.x;
+    v_uv.y = texcoord.y;
 
-        float x = 2.0*pi*texcoord.x/u_waveWidth;
-        float y = 2.0*pi*texcoord.y;
+    float x = 2.0*pi*texcoord.x/u_waveWidth;
+    float y = 2.0*pi*texcoord.y;
 
     vec3 v = a_pos;
-        v.z  = sin( x + angle );
-        v.z += sin( 0.2*y + angle);
-        v.z *= u_waveHeight;
-        v.z -=  2.0*u_waveHeight;
-        v.z *= x * 0.09;
-        
+    v.z  = sin( x + angle );
+    v.z += sin( 0.2*y + angle);
+    v.z *= u_waveHeight;
+    v.z -=  2.0*u_waveHeight;
+    v.z *= x * 0.09;
+
     gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ;
 }
diff --git a/assets/shaders/Pulse.frag.glsl b/assets/shaders/Pulse.frag.glsl
index 9aeb05c9..b717d359 100644
--- a/assets/shaders/Pulse.frag.glsl
+++ b/assets/shaders/Pulse.frag.glsl
@@ -22,6 +22,7 @@ void main(void)
     float cLength = length(cPos);
 
     vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-time*10.0)/25.0;
+        uv.y = 1.0 - uv.y;
     vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength;
 
     gl_FragColor = vec4(col,1.0);
diff --git a/assets/shaders/Taper.vert.glsl b/assets/shaders/Taper.vert.glsl
index 5fe173b2..e55aeede 100644
--- a/assets/shaders/Taper.vert.glsl
+++ b/assets/shaders/Taper.vert.glsl
@@ -60,85 +60,85 @@ varying vec4 v_color;
 
 float TaperAmount( float param )
 {
-        // Bezier coordinates of the X coordinate.
-        // Adjust these to get tighter or looser
-        float tightness = 0.8;
-
-        float x0, y0,  x1, y1,  x2, y2;
-        float t;
-        if (param < 0.5)
-        {
-                t = 2.0*param;
-                x0 = 0.0;  y0 = 0.0;
-                x1 = tightness;  y1 = 0.0;
-                x2 = 1.0;  y2 = 0.5;
-        }
-        else
-        {
-                t = (param - 0.5)*2.0;
-                x0 = 0.0;  y0 = 0.5;
-                x1 = 1.0 - tightness;  y1 = 1.0;
-                x2 = 1.0;  y2 = 1.0;
-        }
-
-        float a = x0 - 2.0*x1 + x2;
-        float b = 2.0*(x1 - x0);
-        float c = x0 - t;
-
-        float descr = sqrt( b*b - 4.0*a*c );
-        float denom = 2.0*a;
-        float n1 = (-b + descr)/denom;
-        float n2 = (-b - descr)/denom;
+    // Bezier coordinates of the X coordinate.
+    // Adjust these to get tighter or looser
+    float tightness = 0.8;
+
+    float x0, y0,  x1, y1,  x2, y2;
+    float t;
+    if (param < 0.5)
+    {
+        t = 2.0*param;
+        x0 = 0.0;  y0 = 0.0;
+        x1 = tightness;  y1 = 0.0;
+        x2 = 1.0;  y2 = 0.5;
+    }
+    else
+    {
+        t = (param - 0.5)*2.0;
+        x0 = 0.0;  y0 = 0.5;
+        x1 = 1.0 - tightness;  y1 = 1.0;
+        x2 = 1.0;  y2 = 1.0;
+    }
+
+    float a = x0 - 2.0*x1 + x2;
+    float b = 2.0*(x1 - x0);
+    float c = x0 - t;
+
+    float descr = sqrt( b*b - 4.0*a*c );
+    float denom = 2.0*a;
+    float n1 = (-b + descr)/denom;
+    float n2 = (-b - descr)/denom;