4 files changed, 207 insertions, 116 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a200268e..42e0cfa9 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -112,6 +112,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this.eventManager.addEventListener("elementsRemoved", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
             this.eventManager.addEventListener("closeDocument", this, false);
+            this.eventManager.addEventListener("elementReplaced", this, false);
                 }
         },
 
@@ -170,13 +171,41 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     this.removeElement(element);
                 }, this);
             } else {
-                this.removeElement(elements._element || elements);
+                this.removeElement(elements);
             }
 
             this.drawWorkingPlane();
         }
     },
 
+    handleElementReplaced: {
+        value: function(event) {
+            var oldElement = event.detail.data.oldChild;
+            var newElement = event.detail.data.newChild;
+
+            // check if we already know about this object
+            var n = this._eltArray.length,
+                plane;
+            for (var i=0;  i<n;  i++) {
+                if (oldElement === this._eltArray[i]) {
+                    this._eltArray[i] = newElement;
+                    plane = this._planesArray[i];
+                    break;
+                }
+            }
+
+            if(!plane) {
+                this._eltArray.push( newElement );
+                plane = Object.create(this.ElementPlanes, {});
+                this._planesArray.push( plane );
+            }
+
+            plane.setElement( newElement );
+            plane.init();
+            newElement.elementModel.props3D.elementPlane = plane;
+        }
+    },
+
     _shouldUpdatePlanes: {
         value: function(props) {
             if(!props) {
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 6094dae1..d72e33bd 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -232,7 +232,15 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
             var elt = this.getElt();
             viewUtils.pushViewportObj( elt );
             var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] );
-            var eyePt = viewUtils.getEyePoint();
+            var eyePt;
+            if(viewUtils.getPerspectiveDistFromElement(elt))
+            {
+                eyePt = viewUtils.getEyePoint();
+            }
+            else
+            {
+                eyePt = [viewPt[0], viewPt[1], 1400];
+            }
             var projPt = MathUtils.vecIntersectPlane( eyePt, MathUtils.vecSubtract(viewPt,eyePt), plane );
 
             return projPt;
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 8eafa7e9..5735a145 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -124,6 +124,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
     initialize: {
         value: function() {
             this.eventManager.addEventListener("elementsRemoved", this, false);
+            this.eventManager.addEventListener("elementReplaced", this, false);
         }
     },
 
@@ -170,15 +171,19 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
             if(Array.isArray(elements)) {
                 elements = Array.prototype.slice.call(elements, 0);
                 elements.forEach(function(element) {
-                    element = element._element || element;
                     self.removeElementFrom2DCache(element);
                 });
             } else {
-                this.removeElementFrom2DCache(elements._element || elements);
+                this.removeElementFrom2DCache(elements);
             }
         }
     },
 
+    handleElementReplaced: {
+        value: function(event) {
+            this._isCacheInvalid = true;
+        }
+    },
 
     setCurrentStage: {
         value: function(stage) {
@@ -224,7 +229,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         parentPt = [quadPt[0], quadPt[1], 0.0];
                                 else
                                         parentPt = [xScreen, yScreen, 0.0];
-                                var vec = viewUtils.parentToChildVec(parentPt, stage);
+
+                var eyePt = [];
+                                var vec = viewUtils.parentToChildVec(parentPt, stage, eyePt);
                                 if (vec)
                                 {
                                         // activate the drag working plane
@@ -236,7 +243,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                         var wp = currentWorkingPlane.slice(0);
                                         var mat = viewUtils.getMatrixFromElement(stage);
                                         wp = MathUtils.transformPlane(wp, mat);
-                                        var eyePt = viewUtils.getEyePoint();
                                         var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp);
                                         if (projPt)
                                         {
@@ -300,7 +306,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         this.deactivateDragPlane();
 
                         this.setLastHit( rtnHit );
-                        //rtnHit.test();                // DEBUG CODE.  REMOVE THIS
+                        
+                        rtnHit.test();          // DEBUG CODE.  REMOVE THIS
                         return rtnHit;
                 }
         },
@@ -705,8 +712,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 var wp = currentWorkingPlane.slice(0);
                                 var mat = viewUtils.getMatrixFromElement(stage);
                                 wp = MathUtils.transformPlane(wp, mat);
-                                var eyePt = viewUtils.getEyePoint();
-                                var vec = viewUtils.parentToChildVec(gPt, stage);
+                var eyePt = [];
+                                var vec = viewUtils.parentToChildVec(gPt, stage, eyePt);
                                 var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp);
                                 var wpMat = drawUtils.getPlaneToWorldMatrix(currentWorkingPlane, MathUtils.getPointOnPlane(currentWorkingPlane));
                                 projPt[3] = 1.0;
@@ -1063,8 +1070,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         // Snapping is done in screen space, so convert the bounds from
                         // local element space to global screen space
                         var bounds3D = new Array();
+            var eltMat = viewUtils.getLocalToGlobalMatrix( elt );
                         for (var i=0;  i<4;  i++)
-                                bounds3D[i] = viewUtils.localToGlobal( bounds[i],  elt );
+                                bounds3D[i] = viewUtils.localToGlobal2(bounds[i], eltMat);
                         
                         var hitRec = this.snapToScreenBounds( elt, globalScrPt, bounds, bounds3D );
 
@@ -1348,7 +1356,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                         var offset = viewUtils.getElementOffset( elt );
                                                         MathUtils.makeDimension3( offset );
                                                         var parentPt = vecUtils.vecAdd(3, scrPt, offset );
-                                                        var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement );
+                                                        var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent );
 
                                                         var dist = vecUtils.vecDist(2, globalPt, targetScrPt );
                                                         if (dist < this.ELEMENT_VERTEX_HIT_RAD)
@@ -1386,7 +1394,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                                 var offset = viewUtils.getElementOffset( elt );
                                                                 MathUtils.makeDimension3( offset );
                                                                 var parentPt = vecUtils.vecAdd(3, scrPt, offset );
-                                                                var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement );
+                                                                var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent );
 
                                                                 var dist = vecUtils.vecDist(2, globalPt, targetScrPt );
                                                                 if (dist < this.ELEMENT_EDGE_HIT_RAD)
@@ -1439,7 +1447,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {