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

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

1 files changed, 126 insertions, 126 deletions

diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 90a85d15..ae43076c 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -33,15 +33,15 @@ POSSIBILITY OF SUCH DAMAGE.
 //      Math Utility functions
 ///////////////////////////////////////////////////////////////////////
 var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
-        ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
-        Rectangle = require("js/helper-classes/3D/rectangle").Rectangle;
+    ViewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
+    Rectangle = require("js/helper-classes/3D/rectangle").Rectangle;
 
 var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
 //    VecUtils: { value: null, writable: true },
-    
+
     EPSILON: { value: 1.e-5, writable: true },
 
     // these are used in containment tests
@@ -61,7 +61,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
     // Vector Methods
     ///////////////////////////////////////////////////////////////////////
 
-        vecIntersectPlaneForParam: {
+    vecIntersectPlaneForParam: {
         value: function( pt0, vec, plane )
         {
             // declare the variable to return - undefined when there is no solution
@@ -82,7 +82,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecMag3: {
+    vecMag3: {
         value: function( vec )
         {
             if (vec.length < 3)  return;
@@ -92,7 +92,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecMag: {
+    vecMag: {
         value: function( dimen, vec )
         {
             var sum = 0.0;
@@ -102,7 +102,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecSubtract: {
+    vecSubtract: {
         value: function( a, b )
         {
             var rtnVec;
@@ -119,7 +119,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecAdd: {
+    vecAdd: {
         value: function( a, b )
         {
             var rtnVec;
@@ -136,7 +136,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        vecDist: {
+    vecDist: {
         value: function( a, b )
         {
             var sum;
@@ -176,7 +176,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        getPointOnPlane: {
+    getPointOnPlane: {
         value: function( plane )
         {
             // abreviate the plane equation
@@ -203,7 +203,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        transformPlane: {
+    transformPlane: {
         value: function( plane,  mat )
         {
             // we will project a point down one of the coordinate axes to find a point on the plane
@@ -213,7 +213,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
             // find a point on the plane
             var ptOnPlane = this.getPointOnPlane(plane);
 
-            ptOnPlane[3] = 1.0; // 4 dimen so we can transform it
+            ptOnPlane[3] = 1.0; // 4 dimen so we can transform it
 
             // transform the point
             //ptOnPlane = mat.multiply( ptOnPlane );
@@ -225,12 +225,12 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        transformHomogeneousPoint: {
+    transformHomogeneousPoint: {
         value: function( srcPt, mat )
         {
             var pt = srcPt.slice(0);
             this.makeDimension4( pt );
-            var x = VecUtils.vecDot(4,  pt, [mat[0], mat[4], mat[ 8], mat[12]] ),
+            var x = VecUtils.vecDot(4,  pt, [mat[0], mat[4], mat[ 8], mat[12]] ),
                     y = VecUtils.vecDot(4,  pt, [mat[1], mat[5], mat[ 9], mat[13]] ),
                     z = VecUtils.vecDot(4,  pt, [mat[2], mat[6], mat[10], mat[14]] ),
                     w = VecUtils.vecDot(4,  pt, [mat[3], mat[7], mat[11], mat[15]] );
@@ -239,7 +239,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        applyHomogeneousCoordinate: {
+    applyHomogeneousCoordinate: {
         value: function( hPt )
         {
             var w = hPt[3];
@@ -252,19 +252,19 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        transformAndDivideHomogeneousPoint: {
+    transformAndDivideHomogeneousPoint: {
         value: function( pt, mat )
         {
             return this.applyHomogeneousCoordinate( this.transformHomogeneousPoint(pt, mat) );
         }
     },
 
-        transformPoint: {
+    transformPoint: {
         value: function( srcPt, mat )
         {
             var pt = srcPt.slice(0);
             this.makeDimension3( pt );
-            var x = VecUtils.vecDot(3,  pt, [mat[0], mat[4], mat[ 8]] ) + mat[12],
+            var x = VecUtils.vecDot(3,  pt, [mat[0], mat[4], mat[ 8]] ) + mat[12],
                     y = VecUtils.vecDot(3,  pt, [mat[1], mat[5], mat[ 9]] ) + mat[13],
                     z = VecUtils.vecDot(3,  pt, [mat[2], mat[6], mat[10]] ) + mat[14];
 
@@ -272,11 +272,11 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        transformVector: {
+    transformVector: {
         value: function( vec, mat )
         {
             this.makeDimension3( vec );
-            var x = VecUtils.vecDot(3,  vec, [mat[0], mat[4], mat[ 8]] ),
+            var x = VecUtils.vecDot(3,  vec, [mat[0], mat[4], mat[ 8]] ),
                     y = VecUtils.vecDot(3,  vec, [mat[1], mat[5], mat[ 9]] ),
                     z = VecUtils.vecDot(3,  vec, [mat[2], mat[6], mat[10]] );
 
@@ -284,7 +284,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        interpolateLine3D: {
+    interpolateLine3D: {
         value: function( pt0, pt1, t )
         {
             var x0 = pt0[0],  y0 = pt0[1],  z0 = pt0[2],
@@ -444,7 +444,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
-        nearestPointOnLine2D: {
+    nearestPointOnLine2D: {
         value: function( linePt,  lineDir,  pt )
         {
             var vec = this.vecSubtract( pt, linePt );
@@ -458,7 +458,7 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },