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

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

1 files changed, 216 insertions, 216 deletions

diff --git a/assets/shaders/ub_fshader.glsl b/assets/shaders/ub_fshader.glsl
index e4e0e2d3..9b37899d 100755
--- a/assets/shaders/ub_fshader.glsl
+++ b/assets/shaders/ub_fshader.glsl
@@ -30,257 +30,257 @@ POSSIBILITY OF SUCH DAMAGE.
 
 // defines
 #if defined( GL_ES )
-        precision highp float;
+    precision highp float;
 #endif
 
 uniform mat4 u_viewMatrix;
 
 #if defined( MATERIAL )
-        uniform vec4            u_ambientColor;
-        uniform vec4            u_diffuseColor;
-        uniform vec4            u_specularColor;
-        uniform float           u_specularPower;
+    uniform vec4        u_ambientColor;
+    uniform vec4        u_diffuseColor;
+    uniform vec4        u_specularColor;
+    uniform float       u_specularPower;
 #endif
 
 #if defined( LIGHTING )
-        varying vec3 v_normal;
-        #if defined( LIGHT_0 )
-//              uniform int             u_light0Type;
-                uniform vec3    u_light0Pos;
-                uniform vec3    u_light0Dir;
-                uniform vec3    u_light0Atten;
-                uniform vec2    u_light0Spot;
-                uniform vec4    u_light0Color;
-                uniform vec4    u_light0Specular;               
-                varying vec3    v_light0Dir;
-                varying vec3    v_light0SpotDir;                
-        #endif
-
-        #if defined( LIGHT_1 )
-//              uniform int             u_light1Type;
-                uniform vec3    u_light1Pos;
-                uniform vec3    u_light1Dir;
-                uniform vec3    u_light1Atten;
-                uniform vec2    u_light1Spot;
-                uniform vec4    u_light1Color;
-                uniform vec4    u_light1Specular;               
-                varying vec3    v_light1Dir;
-                varying vec3    v_light1SpotDir;                
-        #endif
-
-        #if defined( LIGHT_2 )
-//              uniform int             u_light2Type;
-                uniform vec3    u_light2Pos;
-                uniform vec3    u_light2Dir;
-                uniform vec3    u_light2Atten;
-                uniform vec2    u_light2Spot;
-                uniform vec4    u_light2Color;
-                uniform vec4    u_light2Specular;               
-                varying vec3    v_light2Dir;
-                varying vec3    v_light2SpotDir;                
-        #endif
-
-        #if defined( LIGHT_3 )
-//              uniform int             u_light3Type;
-                uniform vec3    u_light3Pos;
-                uniform vec3    u_light3Dir;
-                uniform vec3    u_light3Atten;
-                uniform vec2    u_light3Spot;
-                uniform vec4    u_light3Color;
-                uniform vec4    u_light3Specular;               
-                varying vec3    v_light3Dir;
-                varying vec3    v_light3SpotDir;                
-        #endif
+    varying vec3 v_normal;
+    #if defined( LIGHT_0 )
+//      uniform int     u_light0Type;
+        uniform vec3    u_light0Pos;
+        uniform vec3    u_light0Dir;
+        uniform vec3    u_light0Atten;
+        uniform vec2    u_light0Spot;
+        uniform vec4    u_light0Color;
+        uniform vec4    u_light0Specular;
+        varying vec3    v_light0Dir;
+        varying vec3    v_light0SpotDir;
+    #endif
+
+    #if defined( LIGHT_1 )
+//      uniform int     u_light1Type;
+        uniform vec3    u_light1Pos;
+        uniform vec3    u_light1Dir;
+        uniform vec3    u_light1Atten;
+        uniform vec2    u_light1Spot;
+        uniform vec4    u_light1Color;
+        uniform vec4    u_light1Specular;
+        varying vec3    v_light1Dir;
+        varying vec3    v_light1SpotDir;
+    #endif
+
+    #if defined( LIGHT_2 )
+//      uniform int     u_light2Type;
+        uniform vec3    u_light2Pos;
+        uniform vec3    u_light2Dir;
+        uniform vec3    u_light2Atten;
+        uniform vec2    u_light2Spot;
+        uniform vec4    u_light2Color;
+        uniform vec4    u_light2Specular;
+        varying vec3    v_light2Dir;
+        varying vec3    v_light2SpotDir;
+    #endif
+
+    #if defined( LIGHT_3 )
+//      uniform int     u_light3Type;
+        uniform vec3    u_light3Pos;
+        uniform vec3    u_light3Dir;
+        uniform vec3    u_light3Atten;
+        uniform vec2    u_light3Spot;
+        uniform vec4    u_light3Color;
+        uniform vec4    u_light3Specular;
+        varying vec3    v_light3Dir;
+        varying vec3    v_light3SpotDir;
+    #endif
 #endif
 
 #if defined( ENVIRONMENT_MAP )
-        uniform float   u_envReflection;
+    uniform float   u_envReflection;
 #endif
 
 uniform vec3 u_eye;
 
-uniform sampler2D       s_diffuseMap;
-uniform sampler2D       s_normalMap;
-uniform sampler2D       s_envMap;
-uniform sampler2D       s_specMap;
+uniform sampler2D   s_diffuseMap;
+uniform sampler2D   s_normalMap;
+uniform sampler2D   s_envMap;
+uniform sampler2D   s_specMap;
 
 varying vec3 v_mvPos;
 varying vec3 v_eyeDir;
 varying vec2 v_texcoord;
 
 void main() {
-        // these are the four principle color elements making up the final fragment equation.
-        vec4 a = vec4(0.0,0.0,0.0,0.0); // ambient contribution
-        vec4 d = vec4(0.0,0.0,0.0,0.0); // diffuse contribution
-        vec4 s = vec4(0.0,0.0,0.0,0.0); // specular contribution
-        vec4 l = vec4(0.0,0.0,0.0,0.0); // lighting contribution
-        
+    // these are the four principle color elements making up the final fragment equation.
+    vec4 a = vec4(0.0,0.0,0.0,0.0); // ambient contribution
+    vec4 d = vec4(0.0,0.0,0.0,0.0); // diffuse contribution
+    vec4 s = vec4(0.0,0.0,0.0,0.0); // specular contribution
+    vec4 l = vec4(0.0,0.0,0.0,0.0); // lighting contribution
+
 #if defined( MATERIAL )
-        a += u_ambientColor;
-        d += u_diffuseColor;
+    a += u_ambientColor;
+    d += u_diffuseColor;
 #endif
 
 #if defined( DIFFUSE_MAP )
-        d *= texture2D(s_diffuseMap, v_texcoord);
+    d *= texture2D(s_diffuseMap, v_texcoord);
 #endif
 
-#if ( defined( LIGHTING ) || defined( ENVIRONMENT_MAPPING ) )  
-        vec3 normal = normalize( v_normal );
+#if ( defined( LIGHTING ) || defined( ENVIRONMENT_MAPPING ) )
+    vec3 normal = normalize( v_normal );
 #endif
-        
+
 #if defined( LIGHTING )
-        #if defined( NORMAL_MAP )
-                vec4 normalMap = texture2D(s_normalMap, v_texcoord);
-                normalMap = vec4( (normalMap.xyz * 2.0 - 1.0), 0.0 );
-                normal = normalize(normalMap.x*vec3(normal.z, 0.0, normal.x) + vec3(0.0, normalMap.y, 0.0) + normalMap.z*normal);
-        #endif // NORMAL_MAP
-
-        #if defined( LIGHT_0 )
-                {               
-                        // diffuse lighting
-                        float ldist = length( v_light0Dir.xyz );
-                        vec3 ldir = v_light0Dir.xyz / ldist;
-                                                                
-                        float atten = 1.0;
-                        
-                        #if ( LIGHT_0 > 0 )
-                                atten = 1.0 / ( u_light0Atten.x + u_light0Atten.y * ldist + u_light0Atten.z * ( ldist * ldist ) );
-                                #if (LIGHT_0 == 2)
-                                        float spotAngle = dot( ldir, normalize( v_light0SpotDir ) );
-                                        float spotAtten = 0.0;
-                                        if ( spotAngle > u_light0Spot.y ) {
-                                                spotAtten = min(1.0, max( 0.0, ( spotAngle - u_light0Spot.y ) / ( u_light0Spot.x - u_light0Spot.y ) ) );   
-                                        }                       
-                                        atten *= spotAtten;             
-                                #endif
-                        #endif
-                                
-                        float ndotl = max( 0.0, dot( normal, ldir ) );
-                        l += ndotl * atten * u_light0Color;
-
-                        #if defined( LIGHT_0_SPECULAR )
-                                // specular contribution
-                                vec3 halfAngleVec = normalize( normalize( v_light0Dir.xyz ) + vec3(0.0,0.0,1.0) );
-                                float ndoth = max( 0.0, dot( normal, halfAngleVec ) );
-                                s += atten * pow( ndoth, u_specularPower ) * (u_specularColor * u_light0Specular);
-                        #endif
-                }
+    #if defined( NORMAL_MAP )
+        vec4 normalMap = texture2D(s_normalMap, v_texcoord);
+        normalMap = vec4( (normalMap.xyz * 2.0 - 1.0), 0.0 );
+        normal = normalize(normalMap.x*vec3(normal.z, 0.0, normal.x) + vec3(0.0, normalMap.y, 0.0) + normalMap.z*normal);
+    #endif // NORMAL_MAP
+
+    #if defined( LIGHT_0 )
+        {
+            // diffuse lighting
+            float ldist = length( v_light0Dir.xyz );
+            vec3 ldir = v_light0Dir.xyz / ldist;
+
+            float atten = 1.0;
+
+            #if ( LIGHT_0 > 0 )
+                atten = 1.0 / ( u_light0Atten.x + u_light0Atten.y * ldist + u_light0Atten.z * ( ldist * ldist ) );
+                #if (LIGHT_0 == 2)
+                    float spotAngle = dot( ldir, normalize( v_light0SpotDir ) );
+                    float spotAtten = 0.0;
+                    if ( spotAngle > u_light0Spot.y ) {
+                        spotAtten = min(1.0, max( 0.0, ( spotAngle - u_light0Spot.y ) / ( u_light0Spot.x - u_light0Spot.y ) ) );
+                    }
+                    atten *= spotAtten;
+                #endif
+            #endif
+
+            float ndotl = max( 0.0, dot( normal, ldir ) );
+            l += ndotl * atten * u_light0Color;
+
+            #if defined( LIGHT_0_SPECULAR )
+                // specular contribution
+                vec3 halfAngleVec = normalize( normalize( v_light0Dir.xyz ) + vec3(0.0,0.0,1.0) );
+                float ndoth = max( 0.0, dot( normal, halfAngleVec ) );
+                s += atten * pow( ndoth, u_specularPower ) * (u_specularColor * u_light0Specular);
+            #endif
+        }