Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

10 files changed, 3693 insertions, 3691 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 8292c469..c358108f 100755
--- a/js/helper-classes/3D/StageLine.js
+++ b/js/helper-classes/3D/StageLine.js
@@ -122,7 +122,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 );
@@ -194,14 +194,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 );
@@ -384,50 +384,51 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, {
                         if ((st0 >= 0) && (st1 >= 0))
                         {
                             //if (  (plane.isBackFacing() && (s1 < 0)) || (!plane.isBackFacing() && (s1 > 0))  )        // entering the material from the beginning of the line that is to be drawn
+                        if (s1 > 0) // entering the material from the beginning of the line that is to be drawn
                             if (s1 > 0)
+                        {
+                            // see if the start point of the line is at a corner of the bounded plane
+                            var lineDir = vecUtils.vecSubtract(3, pt1, pt0);
+                            vecUtils.vecNormalize(3, lineDir);
+                            var dist = vecUtils.vecDist( 3, pt0, bp1 );
+                            var bp2, bv0, bv1, cross1, cross2, cross3;
+                            if ( MathUtils.fpSign(dist) == 0)
                             {
-                                // see if the start point of the line is at a corner of the bounded plane
-                                var lineDir = vecUtils.vecSubtract(3, pt1, pt0);
-                                vecUtils.vecNormalize(3, lineDir);
-                                var dist = vecUtils.vecDist( 3, pt0, bp1 );
-                                var bp2, bv0, bv1, cross1, cross2, cross3;
-                                if ( MathUtils.fpSign(dist) == 0)
-                                {
-                                    bp2 = boundaryPts[(i+1) % 4];
-                                    bv0 = vecUtils.vecSubtract(3, bp2, bp1);
-                                    bv1 = vecUtils.vecSubtract(3, bp0, bp1);
-                                    cross1 = vecUtils.vecCross(3, bv0, lineDir);
-                                    cross2 = vecUtils.vecCross(3, lineDir, bv1);
-                                    cross3 = vecUtils.vecCross(3, bv0, bv1);
-                                    if ( (MathUtils.fpSign(vecUtils.vecDot(3, cross1, cross3)) == 0) && (MathUtils.fpSign(vecUtils.vecDot(3, cross2, cross3)) == 0))
-                                    {
-                                        gotEnter = true;
-                                        this.addIntersection( plane, t, 1 );
-                                    }
-                                }
-                                else if (MathUtils.fpSign( vecUtils.vecDist(3, pt0, bp0)) === 0)
+                                bp2 = boundaryPts[(i+1) % 4];
+                                bv0 = vecUtils.vecSubtract(3, bp2, bp1);
+                                bv1 = vecUtils.vecSubtract(3, bp0, bp1);
+                                cross1 = vecUtils.vecCross(3, bv0, lineDir);
+                                cross2 = vecUtils.vecCross(3, lineDir, bv1);
+                                cross3 = vecUtils.vecCross(3, bv0, bv1);
+                                if ( (MathUtils.fpSign(vecUtils.vecDot(3, cross1, cross3)) == 0) && (MathUtils.fpSign(vecUtils.vecDot(3, cross2, cross3)) == 0))
                                 {
-                                    bp2 = boundaryPts[(i+2) % 4];
-                                    bv0 = vecUtils.vecSubtract(3, bp2, bp0);
-                                    bv1 = vecUtils.vecSubtract(3, bp1, bp0);
-                                    cross1 = vecUtils.vecCross(3, bv0, lineDir);
-                                    cross2 = vecUtils.vecCross(3, lineDir, bv1);
-                                    cross3 = vecUtils.vecCross(3, bv0, bv1);
-                                    if ( (MathUtils.fpSign(vecUtils.vecDot(3, cross1, cross3)) == 0) && (MathUtils.fpSign(vecUtils.vecDot(3, cross2, cross3)) == 0))
-                                    {
-                                        gotEnter = true;
-                                        this.addIntersection( plane, t, 1 );
-                                    }
+                                    gotEnter = true;
+                                    this.addIntersection( plane, t, 1 );
                                 }
-                                else
+                            }
+                            else if (MathUtils.fpSign( vecUtils.vecDist(3, pt0, bp0)) === 0)
+                            {
+                                bp2 = boundaryPts[(i+2) % 4];
+                                bv0 = vecUtils.vecSubtract(3, bp2, bp0);
+                                bv1 = vecUtils.vecSubtract(3, bp1, bp0);
+                                cross1 = vecUtils.vecCross(3, bv0, lineDir);
+                                cross2 = vecUtils.vecCross(3, lineDir, bv1);
+                                cross3 = vecUtils.vecCross(3, bv0, bv1);
+                                if ( (MathUtils.fpSign(vecUtils.vecDot(3, cross1, cross3)) == 0) && (MathUtils.fpSign(vecUtils.vecDot(3, cross2, cross3)) == 0))
                                 {
-                                    // check if the line is on the edge of the boundary or goes to the interior
                                     gotEnter = true;