Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/data/panels-data.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

3 files changed, 118 insertions, 127 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a6d2d899..bf48a723 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -124,7 +124,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this._eltArray = [];
             this._planesArray = [];
             this.setDrawingSurfaceElement(stage.canvas);
-            this.setSourceSpaceElement( stage.stageDeps.currentStage );
+            this.setSourceSpaceElement( this.application.ninja.currentDocument.documentRoot);
             this.setWorkingPlane( [0,0,1,0] );
 
             //Loop through all the top-level children of the current document and call drawUtils.addElement on them
@@ -138,7 +138,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     l,
                     t,
                     plane,
-                    elt
+                    elt;
                 for(i=0; i<len; i++) {
                     elt = documentRootChildren[i];
                     plane = this.addElement(elt);
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 2e8020d3..0f456e1e 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -21,7 +21,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
-    currentStage: { value: null, writable: true },
     drawingCanvas: { value: null, writable: true},
     
         // we keep a stack of working planes to facilitate working on other planes temporarily
@@ -84,14 +83,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         popWorkingPlane : { value: function ()          { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
         getStageWidth : { value: function ()            {
-                return parseInt(this.currentStage.offsetWidth);
+                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetWidth);
         }},
 
         getStageHeight : { value: function ()           {
-                return parseInt(this.currentStage.offsetHeight);
+                return parseInt(this.application.ninja.currentDocument.documentRoot.offsetHeight);
         }},
 
-    getStage : { value: function()              {        return this.currentStage;    }},
+    getStage : { value: function()              {        return this.application.ninja.currentDocument.documentRoot;    }},
 
         getGridVertexHitRad : { value: function()               {  return this._gridVertexHitRad;                               }},
         getGridEdgeHitRad : { value: function()         {  return this._gridEdgeHitRad;                                 }},
@@ -185,12 +184,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         }
     },
 
-    setCurrentStage: {
-        value: function(stage) {
-            this.currentStage = stage;
-        }
-    },
-
         snap : {
                 value: function (xScreen, yScreen, snap3D,  quadPt) 
                 {
@@ -230,64 +223,22 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                                 else
                                         parentPt = [xScreen, yScreen, 0.0];
 
-                var eyePt = [];
-                                var vec = viewUtils.parentToChildVec(parentPt, stage, eyePt);
-                                if (vec)
-                                {
-                                        // activate the drag working plane
-                                        if (!snap3D && this.hasDragPlane())
-                                                this.activateDragPlane();
-
-                                        // project to the working plane
-                                        var currentWorkingPlane = workingPlane.slice(0);
-                                        var wp = currentWorkingPlane.slice(0);
-                                        var mat = viewUtils.getMatrixFromElement(stage);
-                                        wp = MathUtils.transformPlane(wp, mat);
-                                        var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp);
-                                        if (projPt)
-                                        {
-                                                // the local point gets stored in the coordinate space of the plane
-                                                var wpMat = drawUtils.getPlaneToWorldMatrix(currentWorkingPlane, MathUtils.getPointOnPlane(currentWorkingPlane));
-                                                projPt[3] = 1.0;
-                                                //var planeToViewMat = mat.multiply(wpMat);
-                                                var planeToViewMat = glmat4.multiply(mat, wpMat, []);
-                                                //var viewToPlaneMat = planeToViewMat.inverse();
-                                                var viewToPlaneMat = glmat4.inverse( planeToViewMat, [] );
-                                                var planePt = projPt.slice(0);
-                                                planePt[3] = 1.0;
-                                                //planePt = viewToPlaneMat.multiply(planePt);
-                                                planePt = glmat4.multiplyVec3( viewToPlaneMat, planePt );
-
-                                                // get the screen position of the projected point
-                                                viewUtils.setViewportObj(stage);
-                                                var offset = viewUtils.getElementOffset(stage);
-                                                offset[2] = 0;
-                                                var scrPt = viewUtils.viewToScreen(projPt);
-                                                //scrPt = scrPt.add(offset);
-                                                scrPt = vecUtils.vecAdd(3, scrPt, offset);
-
-                                                // create the hit record
-                                                var hitRec = Object.create(HitRecord);//new HitRecord();
-                                                hitRec.setLocalPoint(planePt);
-                                                hitRec.setPlaneMatrix( wpMat );
-                                                hitRec.setScreenPoint(scrPt);
-                                                hitRec.setPlane(currentWorkingPlane);
-                                                hitRec.setType( hitRec.SNAP_TYPE_STAGE );
-                                                hitRec.setElt( stage );
-                                                if (quadPt)  hitRec.setUseQuadPoint( true );
-
-                                                // try snapping to the 3D grid, or to the stage boundaries if the grid is not displayed
-                                                if (this.gridSnapEnabled())
-                                                        this.snapToGrid( hitRec );
-
-                                                // save the hit record
-                                                hitRecArray.push( hitRec );
-
-                                                // restore the original working plane
-                                                if (!snap3D && this.hasDragPlane())
-                                                        this.deactivateDragPlane();
-                                        }
-                                }
+                                if (!snap3D && this._hasDragPlane)
+                                        this.activateDragPlane();
+
+                                var hitRec = this.snapToStage( parentPt,  quadPt );
+
+                                // try snapping to the 3D grid, or to the stage boundaries if the grid is not displayed
+                                if (this.gridSnapEnabled())
+                                        this.snapToGrid( hitRec );
+
+                                // save the hit record
+                                hitRecArray.push( hitRec );
+
+                                // restore the original working plane
+                                if (!snap3D && this.hasDragPlane())
+                                        this.deactivateDragPlane();
+
                         }       //if (hitRecArray.length == 0)
 
                         var rtnHit;
@@ -312,6 +263,62 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                 }
         },
 
+        snapToStage:
+        {
+                value: function( scrPt,  quadPt )
+                {
+                        var stage = this.getStage();
+                        var l2g = viewUtils.getLocalToGlobalMatrix( stage );
+                        var g2l = glmat4.inverse( l2g, [] );
+
+                        var pt0 = scrPt.slice(),  pt1 = scrPt.slice();
+                        pt0[2] = 0.0;   pt1[2] = 10;
+
+                        var localPt0 = MathUtils.transformAndDivideHomogeneousPoint( pt0, g2l ),
+                                localPt1 = MathUtils.transformAndDivideHomogeneousPoint( pt1, g2l );
+
+                        var stageWorldPt0 = viewUtils.localToStageWorld( localPt0, stage ),
+                                stageWorldPt1 = viewUtils.localToStageWorld( localPt1, stage );
+                        var vec = vecUtils.vecSubtract( 3,  stageWorldPt1, stageWorldPt0 );
+                        
+                        var ptOnWorkingPlane = MathUtils.vecIntersectPlane(stageWorldPt0, vec, workingPlane);
+
+                        var wpMat = drawUtils.getPlaneToWorldMatrix(workingPlane, MathUtils.getPointOnPlane(workingPlane)),
+                                wpMatInv = glmat4.inverse( wpMat, [] );
+                        var localPt = MathUtils.transformPoint( ptOnWorkingPlane, wpMatInv );
+
+                        // create the hit record
+                        var hitRec = Object.create(HitRecord);
+                        hitRec.setLocalPoint( localPt );
+                        hitRec.setPlaneMatrix( wpMat );
+                        hitRec.setScreenPoint(scrPt);
+                        hitRec.setPlane(workingPlane);
+                        hitRec.setType( hitRec.SNAP_TYPE_STAGE );
+                        hitRec.setElt( stage );
+                        if (quadPt)  hitRec.setUseQuadPoint( true );
+
+                        // DEBUG CODE
+                        // check that the point is on the working plane
+                        var tmpStageWorldPt = hitRec.calculateStageWorldPoint();
+                        var err = vecUtils.vecDot(3, tmpStageWorldPt, workingPlane) + workingPlane[3];
+                        if (MathUtils.fpSign(err) !== 0)
+                                console.log( "snapToStage (function) not on working plane: " + err );
+                        //////////////////////////////////////////////////////////////////////
+
+                        var calculatedScreenPt = hitRec.calculateScreenPoint();
+                        hitRec.setScreenPoint(calculatedScreenPt);
+