Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 176 insertions, 175 deletions

diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 3462428f..25e40bac 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.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
@@ -140,15 +141,15 @@ exports.ViewUtils = Montage.create(Component, {
     },
 
     /*
-         *  This method will return a normal to a plane containing the Z axis and either the
-         *  x or y axis of the element.
-         */
-        getNormalToUnprojectedElementPlane:
-        {
+     *  This method will return a normal to a plane containing the Z axis and either the
+     *  x or y axis of the element.
+     */
+    getNormalToUnprojectedElementPlane:
+    {
         value: function( elt, axis,  localMode )
-                {
+        {
             var objMat = this.getMatrixFromElement(elt);
-                        var objMatInv = glmat4.inverse( objMat, [] );
+            var objMatInv = glmat4.inverse( objMat, [] );
 
             var xVec = [1,0,0];
             var yVec = [0,1,0];
@@ -157,55 +158,55 @@ exports.ViewUtils = Montage.create(Component, {
             var stage = this.application.ninja.currentDocument.model.documentRoot;
             var stageMat = this.getMatrixFromElement(stage);
 
-                        var mat = glmat4.multiply( stageMat, objMat, [] );
-                        
-                        var viewDir;
-                        if (localMode)
-                        {
-                                var matInv = glmat4.inverse( mat, [] );
-                                viewDir = MathUtils.transformVector( [0,0,1], matInv );
-                        }
-                        else
-                        {
-                                var stageInv = glmat4.inverse( stageMat, [] );
-                                viewDir = MathUtils.transformVector( [0,0,1],  stageInv );
-                        }
-
-                        var plane;
-                        var xDot, yDot, zDot;
-                        switch (axis)
-                        {
-                                case 0:
-                                        yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
-                                        zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir));
-                                        if(yDot > zDot)
-                                                plane = vecUtils.vecCross( 3, zVec, xVec );
-                                        else
-                                                plane = vecUtils.vecCross( 3, yVec, xVec );
-                                        break;
-                                        
-                                case 1:
-                                        xDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
-                                        zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir));
-                                        if(xDot > zDot)
-                                                plane = vecUtils.vecCross( 3, zVec, yVec );
-                                        else
-                                                plane = vecUtils.vecCross( 3, xVec, yVec );
-                                        break;
-                                        break;
-
-                                case 2:
-                                        xDot = Math.abs(vecUtils.vecDot(3, xVec, viewDir));
-                                        yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
-
-                                        if(xDot > yDot)
-                                                plane = vecUtils.vecCross( 3, yVec, zVec );
-                                        else
-                                                plane = vecUtils.vecCross( 3, xVec, zVec );
-                                        break;
-                        }
-
-                        if (localMode)  plane = MathUtils.transformVector( plane, objMat );
+            var mat = glmat4.multiply( stageMat, objMat, [] );
+
+            var viewDir;
+            if (localMode)
+            {
+                var matInv = glmat4.inverse( mat, [] );
+                viewDir = MathUtils.transformVector( [0,0,1], matInv );
+            }
+            else
+            {
+                var stageInv = glmat4.inverse( stageMat, [] );
+                viewDir = MathUtils.transformVector( [0,0,1],  stageInv );
+            }
+
+            var plane;
+            var xDot, yDot, zDot;
+            switch (axis)
+            {
+                case 0:
+                    yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
+                    zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir));
+                    if(yDot > zDot)
+                        plane = vecUtils.vecCross( 3, zVec, xVec );
+                    else
+                        plane = vecUtils.vecCross( 3, yVec, xVec );
+                    break;
+
+                case 1:
+                    xDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
+                    zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir));
+                    if(xDot > zDot)
+                        plane = vecUtils.vecCross( 3, zVec, yVec );
+                    else
+                        plane = vecUtils.vecCross( 3, xVec, yVec );
+                    break;
+                    break;
+
+                case 2:
+                    xDot = Math.abs(vecUtils.vecDot(3, xVec, viewDir));
+                    yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir));
+
+                    if(xDot > yDot)
+                        plane = vecUtils.vecCross( 3, yVec, zVec );
+                    else
+                        plane = vecUtils.vecCross( 3, xVec, zVec );
+                    break;
+            }
+
+            if (localMode)  plane = MathUtils.transformVector( plane, objMat );
 
             // The translation value is a point on the plane
             this.pushViewportObj( elt );
@@ -332,11 +333,11 @@ exports.ViewUtils = Montage.create(Component, {
         value: function( localPt,  elt ) {
             this.pushViewportObj( elt );
             var viewPt = this.screenToView( localPt[0], localPt[1], localPt[2] );
-                        if ((elt == null) || (elt === this._stageElement))
-                        {
-                                this.popViewportObj();
-                                return viewPt;
-                        }
+            if ((elt == null) || (elt === this._stageElement))
+            {
+                this.popViewportObj();
+                return viewPt;
+            }
             var mat = this.getMatrixFromElement( elt );
             var worldPt = MathUtils.transformPoint( viewPt, mat );
             var stageWorldPt = this.postViewToStageWorld( worldPt, elt );
@@ -571,7 +572,7 @@ exports.ViewUtils = Montage.create(Component, {
             return localPlane;
         }
     },
-    
+
     parentToChild: {
         value: function( parentPt, child,  passthrough ) {
             var pt = parentPt.slice(0);
@@ -620,7 +621,7 @@ exports.ViewUtils = Montage.create(Component, {
             return childPt;
         }
     },
-    
+
     parentToChildWorld: {
         value: function( parentPt, child ) {
             var pt = parentPt.slice(0);
@@ -694,7 +695,7 @@ exports.ViewUtils = Montage.create(Component, {
             return vec;
         }
     },
-    
+
     getElementBounds: {
         value: function( elt, localSpace ) {
             // optional argument localSpace, if true, puts the top left at (0,0).
@@ -876,7 +877,7 @@ exports.ViewUtils = Montage.create(Component, {
         }
     },
 
-    
+
     unproject: {
         value: function( pt ) {
             if(!this._perspectiveDist)
@@ -968,7 +969,7 @@ exports.ViewUtils = Montage.create(Component, {