30 files changed, 579 insertions, 2416 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index b9c033aa..640119c4 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -346,19 +346,24 @@ exports.ShapesController = Montage.create(CanvasController, {
             {
                 world = new GLWorld(el, true);
                 el.elementModel.shapeModel.GLWorld = world;
-                el.elementModel.shapeModel.GLGeomObj.setWorld(world);
                 el.elementModel.shapeModel.useWebGl = true;
+                world.import(worldData);
+                el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
+
                 sm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
-                fm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
-                if(sm && fm)
+                if(sm)
                 {
                     el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm);
-                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
                     el.elementModel.shapeModel.strokeMaterial = sm;
+                }
+                fm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
+                // TODO - Use consts after GL code is converted to object literal notation
+//                if( fm && (el.elementModel.shapeModel.GLGeomObj.geomType() !== GLGeomObj.GEOM_TYPE_LINE) )
+                if( fm && (el.elementModel.shapeModel.GLGeomObj.geomType() !== 3) )
+                {
+                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
                     el.elementModel.shapeModel.fillMaterial = fm;
-                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                 }
-                world.import(worldData);
             }
 
         }
@@ -378,13 +383,17 @@ exports.ShapesController = Montage.create(CanvasController, {
                 world = new GLWorld(el, false);
                 el.elementModel.shapeModel.GLWorld = world;
                 el.elementModel.shapeModel.useWebGl = false;
+                world.import(worldData);
+                el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
                 el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(null);
-                el.elementModel.shapeModel.GLGeomObj.setFillMaterial(null);
                 el.elementModel.shapeModel.strokeMaterial = null;
-                el.elementModel.shapeModel.fillMaterial = null;
-                world.import(worldData);
+                // TODO - Use consts after GL code is converted to object literal notation
+                if(el.elementModel.shapeModel.GLGeomObj.geomType() !== 3)
+                {
+                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(null);
+                    el.elementModel.shapeModel.fillMaterial = null;
+                }
             }
-
         }
     }
 
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 10b33a0e..8ffd0ec7 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -459,12 +459,14 @@ exports.PiData = Montage.create( Montage, {
                     [
                         {
                             type: "dropdown",
-                            id:   "stroke",
+                            id:   "strokeMaterial",
+                            prop:   "strokeMaterial",
                             label: "Stroke",
                             labelField: "_name",
                             dataField: "_name",
                             items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
-                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
+                            divider : true
                         }
                     ]
                 ]
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 942eb528..08057778 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -133,6 +133,9 @@ function GLCircle()
         if (!world)  throw( "null world in buildBuffers" );
 
                 if (!world._useWebGL)  return;
+                
+                // make sure RDGE has the correct context
+                g_Engine.setContext( world.getCanvas().uuid );
 
          // 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 67379b52..5ec51230 100644
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -28,6 +28,8 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
     this._strokeWidth = 0.25;
 
     this._strokeStyle = "Solid";
+    this._scaleX = 1.0;
+    this._scaleY = 1.0;
 
     if (arguments.length > 0)
     {
@@ -44,13 +46,9 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         this._strokeColor = strokeColor;
 
         this._strokeStyle = strokeStyle;
+        this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
     }
 
-    this._scaleX = 1.0;
-    this._scaleY = 1.0;
-
-    this._scaleX = (world._viewportWidth)/(world._viewportHeight);
-
     this._strokeVerticesLen = 0;
 
     this.m_world = world;
@@ -104,7 +102,64 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         this.setSlope            = function(m)          {  this._slope = m;                             }
 
     this.geomType       = function()                            {  return this.GEOM_TYPE_LINE;  }
-    
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        ///////////////////////////////////////////////////////////////////////
+        this.export = function()
+        {
+                var rtnStr = "type: " + this.geomType() + "\n";
+
+                rtnStr += "xoff: "                      + this._xOffset         + "\n";
+                rtnStr += "yoff: "                      + this._yOffset         + "\n";
+                rtnStr += "width: "                     + this._width           + "\n";
+                rtnStr += "height: "            + this._height          + "\n";
+                rtnStr += "xAdj: "                  + this._xAdj                + "\n";
+                rtnStr += "yAdj: "                  + this._yAdj                + "\n";
+                rtnStr += "strokeWidth: "       + this._strokeWidth     + "\n";
+                rtnStr += "strokeColor: "       + String(this._strokeColor)  + "\n";
+                rtnStr += "strokeStyle: "       + this._strokeStyle     + "\n";
+                rtnStr += "slope: "             + String(this._slope)   + "\n";
+
+                rtnStr += "strokeMat: ";
+                if (this._strokeMaterial)
+                        rtnStr += this._strokeMaterial.getName();
+                else
+                        rtnStr += "flatMaterial";
+                rtnStr += "\n";
+
+                return rtnStr;
+        }
+
+        this.import = function( importStr )
+        {
+                this._xOffset                   = Number( this.getPropertyFromString( "xoff: ",                 importStr )  );
+                this._yOffset                   = Number( this.getPropertyFromString( "yoff: ",                 importStr )  );
+                this._width                             = Number( this.getPropertyFromString( "width: ",                importStr )  );
+                this._height                    = Number( this.getPropertyFromString( "height: ",               importStr )  );