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

diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index 6ce28ae4..f1094771 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -47,17 +47,17 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     this._defaultColorStop2 = 0.3;
     this._defaultColorStop3 = 0.6;
     this._defaultColorStop4 = 1.0;
-    //  this._defaultColorCount = 4;
+    //  this._defaultColorCount = 4;
 
-        this._textureTransform = [1,0,0, 0,1,0, 0,0,1];
+    this._textureTransform = [1,0,0, 0,1,0, 0,0,1];
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    
 
-    this.isAnimated             = function ()   {  return false;                                                };
-        this.getShaderDef       = function()    {  return radialGradientMaterialDef;    };
+
+    this.isAnimated     = function ()   {  return false;                        };
+    this.getShaderDef   = function()    {  return radialGradientMaterialDef;    };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
@@ -95,12 +95,12 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
         this._materialNode.setShader(this._shader);
 
         // set the shader values in the shader
-                this._shader['default'].u_texTransform.set( this._textureTransform );
+        this._shader['default'].u_texTransform.set( this._textureTransform );
         this.setShaderValues();
     };
 
         this.resetToDefault = function()
-        {
+    {
                 this._propValues[this._propNames[0]] = this._defaultColor1.slice(0);
                 this._propValues[this._propNames[1]] = this._defaultColor2.slice(0);
                 this._propValues[this._propNames[2]] = this._defaultColor3.slice(0);
@@ -119,36 +119,36 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
 
         this.fitToBounds = function( bounds )
         {
-                if (bounds)
-                {
-                        var dx = Math.abs( bounds[3] - bounds[0] ),
-                                dy = Math.abs( bounds[4] - bounds[1] );
-                        if (dy == 0)  dy = 1.0;
-                        if (dx == 0)  dx = 1.0;
-                        var xScale = 2.0, yScale = 2.0;
-                        if (dx > dy)
-                                yScale *= dy/dx;
-                        else
-                                xScale *= dx/dy;
-
-                        // build the matrix - the translation to the origin, the scale,
-                        // and the translation back to the center (hard coded at (0.5, 0.5) for now).
-                        // the matrix is build directly instead of with matrix multiplications
-                        // for efficiency, not to mention that the multiplication function does
-                        // not exist for mat3's.
-                        // the matrix as laid out below looks transposed - order is columnwise.
-                        var xCtr = 0.5,  yCtr = 0.5;
-                        this._textureTransform = [
-                                                                                                         xScale,                0.0,  0.0,
-                                                                                                                0.0,             yScale,  0.0,
-                                                                                        xCtr*(1-xScale),  yCtr*(1 - yScale),  1.0
-                                                                        ];
-                        
-                        if (this._shader && this._shader['default'])
-                                this._shader['default'].u_texTransform.set( this._textureTransform );   
+        if (bounds)
+        {
+            var dx = Math.abs( bounds[3] - bounds[0] ),
+                dy = Math.abs( bounds[4] - bounds[1] );
+            if (dy == 0)  dy = 1.0;
+            if (dx == 0)  dx = 1.0;
+            var xScale = 2.0, yScale = 2.0;
+            if (dx > dy)
+                yScale *= dy/dx;
+            else
+                xScale *= dx/dy;
+
+            // build the matrix - the translation to the origin, the scale,
+            // and the translation back to the center (hard coded at (0.5, 0.5) for now).
+            // the matrix is build directly instead of with matrix multiplications
+            // for efficiency, not to mention that the multiplication function does
+            // not exist for mat3's.
+            // the matrix as laid out below looks transposed - order is columnwise.
+            var xCtr = 0.5,  yCtr = 0.5;
+            this._textureTransform = [
+                                                     xScale,                0.0,  0.0,
+                                                        0.0,             yScale,  0.0,
+                                            xCtr*(1-xScale),  yCtr*(1 - yScale),  1.0
+                                    ];
+
+            if (this._shader && this._shader['default'])
+                this._shader['default'].u_texTransform.set( this._textureTransform );
 
-                }
-        };
+        }
+    };
 
         this.fitToPrimitiveArray = function( primArray )
         {
@@ -180,10 +180,10 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
                 this.fitToBounds( bounds );
         };
 
-        this.customExport = function( jObj )
-        {
-                jObj.u_texTransform = this._textureTransform.slice();
-                return jObj;
+    this.customExport = function( jObj )
+    {
+        jObj.u_texTransform = this._textureTransform.slice();
+        return jObj;
         };
 
     // Only Linear Gradient and Radial Gradient have gradient data.
@@ -203,12 +203,12 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
             color = this.getProperty('u_color'+i);
             colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
             css += ', rgba(' + colorStr + ') ' + Math.round(this.getProperty('u_colorStop'+i)*100) + '%';
-        }
+    }
 
         css += ')';
 
         return css;
-    };
+};
 
     this.setGradientData = function(colors) {
         var len = colors.length;
@@ -234,48 +234,48 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var radialGradientMaterialDef =
 { 'shaders':
-        {
-            'defaultVShader': "assets/shaders/radialGradient.vert.glsl",
-            'defaultFShader': "assets/shaders/radialGradient.frag.glsl"
-        },
+    {
+        'defaultVShader': "assets/shaders/radialGradient.vert.glsl",
+        'defaultFShader': "assets/shaders/radialGradient.frag.glsl"
+    },
     'techniques':
-        {
-            'default':
-                [
-                        {
-                            'vshader': 'defaultVShader',
-                            'fshader': 'defaultFShader',
-                            // attributes
-                            'attributes':
-                                {
-                                    'vert': { 'type': 'vec3' },
-                                    'normal': { 'type': 'vec3' },
-                                    'texcoord': { 'type': 'vec2' }
-                                },
-                            // parameters
-                            'params':
-                                {
-                                    'u_color1': { 'type': 'vec4' },
-                                    'u_color2': { 'type': 'vec4' },
-                                    'u_color3': { 'type': 'vec4' },
-                                    'u_color4': { 'type': 'vec4' },
-                                    'u_colorStop1': { 'type': 'float' },
-                                    'u_colorStop2': { 'type': 'float' },
-                                    'u_colorStop3': { 'type': 'float' },
-                                    'u_colorStop4': { 'type': 'float' },
+    {
+        'default':
+        [
+            {
+                'vshader': 'defaultVShader',
+                'fshader': 'defaultFShader',
+                // attributes
+                'attributes':
+                {
+                    'vert': { 'type': 'vec3' },
+                    'normal': { 'type': 'vec3' },
+                    'texcoord': { 'type': 'vec2' }
+                },
+                // parameters
+                'params':
+                {
+                    'u_color1': { 'type': 'vec4' },
+                    'u_color2': { 'type': 'vec4' },
+                    'u_color3': { 'type': 'vec4' },
+                    'u_color4': { 'type': 'vec4' },
+                    'u_colorStop1': { 'type': 'float' },
+                    'u_colorStop2': { 'type': 'float' },
+                    'u_colorStop3': { 'type': 'float' },
+                    'u_colorStop4': { 'type': 'float' },