Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

16 files changed, 389 insertions, 300 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 2eba556e..9ca5ea99 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -501,7 +501,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             if(currentDocument) {
                 if(currentDocument.currentView === "design") {
                     currentDocument.serializeDocument();
-                    this.application.ninja.selectionController._selectionContainer = null;
+                    this.application.ninja._currentSelectedContainer = this.application.ninja.selectionController._selectionContainer = null;
                     currentDocument.model.views.design.propertiesPanel.clear();
                 }
 
diff --git a/js/document/document-html.js b/js/document/document-html.js
index d6b4ba95..f92a425c 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -147,9 +147,10 @@ exports.HtmlDocument = Montage.create(Component, {
             this.model.userContentTop = this.application.ninja.stage._userContentTop;
 
 
-            // Serialize the selection
+            // Serialize the selection, the container and grid
             //TODO: Move this property to the design view class
             this.model.selection = this.application.ninja.selectedElements.slice(0);
+            this.model.selectionContainer = this.application.ninja.currentSelectedContainer;
             this.draw3DGrid = this.application.ninja.appModel.show3dGrid;
 
             // Serialize the undo
@@ -177,7 +178,7 @@ exports.HtmlDocument = Montage.create(Component, {
                         
                         //TODO: Move this property to the design view class
             this.application.ninja.selectedElements = this.model.selection.slice(0);
-
+//            this.application.ninja.currentSelectedContainer = this.model.selectionContainer;
             this.application.ninja.appModel.show3dGrid = this.draw3DGrid;
 
             // Serialize the undo
diff --git a/js/document/html-document.js b/js/document/html-document.js
index bcf2b5c2..447d90e3 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -209,8 +209,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         {
                                 /*
                                 // Use this code to test the runtime version of WebGL
-                                var cdm = new NinjaCvsRt.CanvasDataManager();
-                                cdm.loadGLData(elt,  value,  null );
+                                var cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
+                                cvsDataMngr.loadGLData(elt, value);
                                 */
 
                                 // /*
diff --git a/js/document/models/html.js b/js/document/models/html.js
index a97b4b5a..9cc8ce92 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -22,6 +22,11 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     selection: {
         value: []
     },
+    ////////////////////////////////////////////////////////////////////
+    //
+    selectionContainer: {
+        value: []
+    },
         ////////////////////////////////////////////////////////////////////
         //
     draw3DGrid: {
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index e22ac3ad..0f456e1e 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -223,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;
@@ -305,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 );