Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

2 files changed, 130 insertions, 176 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 7bd77c3a..81a740e0 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -583,17 +583,25 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         // get a point that lies on the plane
                         var ptOnPlane = MathUtils.getPointOnPlane(this._workingPlane);
 
+            // define the grid parameters
+            var width,
+                height,
+                nLines = 10;
+
+//            if(this.application.ninja.documentController.webTemplate) {
+            if(this.application.ninja.currentDocument.documentRoot.id !== "UserContent") {
+                width = this.application.ninja.currentDocument.documentRoot.scrollWidth;
+                height = this.application.ninja.currentDocument.documentRoot.scrollHeight;
+            } else {
+                width = this.snapManager.getStageWidth();
+                height = this.snapManager.getStageHeight();
+            }
                         // get a matrix from working plane space to the world
                         var mat = this.getPlaneToWorldMatrix(zAxis, ptOnPlane);
-                        var tMat = Matrix.Translation( [0.5*this.snapManager.getStageWidth(), 0.5*this.snapManager.getStageHeight(),0] );
+                        var tMat = Matrix.Translation( [0.5*width, 0.5*height, 0] );
                         //mat = tMat.multiply(mat);
                         glmat4.multiply( tMat, mat, mat);
 
-                        // define the grid parameters
-                        var width = this.snapManager.getStageWidth(),
-                                height = this.snapManager.getStageHeight();
-                        var nLines = 10;
-
                         // the positioning of the grid may depend on the view direction.
                         var stage = this.snapManager.getStage();
                         var viewMat = this.viewUtils.getMatrixFromElement(stage);
@@ -662,6 +670,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                 var offset = this.viewUtils.getElementOffset(this._sourceSpaceElt);
                                 offset[2] = 0;
                                 this.viewUtils.setViewportObj(this._sourceSpaceElt);
+                var sourceSpaceMat = this.viewUtils.getLocalToGlobalMatrix( this._sourceSpaceElt );
                                 for (var i = 0; i < nLines; i++) {
                                         // transform the points from working plane space to world space
                                         //var t0 = mat.multiply(p0),
@@ -671,8 +680,10 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
                                         // transform from world space to global screen space
                                         if (this._sourceSpaceElt) {
-                                                t0 = this.viewUtils.localToGlobal(t0, this._sourceSpaceElt);
-                                                t1 = this.viewUtils.localToGlobal(t1, this._sourceSpaceElt);
+//                                              t0 = this.viewUtils.localToGlobal(t0, this._sourceSpaceElt);
+//                                              t1 = this.viewUtils.localToGlobal(t1, this._sourceSpaceElt);
+                                                t0 = this.viewUtils.localToGlobal2(t0, sourceSpaceMat);
+                                                t1 = this.viewUtils.localToGlobal2(t1, sourceSpaceMat);
                                         }
 
                                         // create a line from the endpoints
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index cd8cc102..7fc492a5 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -948,7 +948,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                                         {
 
                                                                 // see if we can snap to a contained geometry object
-                                                                if (hitRec && this.getGLWorld(elt) && !this.isARectangle(elt))
+                                                                if (hitRec && this.getGLWorld(elt))     // && !this.isARectangle(elt))
                                                                 {
                                                                         var localPt = hitRec.calculateElementWorldPoint();
                                                                         if (hitRec.getType() != hitRec.SNAP_TYPE_ELEMENT)
@@ -1011,7 +1011,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
             }
                         // hit test the current object
                         var hit;
-                        if (depth > 0)  // don't snap to the root
+                        var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentSelectedContainer) && (elt.nodeName === 'CANVAS'));
+                        if ((depth > 0) || snapToStage) // don't snap to the root unles we are working inside a canvas
                         {
                                 // if the element is in the 2D cache snapping is done there
                                 if (elt.elementModel && !elt.elementModel.isIn2DSnapCache)
@@ -1077,7 +1078,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         var hitRec = this.snapToScreenBounds( elt, globalScrPt, bounds, bounds3D );
 
                         // see if we can snap to a contained geometry object
-                        if (hitRec && this.getGLWorld(elt) && !this.isARectangle(elt))
+                        if (hitRec && this.getGLWorld(elt))     // && !this.isARectangle(elt))
                         {
                                 var localPt = hitRec.calculateElementWorldPoint();
                                 if (hitRec.getType() != hitRec.SNAP_TYPE_ELEMENT)
@@ -1320,193 +1321,135 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                 }
         },
 
-        snapToContainedElement : 
+        doSnapToContainedElement:
         {
                 value: function( eyePt,  dir,  glObj,  hitRec, targetScrPt ) 
                 {
                         var rtnVal = false;
-                        var elt = hitRec.getElement();
 
+                        var elt = hitRec.getElt();
                         var world = glObj.getWorld();
-                        switch (glObj.geomType())
+
+                        var nearVrt = glObj.getNearVertex( eyePt, dir );
+                        if (nearVrt)
                         {
-                                case glObj.GEOM_TYPE_RECTANGLE:
-                                        break;
+                                var viewPt = this.GLToView(nearVrt, world );
+                                var mat = viewUtils.getMatrixFromElement( elt );
+                                var worldPt = MathUtils.transformPoint( viewPt, mat );
 
-                                case glObj.GEOM_TYPE_CIRCLE:
+                                viewUtils.pushViewportObj( elt );
+                                var scrPt = viewUtils.viewToScreen( worldPt );
+                                var offset = viewUtils.getElementOffset( elt );
+                                MathUtils.makeDimension3( offset );
+                                var parentPt = vecUtils.vecAdd(3, scrPt, offset );
+                                var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent );
+
+                                var dist = vecUtils.vecDist(2, globalPt, targetScrPt );
+                                if (dist < this.ELEMENT_VERTEX_HIT_RAD)
+                                {
+                                        //console.log( "hit a vertex" );
+
+                                        // check if the distance is less than
+                                        // the distance on the current hit record
+                                        //if (dist <= vecUtils.vecDist(2, targetScrPt, hitRec.getScreenPoint() ))
                                         {
-                                                var nearVrt = glObj.getNearVertex( eyePt, dir );
-                                                if (nearVrt)
-                                                {
-                                                        var viewPt = this.GLToView(nearVrt, world );
-                                                        var mat = viewUtils.getMatrixFromElement( elt );
-                                                        var worldPt = MathUtils.transformPoint( viewPt, mat );
-
-                                                        viewUtils.pushViewportObj( elt );
-                                                        var scrPt = viewUtils.viewToScreen( worldPt );
-                                                        var offset = viewUtils.getElementOffset( elt );
-                                                        MathUtils.makeDimension3( offset );
-                                                        var parentPt = vecUtils.vecAdd(3, scrPt, offset );
-                                                        var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent );
-
-                                                        var dist = vecUtils.vecDist(2, globalPt, targetScrPt );
-                                                        if (dist < this.ELEMENT_VERTEX_HIT_RAD)
-                                                        {
-                                                                // check if the distance is less than
-                                                                // the distance on the current hit record
-                                                                if (dist <= vecUtils.vecDist(2, targetScrPt, hitRec.getScreenPoint() ))
-                                                                {
-                                                                        hitRec.setScreenPoint( globalPt );
-                                                                        //var localMatInv = hitRec.getPlaneMatrix().inverse();
-                                                                        var localMatInv = glmat4.inverse( hitRec.getPlaneMatrix(), []);
-                                                                        viewUtils.pushViewportObj( hitRec.getElement() );
-                                                                        var localPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] );
-                                                                        viewUtils.popViewportObj();
-                                                                        localPt = MathUtils.transformPoint( localPt, localMatInv );
-                                                                        hitRec.setLocalPoint( localPt );
-                                                                        hitRec.setType( hitRec.SNAP_TYPE_CONTAINED_ELEMENT );
-
-                                                                        rtnVal = true;
-                                                                }
-                                                        }
-                                                }       // if (nearVrt)
+                                                //console.log( "rejected - further than existing snap" );
+
+                                                hitRec.setScreenPoint( globalPt );
+                                                //var localMatInv = hitRec.getPlaneMatrix().inverse();
+                                                var localMatInv = glmat4.inverse( hitRec.getPlaneMatrix(), []);
+                                                viewUtils.pushViewportObj( hitRec.getElement() );
+                                                var localPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] );
+                                                viewUtils.popViewportObj();
+                                                localPt = MathUtils.transformPoint( localPt, localMatInv );
+                                                hitRec.setLocalPoint( localPt );
+                                                hitRec.setType( hitRec.SNAP_TYPE_CONTAINED_ELEMENT );
 
-                                                if (!rtnVal)
-                                                {
-                                                        var nearPt = glObj.getNearPoint( eyePt,  dir );
+                                                rtnVal = true;
+                                        }
+                                }