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, 31 insertions, 31 deletions

diff --git a/assets/shaders/test_vshader.glsl b/assets/shaders/test_vshader.glsl
index 8bf9ee74..22c91590 100755
--- a/assets/shaders/test_vshader.glsl
+++ b/assets/shaders/test_vshader.glsl
@@ -46,8 +46,8 @@ uniform mat4 u_vShadowLight;
 uniform vec3 u_lightPos;
 
 // varyings
-varying vec4 vNormal;   // w = texcoord.x
-varying vec4 vECPos;    // w = texcoord.y
+varying vec4 vNormal;   // w = texcoord.x
+varying vec4 vECPos;    // w = texcoord.y
 varying vec3 vEyePos;
 varying vec4 vShadowCoord;
 varying vec2 vEnvTexCoord;
@@ -56,18 +56,18 @@ varying float vDiffuseIntensity;
 #ifdef PC
 void main()
 {
-        vNormal.w       = texcoord.x;
-        vECPos.w                = texcoord.y;
+    vNormal.w       = texcoord.x;
+    vECPos.w        = texcoord.y;
     vEyePos         = u_eye;
 
-//      position normals and vert
-        vECPos.xyz      = (u_mvMatrix*vec4(vert, 1.0)).xyz;
-        vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
+//  position normals and vert
+    vECPos.xyz  = (u_mvMatrix*vec4(vert, 1.0)).xyz;
+    vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
 
-//      pass along the geo
-        gl_Position     = u_projMatrix * vec4(vECPos.xyz, 1.0);
-        
-        mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
+//  pass along the geo
+    gl_Position = u_projMatrix * vec4(vECPos.xyz, 1.0);
+
+    mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
      vShadowCoord    = shadowMat * vec4(vert, 1.0);
 }
 #endif
@@ -76,31 +76,31 @@ void main()
 
 void main()
 {
-        vNormal.w       = texcoord.x;
-        vECPos.w                = texcoord.y;
+    vNormal.w       = texcoord.x;
+    vECPos.w        = texcoord.y;
     vEyePos         = u_eye;
 
-//      position normals and vert
-        vECPos.xyz      = (u_mvMatrix*vec4(vert, 1.0)).xyz;
-        vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
+//  position normals and vert
+    vECPos.xyz  = (u_mvMatrix*vec4(vert, 1.0)).xyz;
+    vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
+
+//  pass along the geo
+    gl_Position = u_projMatrix * vec4(vECPos.xyz, 1.0);
 
-//      pass along the geo
-        gl_Position     = u_projMatrix * vec4(vECPos.xyz, 1.0);
-        
-        //mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
+    //mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
     //vShadowCoord    = shadowMat * vec4(vert, 1.0);
-     
+
     // normal mapping
-        vec3 normal = normalize(vNormal.xyz);
-
-        // create envmap coordinates
-        vec3 r = reflect( vec3(vECPos.xyz - u_eye.xyz), normal);
-        float m = 2.0 * length(r);
-        vEnvTexCoord = vec2(r.x/m + 0.5, r.y/m + 0.5);
-        
-        vec3 lightDirection = normalize(u_lightPos - vECPos.xyz);
-        vDiffuseIntensity = max(0.0, dot(normal, lightDirection));
-        
+    vec3 normal = normalize(vNormal.xyz);
+
+    // create envmap coordinates
+    vec3 r = reflect( vec3(vECPos.xyz - u_eye.xyz), normal);
+    float m = 2.0 * length(r);
+    vEnvTexCoord = vec2(r.x/m + 0.5, r.y/m + 0.5);
+
+    vec3 lightDirection = normalize(u_lightPos - vECPos.xyz);
+    vDiffuseIntensity = max(0.0, dot(normal, lightDirection));
+
 }
 
 #endif