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

diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index b2c8e6b4..353ee185 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -50,7 +50,7 @@ exports.DrawingToolBase = Montage.create(Component, {
 
     /**
      * Used on the initial MouseDown for Drawing Tools
-     * 
+     *
      * Returns: An array containing:
      *          0 - HitRec point
      *          1 - X value converted to screen point
@@ -58,32 +58,32 @@ exports.DrawingToolBase = Montage.create(Component, {
      */
     getInitialSnapPoint: {
         value: function(x, y, shapeCanvas)
-                {
+        {
             // update the snap settings
-                        snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
-                        snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
-                        snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
+            snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
+            snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
+            snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
 
-                        // do the snap
-                        this.dragPlane = null;
+            // do the snap
+            this.dragPlane = null;
             var hitRec = snapManager.snap(x, y,  true);
-                        if (hitRec) {
-                                if (shapeCanvas)
-                                {
-                                        this.dragPlane = viewUtils.getUnprojectedElementPlane( shapeCanvas );
-                                        snapManager.setupDragPlaneFromPlane( this.dragPlane );
-                                }
-                                else
-                                {
-                                        this.dragPlane = snapManager.setupDragPlanes( hitRec, true );
-                                }
-//                              console.log( "drag plane: " + this.dragPlane );
-
-                                var wpHitRec = hitRec.convertToWorkingPlane( this.dragPlane );
-                                var pt = hitRec.getScreenPoint();
+            if (hitRec) {
+                if (shapeCanvas)
+                {
+                    this.dragPlane = viewUtils.getUnprojectedElementPlane( shapeCanvas );
+                    snapManager.setupDragPlaneFromPlane( this.dragPlane );
+                }
+                else
+                {
+                    this.dragPlane = snapManager.setupDragPlanes( hitRec, true );
+                }
+//              console.log( "drag plane: " + this.dragPlane );
+
+                var wpHitRec = hitRec.convertToWorkingPlane( this.dragPlane );
+                var pt = hitRec.getScreenPoint();
 
                 return( [wpHitRec, pt[0], pt[1]] );
-                        }
+            }
         }
     },
 
@@ -93,27 +93,27 @@ exports.DrawingToolBase = Montage.create(Component, {
     getUpdatedSnapPoint: {
         value: function(x,y, snap3d, downHitRec) {
             // update the snap settings
-                        snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
-                        snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
-                        snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
-
-                        var hitRec = snapManager.snap(x, y, snap3d );
-                        if (hitRec) {
-//                              if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
-//                                      hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
-//                              }
+            snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
+            snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() );
+            snapManager.enableGridSnap( snapManager.gridSnapEnabledAppLevel() );
+
+            var hitRec = snapManager.snap(x, y, snap3d );
+            if (hitRec) {
+//              if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
+//                  hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
+//              }
 //
-//                              if(downHitRec !== null) {
-//                                      // if we are working off-plane, do a snap to the projected locations of the geometry
-//                                      var thePlane = workingPlane;
-//                                      if (snapManager.hasDragPlane())
-//                                      {
-//                                              thePlane = snapManager.getDragPlane();
-//                                      }
+//              if(downHitRec !== null) {
+//                  // if we are working off-plane, do a snap to the projected locations of the geometry
+//                  var thePlane = workingPlane;
+//                  if (snapManager.hasDragPlane())
+//                  {
+//                      thePlane = snapManager.getDragPlane();
+//                  }
 //
 //                    // Return the up HitRec
 //                    return hitRec;
-//                              } else {
+//              } else {
 //                    return null;
 //                }
                 if(downHitRec) {
@@ -130,24 +130,24 @@ exports.DrawingToolBase = Montage.create(Component, {
         value: function(x,y, snap3d, downHitRec) {
 
 
-                        // do the first snap
-                        var hitRec = snapManager.snap(x, y, snap3d );
-                        if (hitRec) {
-                                if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
-                                        hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
-                                }
+            // do the first snap
+            var hitRec = snapManager.snap(x, y, snap3d );
+            if (hitRec) {
+                if ((hitRec.getType() !== hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
+                    hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
+                }
 
-                                if(downHitRec !== null) {
-                                        // if we are working off-plane, do a snap to the projected locations of the geometry
-                                        var thePlane = workingPlane;
-                                        if (snapManager.hasDragPlane())
-                                        {
-                                                thePlane = snapManager.getDragPlane();
-                                        }
+                if(downHitRec !== null) {
+                    // if we are working off-plane, do a snap to the projected locations of the geometry
+                    var thePlane = workingPlane;
+                    if (snapManager.hasDragPlane())
+                    {
+                        thePlane = snapManager.getDragPlane();
+                    }
 
                     // Return the up HitRec
                     return hitRec;
-                                } else {
+                } else {
                     return null;
                 }
             }
@@ -156,20 +156,20 @@ exports.DrawingToolBase = Montage.create(Component, {
 
 
     setDownHitRec: {
-                value: function (x, y, do3DSnap) {
-                        var hitRec = snapManager.snap(x, y, do3DSnap );
-                        if (hitRec) {
-                                if ((hitRec.getType() != hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
-                                        //hitRec = hitRec.convertToWorkingPlane( workingPlane );
-                                        snapManager.setupDragPlanes(hitRec);
-                                        hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
-                                }
+        value: function (x, y, do3DSnap) {
+            var hitRec = snapManager.snap(x, y, do3DSnap );
+            if (hitRec) {
+                if ((hitRec.getType() != hitRec.SNAP_TYPE_STAGE) && !hitRec.isSomeGridTypeSnap()) {
+                    //hitRec = hitRec.convertToWorkingPlane( workingPlane );
+                    snapManager.setupDragPlanes(hitRec);
+                    hitRec = hitRec.convertToWorkingPlane( snapManager.getDragPlane() );
+                }
 
-                    return hitRec;
+            return hitRec;
 
-                        }
-                }
-        },
+            }
+        }
+    },
 
     drawSnapLastHit: {
         value: function() {
@@ -208,97 +208,97 @@ exports.DrawingToolBase = Montage.create(Component, {
 
     getCompletePoints: {
         value: function(hitRec0, hitRec1) {
-                        if (hitRec0 && hitRec1) {
-
-                                // get the 2 snap points in plane space
-                                var p0 = hitRec0.getLocalPoint(),
-                                        p1 = hitRec1.getLocalPoint();
-
-                                var stageOffset = viewUtils.getElementOffset(this.application.ninja.currentDocument.model.documentRoot);
-                                viewUtils.setViewportObj(this.application.ninja.currentDocument.model.documentRoot);
-
-                                // get the matrix taking the local hit point in plane space
-                                // to world space of whatever element it is in.
-                                var planeMat = hitRec0.getPlaneMatrix();
-
-                                // get the center of the circle in stage world space
-                                var s0 = viewUtils.postViewToStageWorld( MathUtils.transformPoint(p0,hitRec0.getPlaneMatrix()), hitRec0.getElt() ),
-                                        s1 = viewUtils.postViewToStageWorld( MathUtils.transformPoint(p1,hitRec1.getPlaneMatrix()), hitRec1.getElt() );
-
-                                // apply the projected snap points
-                                var s0Proj = false,  s1Proj = false;
+            if (hitRec0 && hitRec1) {
+
+                // get the 2 snap points in plane space
+                var p0 = hitRec0.getLocalPoint(),
+                    p1 = hitRec1.getLocalPoint();
+
+                var stageOffset = viewUtils.getElementOffset(this.application.ninja.currentDocument.model.documentRoot);
+                viewUtils.setViewportObj(this.application.ninja.currentDocument.model.documentRoot);
+
+                // get the matrix taking the local hit point in plane space
+                // to world space of whatever element it is in.
+                var planeMat = hitRec0.getPlaneMatrix();
+
+                // get the center of the circle in stage world space
+                var s0 = viewUtils.postViewToStageWorld( MathUtils.transformPoint(p0,hitRec0.getPlaneMatrix()), hitRec0.getElt() ),
+                    s1 = viewUtils.postViewToStageWorld( MathUtils.transformPoint(p1,hitRec1.getPlaneMatrix()), hitRec1.getElt() );
+
+                // apply the projected snap points
+                var s0Proj = false,  s1Proj = false;