From 2c04935f0ccb1cb7c98371fc10b43155f2d956c4 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 1 Mar 2012 22:20:06 -0800
Subject: Fix for elements flying off into space when moving elements that
 overlap.

This was happening because our hit record's element and the browser's element from point did not match.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/snap-manager.js | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 372be345..596ba56a 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -40,6 +40,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
 	// keep a reference to the most recent hitRecord.  Used for drawing feedback on the stage
 	_lastHit : { value: null, writable: true },
+	_hitRecords : { value: [], writable: true },
 
 	// keep a list of objects to avoid snapping to
 	_avoidList : { value: [], writable: true },
@@ -274,6 +275,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 			}	//if (hitRecArray.length == 0)
 
 			var rtnHit;
+
+            // Save reference to hit records to verify last hit record's element matches browser's elementFromPoint
+            this._hitRecords.length = 0;
+            this._hitRecords = hitRecArray;
+
 			if (hitRecArray.length > 0)
 			{
 				this.sortHitRecords( hitRecArray );
@@ -2246,6 +2252,30 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 				drawUtils.setDrawingSurfaceElement(saveContext);
 			}
 		}
-	}
+	},
+
+    findHitRecordForElement: {
+        value: function(elt) {
+            var rtnHit;
+
+            if (!this._hitRecords)  return;
+            var nHits = this._hitRecords.length;
+
+            for (var i=0;  i<nHits;  i++)
+            {
+                var hi = this._hitRecords[i];
+                if(hi.getElement() === elt)
+                {
+                    rtnHit = hi;
+                    break;
+                }
+            }
+            // catch-all to turn off drag plane snapping
+            this.deactivateDragPlane();
+
+            this.setLastHit( rtnHit );
+            return rtnHit;
+        }
+    }
 
 });
-- 
cgit v1.2.3


From 1760bac1da9218315ad1bacdcf3a157495a049e8 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 2 Mar 2012 10:48:41 -0800
Subject: Fix for jumping issue when moving items that have any 3d on them.

We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d.

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

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 37044763..de63f880 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -538,6 +538,39 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
+    isIdentityMatrix: {
+        value: function( mat )
+        {
+            if(!mat)
+            {
+                return false;
+            }
+            else
+            {
+                if(mat[0] !== 1) return false;
+                if(mat[1] !== 0) return false;
+                if(mat[2] !== 0) return false;
+                if(mat[3] !== 0) return false;
+
+                if(mat[4] !== 0) return false;
+                if(mat[5] !== 1) return false;
+                if(mat[6] !== 0) return false;
+                if(mat[7] !== 0) return false;
+
+                if(mat[8] !== 0) return false;
+                if(mat[9] !== 0) return false;
+                if(mat[10] !== 1) return false;
+                if(mat[11] !== 0) return false;
+
+                if(mat[12] !== 0) return false;
+                if(mat[13] !== 0) return false;
+                if(mat[14] !== 0) return false;
+                if(mat[15] !== 1) return false;
+            }
+            return true;
+        }
+    },
+
 	rectsOverlap:
 	{
 		value: function( pt, width, height,  elt )
-- 
cgit v1.2.3