Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 42 insertions, 42 deletions

diff --git a/assets/shaders/TwistVert.vert.glsl b/assets/shaders/TwistVert.vert.glsl
index 94d22020..6db4210f 100644
--- a/assets/shaders/TwistVert.vert.glsl
+++ b/assets/shaders/TwistVert.vert.glsl
@@ -64,51 +64,51 @@ varying vec2 v_texcoord;
 
 float GetAngle( float t )
 {
-        float angle= 0.0;
-        if (t < u_limit2)
-        {
-                if (t < u_limit1)
-                {
-                        angle = u_twistAmount;
-                }
-                else
-                {
-                        angle = (t - u_limit2)/(u_limit1 - u_limit2)*u_twistAmount;
-                }
-        }
-
-        return angle;
+    float angle= 0.0;
+    if (t < u_limit2)
+    {
+        if (t < u_limit1)
+        {
+            angle = u_twistAmount;
+        }
+        else
+        {
+            angle = (t - u_limit2)/(u_limit1 - u_limit2)*u_twistAmount;
+        }
+    }
+
+    return angle;
 }
 
 
 void main(void)
 {
-        vec3 pos = vert;
-        vec2 uv = texcoord;
-        v_texcoord = texcoord;
-
-        v_zNormal = 1.0;
-        if (uv.x < u_limit2)
-        {
-                float angle = GetAngle( uv.x );
-                float cs = cos(angle),  sn = sin(angle);
-
-                vec3 ctrPt = pos;
-                float y = pos.y*cs - pos.z*sn;  // + u_center;
-                pos.z   = pos.y*sn + pos.z*cs;
-                pos.y = y;
-
-                // rotate the normal
-                mat3 rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
-                vec3 pt0 = ctrPt, pt1 = vec3(ctrPt.x, ctrPt.y+1.0, ctrPt.z),  pt2 = vec3( ctrPt.x+1.0, ctrPt.y, ctrPt.z);
-                pt0 = rotMat * pt0;  pt1 = rotMat * pt1;
-                angle = GetAngle(1.0);
-                cs = cos(angle); sn = sin(angle);
-                rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
-                pt2 = rotMat * pt2;
-                vec4 nrm = vec4( cross(pt1-pt0, pt2-pt0), 1.0 );
-                v_zNormal   = -nrm.z;
-        }
-
-        gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ;
+    vec3 pos = vert;
+    vec2 uv = texcoord;
+    v_texcoord = texcoord;
+
+    v_zNormal = 1.0;
+    if (uv.x < u_limit2)
+    {
+        float angle = GetAngle( uv.x );
+        float cs = cos(angle),  sn = sin(angle);
+
+        vec3 ctrPt = pos;
+        float y = pos.y*cs - pos.z*sn;  // + u_center;
+        pos.z   = pos.y*sn + pos.z*cs;
+        pos.y = y;
+
+        // rotate the normal
+        mat3 rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
+        vec3 pt0 = ctrPt, pt1 = vec3(ctrPt.x, ctrPt.y+1.0, ctrPt.z),  pt2 = vec3( ctrPt.x+1.0, ctrPt.y, ctrPt.z);
+        pt0 = rotMat * pt0;  pt1 = rotMat * pt1;
+        angle = GetAngle(1.0);
+        cs = cos(angle); sn = sin(angle);
+        rotMat = mat3( vec3( 1.0,  0.0,  0.0 ),  vec3( 0.0,   cs,   sn ),  vec3( 0.0,  -sn,   cs ) );
+        pt2 = rotMat * pt2;
+        vec4 nrm = vec4( cross(pt1-pt0, pt2-pt0), 1.0 );
+        v_zNormal   = -nrm.z;
+    }
+
+    gl_Position = u_projMatrix * u_mvMatrix * vec4(pos,1.0) ;
 }