Expand tabs

1 files changed, 158 insertions, 158 deletions

diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index 60dcdc6a..6e805e28 100755
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -41,7 +41,7 @@ var Montage = require("montage/core/core").Montage,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
-        _canSnap: { value: false },
+    _canSnap: { value: false },
 
     _inLocalMode: { value: true, enumerable: true },
 
@@ -59,20 +59,20 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 selectedElements = [this.application.ninja.currentDocument.model.documentRoot];
             }
 
-                        this._mouseDownHitRec = null;
-                        this._mouseUpHitRec   = null;
+            this._mouseDownHitRec = null;
+            this._mouseUpHitRec   = null;
 
-                        snapManager.clearAvoidList();
-                        snapManager.clearDragPlane();
+            snapManager.clearAvoidList();
+            snapManager.clearDragPlane();
 
-                        // the translate tool does snap align to the bounds of the object only.
-                        // turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
-                        snapManager.enableSnapAlign( false );
+            // the translate tool does snap align to the bounds of the object only.
+            // turn off snap align to the cursor.  This needs to be re-enabled in the mouse up method
+            snapManager.enableSnapAlign( false );
 
-                        // snap to element and snap to grid are conditionally enabled based
-                        // on the snap results of the mouse down.  enable everything for the first snap
-                        this._snapToElements = snapManager.elementSnapEnabledAppLevel();
-                        this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
+            // snap to element and snap to grid are conditionally enabled based
+            // on the snap results of the mouse down.  enable everything for the first snap
+            this._snapToElements = snapManager.elementSnapEnabledAppLevel();
+            this._snapToGrid = snapManager.gridSnapEnabledAppLevel();
 
             this._dragPlane = null;
             this._clickedOnStage = false;
@@ -80,8 +80,8 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 
             if(this._handleMode === null)
             {
-                snapManager.enableElementSnap   ( true  );
-                                snapManager.enableGridSnap              ( true  );
+                snapManager.enableElementSnap   ( true  );
+                snapManager.enableGridSnap      ( true  );
             }
 //            else
 //            {
@@ -93,8 +93,8 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 //                    snapManager.setupDragPlaneFromPlane(this._dragPlane);
 //                    do3DSnap = false;
 
-//                    snapManager.enableElementSnap     ( false );
-//                    snapManager.enableGridSnap                ( false );
+//                    snapManager.enableElementSnap ( false );
+//                    snapManager.enableGridSnap        ( false );
 //                }
 //            }
 
@@ -103,9 +103,9 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas,
                                                                 new WebKitPoint(event.pageX, event.pageY));
 
-                                // do the snap before setting up the avoid list to allow
-                                // a snap on the mouse down
-                                var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
+                // do the snap before setting up the avoid list to allow
+                // a snap on the mouse down
+                var hitRec = snapManager.snap(point.x, point.y, do3DSnap);
 
 //                if(this._handleMode === 2)
 //                {
@@ -134,18 +134,18 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 //                {
 //                    snapManager.addToAvoidList( this._targets[i].elt );
 //                }
-                                if (hitRec)
-                                {
-                                        // disable snap attributes
-                                        if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
-                                        {
-                                                this._snapToElements = false;
-                                                this._snapToGrid = false;
-                                        }
-                                        else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
-                                        {
-                                                snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
-                                        }
+                if (hitRec)
+                {
+                    // disable snap attributes
+                    if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT)
+                    {
+                        this._snapToElements = false;
+                        this._snapToGrid = false;
+                    }
+                    else if (hitRec.getType() == hitRec.SNAP_TYPE_ELEMENT_CENTER)
+                    {
+                        snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() );
+                    }
 
                     if(this._handleMode === 0)
                         this.clickedObject = this._target;
@@ -170,20 +170,20 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                     // no quadrant snapping for the rotate tool
                     this._shouldUseQuadPt = false;
 
-                                        var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
-                                        this._mouseDownHitRec = wpHitRec;
-                                        this._mouseUpHitRec = null;
+                    var wpHitRec = hitRec.convertToWorkingPlane( this._dragPlane );
+                    this._mouseDownHitRec = wpHitRec;
+                    this._mouseUpHitRec = null;
 
-                                        var pt = hitRec.getScreenPoint();
-                                        this.downPoint.x = pt[0];
-                                        this.downPoint.y = pt[1];
-                                        this.downPoint.z = pt[2];
+                    var pt = hitRec.getScreenPoint();
+                    this.downPoint.x = pt[0];
+                    this.downPoint.y = pt[1];
+                    this.downPoint.z = pt[2];
 
                     // TODO - need to figure out snapManager dependency by drawUtils.
                     // For now, bypassing by calling snapManager.drawLastHit();
-//                                      drawUtils.refreshDisplay();
+//                  drawUtils.refreshDisplay();
 //                    snapManager.drawLastHit();
-                                }
+                }
             }
             else
             {
@@ -231,9 +231,9 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 }
             }
 
-                        this.DrawHandles(this._delta);
+            this.DrawHandles(this._delta);
             
-                        if(this._canSnap)
+            if(this._canSnap)
             {
                 snapManager.drawLastHit();
             }
@@ -261,23 +261,23 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                     this._origin[1] = pt1.y;
                     this._origin[2] = pt1.z;
 
-                                        var sw2gMat = viewUtils.getStageWorldToGlobalMatrix();
-                                        var g2swMat = glmat4.inverse( sw2gMat, [] );
-                                        var swOrigin = MathUtils.transformAndDivideHomogeneousPoint( this._origin, g2swMat );
-                                        //console.log( "modifyElements, _origin: " + this._origin + ", in stageWorld: " + swOrigin );
+                    var sw2gMat = viewUtils.getStageWorldToGlobalMatrix();
+                    var g2swMat = glmat4.inverse( sw2gMat, [] );
+                    var swOrigin = MathUtils.transformAndDivideHomogeneousPoint( this._origin, g2swMat );
+                    //console.log( "modifyElements, _origin: " + this._origin + ", in stageWorld: " + swOrigin );
 
                     var len = selectedElements.length;
                     if(len === 1)
                     {
                         var elt = selectedElements[0];
-                                                var g2lMat = elt.elementModel.getProperty("g2l");
-                                                var localOrigin = MathUtils.transformAndDivideHomogeneousPoint( this._origin, g2lMat );
-
-                                                viewUtils.pushViewportObj( elt );
-                                                var viewOrigin = viewUtils.screenToView( localOrigin[0], localOrigin[1], localOrigin[2] );
-                                                viewUtils.popViewportObj();
-                                                this._startOriginArray[0] = viewOrigin;
-                                                //console.log( "Rotate3DToolBase.modifyElements, _startOriginArray[0]: " + this._startOriginArray[0] );
+                        var g2lMat = elt.elementModel.getProperty("g2l");
+                        var localOrigin = MathUtils.transformAndDivideHomogeneousPoint( this._origin, g2lMat );
+
+                        viewUtils.pushViewportObj( elt );
+                        var viewOrigin = viewUtils.screenToView( localOrigin[0], localOrigin[1], localOrigin[2] );
+                        viewUtils.popViewportObj();
+                        this._startOriginArray[0] = viewOrigin;
+                        //console.log( "Rotate3DToolBase.modifyElements, _startOriginArray[0]: " + this._startOriginArray[0] );
                     }
 
                     this.downPoint.x = pt1.x;
@@ -351,7 +351,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
 
             if(this._inLocalMode && (this.application.ninja.selectedElements.length === 1 || this.rotateStage) )
             {
-//                              console.log( "modifyElements: rotateLocally " );
+//              console.log( "modifyElements: rotateLocally " );
                 this._rotateLocally(mat);
             }
             else
@@ -379,8 +379,8 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
                 // pre-translate by the transformation center
                 var tMat = Matrix.I(4);
 
-                                // _startOriginArray is the location of the center of rotation
-                                // in view space of the element.  
+                // _startOriginArray is the location of the center of rotation
+                // in view space of the element.  
                 var transformCtr = this._startOriginArray[i];