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>

10 files changed, 3830 insertions, 3830 deletions

diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js
index 71ee81f4..ec2d6d57 100755
--- a/js/helper-classes/3D/LinePlaneIntersectRec.js
+++ b/js/helper-classes/3D/LinePlaneIntersectRec.js
@@ -60,17 +60,17 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object
     getElementPlanes: { value: function()        {  return this._elementPlanes;  } },
     setElementPlanes: { value: function(p)       {  this._elementPlanes = p;     } },
 
-        getT: { value: function()               {  return this._t;                              } },
-        setT: { value: function(t)              {  this._t = t;                                 } },
+    getT: { value: function()       {  return this._t;              } },
+    setT: { value: function(t)      {  this._t = t;                 } },
 
-        setDeltaVis: { value: function(d)       {  this._deltaVis = d;          } },
-        getDeltaVis: { value: function()        {  return this._deltaVis;       } },
+    setDeltaVis: { value: function(d)       {  this._deltaVis = d;          } },
+    getDeltaVis: { value: function()        {  return this._deltaVis;       } },
 
-        setNext: { value: function(n)           {  this._next = n;                              } },
-        getNext: { value: function()            {  return this._next;                   } },
+    setNext: { value: function(n)       {  this._next = n;              } },
+    getNext: { value: function()        {  return this._next;           } },
 
-        getPrev: { value: function()            {  return this._prev;                   } },
-        setPrev: { value: function(p)           {  this._prev = p;                              } }
+    getPrev: { value: function()        {  return this._prev;           } },
+    setPrev: { value: function(p)       {  this._prev = p;              } }
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
diff --git a/js/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js
index 1922bd91..15f812ab 100755
--- a/js/helper-classes/3D/Rectangle.js
+++ b/js/helper-classes/3D/Rectangle.js
@@ -67,7 +67,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
     getHeight: { value: function()        {  return this.m_height;                    } },
     setHeight: { value: function(h)       {  this.m_height = h;                       } },
 
-        geomType: { value: function()           {  return this.GEOM_TYPE_RECTANGLE;                     } },
+    geomType: { value: function()       {  return this.GEOM_TYPE_RECTANGLE;         } },
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
@@ -84,7 +84,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        dup: {
+    dup: {
         value: function()
         {
             var rtnRec = Object.create(Rectangle, {});
@@ -122,7 +122,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        setToBounds: {
+    setToBounds: {
         value: function( bounds )
         {
             var pt = bounds[0];
@@ -166,7 +166,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
         }
     },
 
-        getQuadrant: {
+    getQuadrant: {
         value: function( iQuad )
         {
             // quadrant ordering starts at upper left and continues around counter-clockwise
@@ -220,7 +220,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
             this.setTop( yMin );    this.setHeight( yMax - yMin );
         }
     },
-    
+
 
     translate: {
         value: function( dx, dy )
diff --git a/js/helper-classes/3D/StageLine.js b/js/helper-classes/3D/StageLine.js
index aaa9f95d..b869fb17 100755
--- a/js/helper-classes/3D/StageLine.js
+++ b/js/helper-classes/3D/StageLine.js
@@ -120,7 +120,7 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, {
                         // add the intersection
                         var dot = MathUtils.dot3( pt0, planeEq ) + planeEq[3];
                         var deltaVis = (dot > 0) ? 1 : -1;
-//                                      if (plane.isBackFacing())
+//                  if (plane.isBackFacing())
 //                        deltaVis = (dot < 0) ? 1 : -1;
 
                         this.addIntersection( plane, t, deltaVis );
@@ -175,14 +175,14 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, {
                     MathUtils.negate( vec );
                 planeEq = [-vec[1], vec[0], 0];
                 var normal = [planeEq[0], planeEq[1], planeEq[2]];
-//                      var d = -planeEq.dot(bPt0);
+//          var d = -planeEq.dot(bPt0);
                 var d = -vecUtils.vecDot(3, planeEq, bPt0);
                 planeEq[3] = d;
 
                 t = MathUtils.vecIntersectPlaneForParam( pt0, lineDir, planeEq );
                 if (t)
                 {
-                    if ((MathUtils.fpSign(t) > 0) && (MathUtils.fpCmp(t,1.0) <= 0))     // the strict vs not-strict inequality comparisons are IMPORTANT!
+                    if ((MathUtils.fpSign(t) > 0) && (MathUtils.fpCmp(t,1.0) <= 0)) // the strict vs not-strict inequality comparisons are IMPORTANT!
                     {
                         // get the intersection point
                         var pt = MathUtils.interpolateLine3D( pt0, pt1, t );
@@ -207,47 +207,47 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, {
         }
     },
 
-        doCoplanarIntersection: {
-                value: function( plane )
-                {
-                        // get the boundary points for the plane
-                        var boundaryPts = plane.getBoundaryPoints();
-                        var planeEq = plane.getPlaneEq();
-
-                        if (plane.isBackFacing())
-                        {
-                                var tmp;
-                                tmp = boundaryPts[0];  boundaryPts[0] = boundaryPts[3];  boundaryPts[3] = tmp;
-                                tmp = boundaryPts[1];  boundaryPts[1] = boundaryPts[2];  boundaryPts[2] = tmp;
-                        }
-
-                        var pt0 = this.getPoint0(),
-                                pt1 = this.getPoint1();
-
-                        // keep a couple flags to prevent counting crossings twice in edge cases
-                        var gotEnter = false,
-                                        gotExit = false;
-
-                        var bp1 = boundaryPts[3];
-                        for (var i=0;  i<4;  i++)
-                        {
-                                var bp0 = bp1;
-                                bp1 = boundaryPts[i];
-                                var vec = vecUtils.vecSubtract(3, bp1, bp0);
-                                var nrm = vecUtils.vecCross(3, vec, planeEq);
-                                nrm[3] = -vecUtils.vecDot(3, bp0, nrm);
-
-                                var d0 = vecUtils.vecDot(3, nrm, pt0) + nrm[3],
-                                                d1 = vecUtils.vecDot(3, nrm, pt1) + nrm[3];
-
-                                var s0 = MathUtils.fpSign(d0),
-                                                s1 = MathUtils.fpSign(d1);
-
-                                if (s0 != s1)
-                                {
-                                        var t = Math.abs(d0)/( Math.abs(d0) + Math.abs(d1) );
+    doCoplanarIntersection: {
+        value: function( plane )
+        {
+            // get the boundary points for the plane
+            var boundaryPts = plane.getBoundaryPoints();
+            var planeEq = plane.getPlaneEq();
+
+            if (plane.isBackFacing())
+            {
+                var tmp;
+                tmp = boundaryPts[0];  boundaryPts[0] = boundaryPts[3];  boundaryPts[3] = tmp;
+                tmp = boundaryPts[1];  boundaryPts[1] = boundaryPts[2];  boundaryPts[2] = tmp;
+            }
+
+            var pt0 = this.getPoint0(),
+                pt1 = this.getPoint1();
+
+            // keep a couple flags to prevent counting crossings twice in edge cases
+            var gotEnter = false,
+                    gotExit = false;
+
+            var bp1 = boundaryPts[3];
+            for (var i=0;  i<4;  i++)
+            {
+                var bp0 = bp1;
+                bp1 = boundaryPts[i];
+                var vec = vecUtils.vecSubtract(3, bp1, bp0);
+                var nrm = vecUtils.vecCross(3, vec, planeEq);
+                nrm[3] = -vecUtils.vecDot(3, bp0, nrm);
+
+                var d0 = vecUtils.vecDot(3, nrm, pt0) + nrm[3],
+                        d1 = vecUtils.vecDot(3, nrm, pt1) + nrm[3];
+
+                var s0 = MathUtils.fpSign(d0),
+                        s1 = MathUtils.fpSign(d1);
+
+                if (s0 != s1)
+                {
+                    var t = Math.abs(d0)/( Math.abs(d0) + Math.abs(d1) );
                                         if (MathUtils.fpSign(t) === 0)
-                                        {
+                    {
                                                 // the first point of the line is on the (infinite) extension of a side of the boundary.