Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 39 insertions, 97 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 59da411f..1c00f7ea 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -721,8 +721,17 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         drawSelectionBounds : {
                 value: function( eltArray ) {
                         this._selectionCtr = null;
+            var len = eltArray.length,
+                i,
+                j,
+                bounds,
+                bounds3D,
+                pt,
+                tmpPt,
+                ssMat,
+                elt;
                         
-                        if (eltArray.length == 0)  return;
+                        if (len === 0)  return;
                         var context = this._drawingContext;
                         if (!context)  return;
 
@@ -731,18 +740,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         context.lineWidth = 2;
 
                         // handle the single element case
-                        if (eltArray.length == 1)
+            // TODO - Currently, the stage draws its own selection bounds for single selection case
+                        if (len === 1)
                         {
                                 // single selection case
                                 //console.log( "single selection" );
 
-                                var elt = eltArray[0];
+                                elt = eltArray[0];
 
                                 this.viewUtils.pushViewportObj( elt );
 
                                 // get the element bounds in world space
-                                var bounds3D = this.viewUtils.getElementViewBounds3D( elt );
-                                for (var j=0;  j<4;  j++) {
+                                bounds3D = this.viewUtils.getElementViewBounds3D( elt );
+                                for (j=0;  j<4;  j++) {
                                         bounds3D[j] = this.viewUtils.localToGlobal( bounds3D[j],  elt );
                                 }
 
@@ -766,19 +776,12 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         }
                         else
                         {
-                                // the multiple selection case.
-                                //console.log( "multiple selection" );
-
-                                // we set the root to "the world".
-                                var saveRoot = this.viewUtils.getRootElement();
-                                this.viewUtils.setRootElement( this.viewUtils.getStageElement() );
-
                                 // get the plane from the first element to compare against the other elements
                                 var flat = true;
                                 var plane = this.viewUtils.getElementPlane( eltArray[0] );
-                                for (var i=1;  i<eltArray.length;  i++)
+                                for (i=1;  i<len;  i++)
                                 {
-                                        var elt = eltArray[i];
+                                        elt = eltArray[i];
                                         var plane2 = this.viewUtils.getElementPlane( elt );
                                         var dot = MathUtils.dot3(plane,plane2);
                                         if (MathUtils.fpCmp(dot, 1) != 0)
@@ -796,34 +799,23 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                         }
                                 }
 
-                                // construct a matrix from world space to 'plane' space
-                                var ptOnPlane = this.viewUtils.localToGlobal( [0,0,0], eltArray[0]);
-                                var planeToWorld = this.getPlaneToWorldMatrix( plane, ptOnPlane );
-                                //var worldToPlane = planeToWorld.inverse();
-                                var worldToPlane = glmat4.inverse(planeToWorld, []);
-
-                var ssMat = this.viewUtils.getLocalToGlobalMatrix( this._sourceSpaceElt );
                                 // if all the elements share the same plane, draw the 2D rectangle
                                 if (flat)
                                 {
                                         // make a 2D rectangle on the plane
                                         var rect;
-                                        for (var i=0;  i<eltArray.length;  i++)
+                                        for (i=0;  i<len;  i++)
                                         {
-                                                var elt = eltArray[i];
+                                                elt = eltArray[i];
 
                                                 // get the element bounds in 'plane' space
-                                                var bounds = this.viewUtils.getElementViewBounds3D( elt );
-                                                for (var j=0;  j<4;  j++)
+                                                bounds = this.viewUtils.getElementViewBounds3D( elt );
+                        ssMat = this.viewUtils.getLocalToGlobalMatrix( elt );
+                                                for (j=0;  j<4;  j++)
                                                 {
-//                                                      var gPt = MathUtils.makeDimension4( this.viewUtils.localToGlobal( bounds[j],  elt ) );
-//                                                      //var pt = worldToPlane.multiply( gPt );
-//                                                      var pt    = glmat4.multiplyVec3( worldToPlane, gPt, [] );
-//                                                      var tmpPt = glmat4.multiplyVec3( planeToWorld,  pt, [] );
-
                             var localPt = bounds[j];
-                            var tmpPt = this.viewUtils.localToGlobal2(localPt, ssMat);
-                            var pt = glmat4.multiplyVec3( worldToPlane, tmpPt, [] );
+                            tmpPt = this.viewUtils.localToGlobal2(localPt, ssMat);
+                            pt = tmpPt;
 
                                                         if (!rect)
                                                         {
@@ -837,30 +829,18 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                                 }
                                         }
 
-                                        // restore the rootct
-                                        this.viewUtils.setRootElement (saveRoot );
-
-                                        // draw the reectangle
+                                        // draw the rectangle
                                         context.beginPath();
 
-                                        var pt4 = MathUtils.makeDimension4(rect.getPoint(3));
-                                        var viewPt = glmat4.multiplyVec3( planeToWorld, pt4, [] );
-                                        MathUtils.makeDimension3( viewPt );
-//                                      var pt = this.viewUtils.localToGlobal( viewPt, this._sourceSpaceElt );
-                                        var pt = this.viewUtils.localToGlobal2(viewPt, ssMat);
+                    pt = MathUtils.makeDimension3(rect.getPoint(3));
 
-                                        var bounds3D = [[0,0], [0,0], [0,0], [0,0]];
+                                        bounds3D = [[0,0], [0,0], [0,0], [0,0]];
                                         this._selectionCtr = pt.slice(0);
 
                                         context.moveTo( pt[0],  pt[1] );
-                                        for (var i=0;  i<4;  i++)
+                                        for (i=0;  i<4;  i++)
                                         {
-                                                pt4 = MathUtils.makeDimension4(rect.getPoint(i));
-                                                //viewPt = planeToWorld.multiply( pt4 );
-                                                viewPt = glmat4.multiplyVec3( planeToWorld, pt4, [] );
-                                                MathUtils.makeDimension3( viewPt );
-//                                              pt = this.viewUtils.localToGlobal( viewPt, this._sourceSpaceElt );
-                                                pt = this.viewUtils.localToGlobal2( viewPt, ssMat );
+                        pt = rect.getPoint(i);
                                                 context.lineTo( pt[0],  pt[1] );
                                                 bounds3D[i] = pt.slice(0);
                                         }
@@ -870,8 +850,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                         var dir = vecUtils.vecSubtract(2, bounds3D[1], bounds3D[3]);
                                         var ctr = vecUtils.vecNormalize(2, dir, vecUtils.vecDist(2, bounds3D[1], bounds3D[3])/2);
 
-//                                      this._selectionCtr[0] += ctr[0] - window.stageManager.userContentLeft;
-//                                      this._selectionCtr[1] += ctr[1] - window.stageManager.userContentTop;
                                         this._selectionCtr[0] += ctr[0] - this.application.ninja.stage.userContentLeft;
                                         this._selectionCtr[1] += ctr[1] - this.application.ninja.stage.userContentTop;
                                 }
@@ -879,16 +857,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                 {
                                         var minPt,  maxPt;
 
-                                        for (var i=0;  i<eltArray.length;  i++)
+                    // we set the root to "the world".
+                    var saveRoot = this.viewUtils.getRootElement();
+                    this.viewUtils.setRootElement( this.viewUtils.getStageElement() );
+                    ssMat = this.viewUtils.getLocalToGlobalMatrix( this._sourceSpaceElt );
+
+                                        for (i=0;  i<len;  i++)
                                         {
-                                                var elt = eltArray[i];
-                                                var bounds = this.viewUtils.getElementViewBounds3D( elt );
+                                                elt = eltArray[i];
+                                                bounds = this.viewUtils.getElementViewBounds3D( elt );
                         var eltMat = this.viewUtils.getLocalToGlobalMatrix( elt );
-                                                for (var j=0;  j<4;  j++)
+                                                for (j=0;  j<4;  j++)
                                                 {
-                                                        //var pt = worldToPlane.multiply( MathUtils.makeDimension4( this.viewUtils.localToGlobal( bounds[j],  elt )) );
-//                                                      var pt = this.viewUtils.localToGlobal( bounds[j],  elt );
-                                                        var pt = this.viewUtils.localToGlobal2( bounds[j],  eltMat );
+                                                        pt = this.viewUtils.localToGlobal2( bounds[j],  eltMat );