Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal

Conflicts:
	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
	js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 206 insertions, 195 deletions

diff --git a/js/helper-classes/3D/StageLine.js b/js/helper-classes/3D/StageLine.js
index 787a4568..5aaa325a 100755
--- a/js/helper-classes/3D/StageLine.js
+++ b/js/helper-classes/3D/StageLine.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -120,7 +121,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 +176,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,184 +208,194 @@ 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) );
-                                        if (t == 0)
-                                        {
-                                                if (s1 > 0)     // entering the material from the beginning of the line that is to be drawn
-                                                {
-                                                        // 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+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 );
-                                                                }
-                                                        }
-                                                        else
-                                                        {
-                                                                // check if the line is on the edge of the boundary or goes to the interior
-                                                                gotEnter = true;
-                                                                this.addIntersection( plane, t, 1 );
-                                                        }
-                                                }
-                                        }
-                                        else if ( (MathUtils.fpSign(t) > 0) && (MathUtils.fpCmp(t,1.0) <= 0))
-                                        {
-                                                // get the point where the line crosses the edge of the element plane
-                                                var pt = MathUtils.interpolateLine3D(pt0, pt1, t );
-
-                                                // we know that the line crosses the infinite extension of the edge.  Determine
-                                                // if that crossing is within the bounds of the edge
-                                                var dot0 = vecUtils.vecDot(3, vecUtils.vecSubtract(3,pt, bp0),  vec),
-                                                                dot1 = vecUtils.vecDot(3, vecUtils.vecSubtract(3,pt, bp1),  vec);
-                                                if ((MathUtils.fpSign(dot0) > 0) && (MathUtils.fpSign(dot1) < 0))
-                                                {
-                                                        // determine if the line is entering or exiting
+    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.
+                                                // Make sure the point (pt0) is within the range of the polygon edge
+                                                var vt0 = vecUtils.vecSubtract(3, pt0, bp0),
+                                                        vt1 = vecUtils.vecSubtract(3, bp1, pt0);
+                                                var dt0 = vecUtils.vecDot(3, vec, vt0),
+                                                        dt1 = vecUtils.vecDot(3, vec, vt1);
+                                                var st0 = MathUtils.fpSign(dt0),  st1 = MathUtils.fpSign(dt1);
+                                                if ((st0 >= 0) && (st1 >= 0))