Merge branch 'master' into pentool

Conflicts:
	manifest.json

11 files changed, 327 insertions, 51 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index c07391db..85870097 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -115,6 +115,26 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 }
         },
 
+    initializeFromDocument:{
+        value:function(){
+            var documentRootChildren = null, i;
+            //initialize with current document
+            this._eltArray = [];
+            this._planesArray = [];
+            this.setDrawingSurfaceElement(this.application.ninja.stage.canvas);
+            this.setSourceSpaceElement( this.application.ninja.stage.stageDeps.currentStage );
+            this.setWorkingPlane( Vector.create( [0,0,1,0] ) );
+
+            //Loop through all the top-level children of the current document and call drawUtils.addElement on them
+            if(this.application.ninja.currentDocument._liveNodeList.length > 0){
+                documentRootChildren = this.application.ninja.currentDocument._liveNodeList;
+                for(i=0;i<documentRootChildren.length;i++){
+                    this.addElement(documentRootChildren[i]);
+                }
+            }
+        }
+    },
+
     handleElementAdded: {
         value: function(event) {
             this.addElement(event.detail);
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index ada6960b..94202dc5 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -521,7 +521,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
                                                 if (!elt.elementModel)
                                                 {
-                            NJUtils.makeElementModel2(elt);
+                            NJUtils.makeModelFromElement(elt);
                                                 }
                                                 elt.elementModel.isIn2DSnapCache = true;
                                         }
@@ -588,7 +588,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 
                                         if (!elt.elementModel)
                                         {
-                                                NJUtils.makeElementModel2(elt);
+                                                NJUtils.makeModelFromElement(elt);
                                         }
                                         elt.elementModel.isIn2DSnapCache = true;
                                 }
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index a2fac34f..bedda8bf 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -1226,6 +1226,14 @@ exports.ViewUtils = Montage.create(Component, {
             }
     },
 
+        getCurrentDocument:
+        {
+                value: function()
+                {
+                        return snapManagerModule.SnapManager.application.ninja.currentDocument;
+                }
+        },
+
         setStageZoom: {
         value:function( globalPt,  zoomFactor ) {
             var localPt;
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 5b32547e..712544c0 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -135,7 +135,7 @@ function GLCircle()
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().uuid );
+                g_Engine.setContext( world.getCanvas().rdgeid );
 
          // create the gl buffer
         var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 0d815145..f715a43c 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -171,7 +171,7 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().uuid );
+                g_Engine.setContext( world.getCanvas().rdgeid );
 
                  // create the gl buffer
                 var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index 5b6ff94f..3c1cb7dc 100755
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -214,7 +214,7 @@ function GLRectangle()
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().uuid );
+                g_Engine.setContext( world.getCanvas().rdgeid );
 
                 // create the gl buffer
                 var gl = world.getGLContext();
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index 1edd5cff..64086bee 100755
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -136,13 +136,6 @@ function GLWorld( canvas, use3D )
         var camMat = Matrix.I(4);
         camMat[14] = this.getViewDistance();
         this.setCameraMat( camMat );
-
-        //////////////////////////////////////////
-        // test call to SVG importer
-//      console.log( "***** SVG TEST *****" );
-//      var svgImporter = new SVGParse( this );
-//      svgImporter.importSVG();
-        //////////////////////////////////////////
     
     // post-load processing of the scene
     this.init = function()
@@ -198,7 +191,9 @@ function GLWorld( canvas, use3D )
                 this.myScene.addNode(lightTr);
         
                 // Add the scene to the engine - necessary if you want the engine to draw for you
-                g_Engine.AddScene("myScene" + this._canvas.id, this.myScene);
+                //g_Engine.AddScene("myScene" + this._canvas.id, this.myScene);
+                var name = this._canvas.getAttribute( "data-RDGE-id" ); 
+                g_Engine.AddScene("myScene" + name, this.myScene);
         }
     
         // main code for handling user interaction and updating the scene   
@@ -227,11 +222,11 @@ function GLWorld( canvas, use3D )
     }
 
     // defining the draw function to control how the scene is rendered      
-    this.draw = function()
+        this.draw = function()
     {
                 if (this._useWebGL)
                 {
-                        g_Engine.setContext( this._canvas.uuid );
+                        g_Engine.setContext( this._canvas.rdgeid );
                         var ctx = g_Engine.getContext();
                         var renderer = ctx.renderer;
                         if (renderer.unloadedTextureCount <= 0)
@@ -391,12 +386,10 @@ function GLWorld( canvas, use3D )
         if (this._useWebGL)
         {
                 rdgeStarted = true;
-                this._canvas.rdgeid = this._canvas.uuid;
+                var id = this._canvas.getAttribute( "data-RDGE-id" ); 
+                this._canvas.rdgeid = id;
                 g_Engine.registerCanvas(this._canvas, this);
                 RDGEStart( this._canvas );
-
-                //this._canvas.fpsTracker = new fpsTracker( '0' );
-                //this._canvas.task = new RDGETask(this._canvas, false);
                 this._canvas.task.stop()
         }
 }
@@ -765,7 +758,7 @@ GLWorld.prototype.render = function()
         else
         {
 //              console.log( "GLWorld.render, " + this._worldCount );
-                g_Engine.setContext( this._canvas.uuid );
+                g_Engine.setContext( this._canvas.rdgeId );
                 //this.draw();
                 this.restartRenderLoop();
         }
@@ -821,7 +814,9 @@ GLWorld.prototype.getShapeFromPoint = function( offsetX, offsetY )
 GLWorld.prototype.export = function()
 {
         var exportStr = "GLWorld 1.0\n";
-        exportStr += "id: " + this._canvas.rdgeid + "\n";
+        var id = this.getCanvas().getAttribute( "data-RDGE-id" );
+        exportStr += "id: " + id + "\n";
+        //exportStr += "id: " + this._canvas.rdgeid + "\n";