6 files changed, 159 insertions, 54 deletions

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index e139af97..00b72490 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -519,6 +519,36 @@ exports.Stage = Montage.create(Component, {
     },
 
     /**
+     * GetSelectableElement: Returns a selectable object (direct child of current container) at clicked point
+     *
+     * @param: X,Y
+     * @return: Returns the current container if the the X,Y hits an element in the exclusion list
+     */
+    GetSelectableElement: {
+        value: function(pos) {
+            var item = this.GetElement(pos);
+            if(this.application.ninja.currentDocument.inExclusion(item) !== -1) {
+                return this.application.ninja.currentSelectedContainer;
+            }
+            var activeContainerId = this.application.ninja.currentSelectedContainer.uuid;
+            if(item.parentNode.uuid === activeContainerId) {
+                return item;
+            } else {
+                var outerElement = item.parentNode;
+
+                while(outerElement.parentNode && outerElement.parentNode.uuid !== activeContainerId) {
+                    // If element is higher up than current container then return
+                    if(outerElement.id === "UserContent") return;
+                    // else keep going up the chain
+                    outerElement = outerElement.parentNode;
+                }
+
+                return outerElement;
+            }
+        }
+    },
+
+    /**
      * GetElement: Returns the object under the X,Y coordinates passed as an obj with x,y
      *
      * @param: X,Y
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 5f48f74d..f9411f48 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -205,12 +205,12 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             {
                 this._handleMode = null;
                 this._delta = null;
-                this.DrawHandles();
             }
 
             this.endDraw(event);
             this._canSnap = true;
             this._use3DMode = false;
+            this.DrawHandles();
         }
     },
 
@@ -577,6 +577,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             {
                 // form the translation vector and post translate the matrix by it.
                 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 );
+                delta[2] = 0;
                 var transMat = Matrix.Translation( delta );
                 this._moveElements(transMat);
             }
@@ -710,7 +711,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
             {
                 return;
             }
-            if(this._target && this._handles)
+            if(this._target && this._handles && (this._targets.length === 1))
             {
                 var len = this._handles.length;
                 var i = 0,
diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js
index 24a68ad1..07b6d04d 100755
--- a/js/tools/Translate3DToolBase.js
+++ b/js/tools/Translate3DToolBase.js
@@ -18,6 +18,7 @@ var Montage = require("montage/core/core").Montage,
 exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 {
         _inLocalMode: { value: true, enumerable: true },
+        _clickedOnStage: { value: false },
 
         HandleDoubleClick : {
            value : function()
@@ -47,17 +48,33 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                         delta[1] = 0;
                         break;
                 }
+                if( (this.application.ninja.selectedElements.length > 1) && this._clickedOnStage )
+                {
+                    this._delta = ~~(delta[this._handleMode]);
+                }
+                else
+                {
+                    this._delta += ~~(delta[this._handleMode]);
+                }
 
-                this._updateDelta(delta, this._handleMode);
             }
-            else if(this._mode === 1)
+            else
             {
-                delta[2] = delta[1];
-                delta[0] = 0;
-                delta[1] = 0;
+                if(this._mode === 1)
+                {
+                    delta[2] = delta[1];
+                    delta[0] = 0;
+                    delta[1] = 0;
+                }
+                else
+                {
+                    delta[2] = 0;
+                }
+                this._delta = delta.slice(0);
             }
 
             var transMat = Matrix.Translation( delta );
+
             if(this._inLocalMode && (this._targets.length === 1) )
             {
                 this._translateLocally(transMat);
@@ -139,7 +156,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
 
                         var shouldUpdateStartMat = true;
 
-                        if(this._clickedObject === this.application.ninja.currentDocument.documentRoot)
+                        if(this._clickedOnStage)
                         {
                                 shouldUpdateStartMat = false;
                         }
@@ -152,11 +169,15 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                         {
                                 item = this._targets[i];
                                 elt = item.elt;
-                                curMat = item.mat;
-
-                                glmat4.multiply(curMat, qMat, curMat);
+                                curMat = item.mat.slice(0);
 
-                                viewUtils.setMatrixForElement( elt, curMat, true);
+//                              glmat4.multiply(curMat, qMat, curMat);
+//
+//                              viewUtils.setMatrixForElement( elt, curMat, true);
+                curMat[12] += transMat[12];
+                curMat[13] += transMat[13];
+                curMat[14] += transMat[14];
+                viewUtils.setMatrixForElement( elt, curMat, true);
 
                                 if(shouldUpdateStartMat)
                                 {
@@ -198,6 +219,19 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                                                 "translateTool",
                                                 previousStyles
                                               );
+                if(this._origin && this._delta)
+                {
+                    if(this._handleMode !== null)
+                    {
+                        this._origin[this._handleMode] += this._delta;
+                    }
+                    else
+                    {
+                        this._origin[0] += this._delta[0];
+                        this._origin[1] += this._delta[1];
+                    }
+                }
+                this._delta = null;
             }
             // Save previous value for undo/redo
             this._undoArray = [];
@@ -232,7 +266,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                 }
         },
 
-        _getHandlesOrigin: {
+        _updateHandlesOrigin: {
                 value: function () {
                         var ctr;
 
@@ -243,30 +277,43 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase,
                                 {
                                         var item = this._target;
                                         viewUtils.pushViewportObj( item );
-                                        var ctr = viewUtils.getCenterOfProjection();
+                                        ctr = viewUtils.getCenterOfProjection();
                                         viewUtils.popViewportObj();
                                         ctr[2] = 0;
 
-                                        var ctrOffset = item.elementModel.props3D.m_transformCtr;
-                                        if(ctrOffset)
-                                        {
-                                                ctr = vecUtils.vecAdd(3, ctr, ctrOffset);
-                                        }
+//                                      var ctrOffset = item.elementModel.props3D.m_transformCtr;
+//                                      if(ctrOffset)
+//                                      {
+//                                              ctr = vecUtils.vecAdd(3, ctr, ctrOffset);
+//                                      }