From 521df0ed9242efff45715998837068c87aca7efd Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 13 Apr 2012 11:12:40 -0700
Subject: 3D Rotate changes

---
 js/helper-classes/3D/draw-utils.js | 48 +++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 16 deletions(-)

(limited to 'js/helper-classes/3D/draw-utils.js')

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index c7c1c08d..a200268e 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -774,13 +774,14 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 			else
 			{
 				// get the plane from the first element to compare against the other elements
+				var dot;
 				var flat = true;
-				var plane = this.viewUtils.getElementPlane( eltArray[0] );
+				var plane = this.viewUtils.getUnprojectedElementPlane( eltArray[0] );
 				for (i=1;  i<len;  i++)
 				{
 					elt = eltArray[i];
-					var plane2 = this.viewUtils.getElementPlane( elt );
-					var dot = MathUtils.dot3(plane,plane2);
+					var plane2 = this.viewUtils.getUnprojectedElementPlane( elt );
+					dot = Math.abs( MathUtils.dot3(plane,plane2) );
 					if (MathUtils.fpCmp(dot, 1) != 0)
 					{
 						flat = false;
@@ -796,6 +797,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					}
 				}
 
+				// if all of the planes are aligned, check if they are aligned with the view direction
+				if (flat)
+				{
+					var stage = this.application.ninja.currentDocument.documentRoot;
+					var stageMat = this.viewUtils.getMatrixFromElement(stage);
+					var viewDir = [ stageMat[8], stageMat[9], stageMat[10] ];
+					viewDir = vecUtils.vecNormalize( 3, viewDir );
+					dot = Math.abs( MathUtils.dot3(plane,viewDir) );
+					if (MathUtils.fpCmp(dot, 1) != 0)
+						flat = false;
+				}
+				console.log( "drawSelectionBounds, flat: " + flat );
+
 				// if all the elements share the same plane, draw the 2D rectangle
 				if (flat)
 				{
@@ -807,12 +821,12 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
 						// get the element bounds in 'plane' space
 						bounds = this.viewUtils.getElementViewBounds3D( elt );
-                        ssMat = this.viewUtils.getLocalToGlobalMatrix( elt );
+						ssMat = this.viewUtils.getLocalToGlobalMatrix( elt );
 						for (j=0;  j<4;  j++)
 						{
-                            var localPt = bounds[j];
-                            tmpPt = this.viewUtils.localToGlobal2(localPt, ssMat);
-                            pt = tmpPt;
+							var localPt = bounds[j];
+							tmpPt = this.viewUtils.localToGlobal2(localPt, ssMat);
+							pt = tmpPt;
 
 							if (!rect)
 							{
@@ -829,7 +843,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					// draw the rectangle
 					context.beginPath();
 
-                    pt = MathUtils.makeDimension3(rect.getPoint(3));
+					pt = MathUtils.makeDimension3(rect.getPoint(3));
 
 					bounds3D = [[0,0], [0,0], [0,0], [0,0]];
 					this._selectionCtr = pt.slice(0);
@@ -837,7 +851,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					context.moveTo( pt[0],  pt[1] );
 					for (i=0;  i<4;  i++)
 					{
-                        pt = rect.getPoint(i);
+						pt = rect.getPoint(i);
 						context.lineTo( pt[0],  pt[1] );
 						bounds3D[i] = pt.slice(0);
 					}
@@ -854,19 +868,21 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 				{
 					var minPt,  maxPt;
 
-                    // we set the root to "the world".
-                    var saveRoot = this.viewUtils.getRootElement();
-                    this.viewUtils.setRootElement( this.viewUtils.getStageElement() );
-                    ssMat = this.viewUtils.getLocalToGlobalMatrix( this._sourceSpaceElt );
+					// 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++)
 					{
 						elt = eltArray[i];
 						bounds = this.viewUtils.getElementViewBounds3D( elt );
-                        var eltMat = this.viewUtils.getLocalToGlobalMatrix( elt );
+						var eltMat = this.viewUtils.getLocalToGlobalMatrix( elt );
 						for (j=0;  j<4;  j++)
 						{
 							pt = this.viewUtils.localToGlobal2( bounds[j],  eltMat );
+							var tmpPt = this.viewUtils.localToStageWorld(bounds[j], elt);
+							tmpPt = this.viewUtils.screenToView( tmpPt[0], tmpPt[1], tmpPt[2] );
 							if (!minPt)
 							{
 								minPt = pt.slice(0);
@@ -903,7 +919,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
 					// get the 8 corners of the parallelpiped in world space
 					var wc = new Array();   // wc == world cube
-                    wc.push(  this.viewUtils.localToGlobal2( [x0,y0,z1], ssMat ) );
+					wc.push(  this.viewUtils.localToGlobal2( [x0,y0,z1], ssMat ) );
 					wc.push(  this.viewUtils.localToGlobal2( [x0,y1,z1], ssMat ) );
 					wc.push(  this.viewUtils.localToGlobal2( [x1,y1,z1], ssMat ) );
 					wc.push(  this.viewUtils.localToGlobal2( [x1,y0,z1], ssMat ) );
@@ -934,7 +950,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((right > 0) || (back > 0)) ? dark : light;  context.beginPath();
 					if ((right > 0) || (back > 0)) {
 						context.beginPath();
-                        p = this.viewUtils.localToGlobal2( [x1, y0, z0], ssMat );  context.moveTo( p[0], p[1] );
+						p = this.viewUtils.localToGlobal2( [x1, y0, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y1, z0], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
 					}
-- 
cgit v1.2.3


From 7b3ef287f248c07602aefa3ba2cc907e0d16493a Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 18 Apr 2012 13:42:18 -0700
Subject: Fixing some more merge issues.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/draw-utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/helper-classes/3D/draw-utils.js')

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 42e0cfa9..039f5bb3 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -796,7 +796,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 				context.stroke();
 
 				this._selectionCtr = MathUtils.getCenterFromBounds(3, bounds3D);
-				console.log("selection center, single elt case - ", this._selectionCtr);
+//				console.log("selection center, single elt case - ", this._selectionCtr);
 				
 				this.viewUtils.popViewportObj();
 			}
@@ -837,7 +837,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					if (MathUtils.fpCmp(dot, 1) != 0)
 						flat = false;
 				}
-				console.log( "drawSelectionBounds, flat: " + flat );
+//				console.log( "drawSelectionBounds, flat: " + flat );
 
 				// if all the elements share the same plane, draw the 2D rectangle
 				if (flat)
-- 
cgit v1.2.3