6 files changed, 192 insertions, 560 deletions

diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 2a751a89..8c5ffef3 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -715,18 +715,6 @@ var BrushStroke = function GLBrushStroke() {
         this.update();      //after this, the stroke is ready to be rendered
     };
 
-    
-    this.export = function() {
-        var jsonObject = this.exportJSON();
-        var stringified = JSON.stringify(jsonObject);
-        return "type: " + this.geomType() + "\n" + stringified;
-    };
-
-    this.import = function( importStr ) {
-        var jsonObject = JSON.parse(importStr);
-        this.importJSON(jsonObject);
-    }
-
     this.collidesWithPoint = function (x, y, z) {
         if (x < this._BBoxMin[0]) return false;
         if (x > this._BBoxMax[0]) return false;
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index d48bf98b..7fa78b12 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,8 +61,6 @@ var Circle = function GLCircle() {
         } else {
                         this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
         }
-
-                this.exportMaterials();
         };
 
     ///////////////////////////////////////////////////////////////////////
@@ -178,7 +176,7 @@ var Circle = function GLCircle() {
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().rdgeid );
+                RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
 
          // create the gl buffer
         var gl = world.getGLContext();
@@ -350,7 +348,7 @@ var Circle = function GLCircle() {
 
                 this.recalcTexMapCoords( vrts, uvs );
 
-                return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLES, index);
+                return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, index);
     };
 
     this.generateOvalRing = function(xOff, yOff, rotationMat, innerScaleMat, outerScaleMat, nTriangles) {
@@ -407,7 +405,7 @@ var Circle = function GLCircle() {
 
                 this.recalcTexMapCoords( vrts, uvs );
 
-                return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLE_STRIP, indices.length);
+                return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLE_STRIP, indices.length);
     };
 
     this.render = function() {
@@ -636,100 +634,6 @@ var Circle = function GLCircle() {
                 this.importMaterialsJSON( jObj.materials );
         };
 
-
-        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 += "strokeWidth: "       + this._strokeWidth     + "\n";
-                rtnStr += "innerRadius: "       + this._innerRadius     + "\n";
-                rtnStr += "strokeStyle: "       + this._strokeStyle     + "\n";
-
-        if(this._strokeColor.gradientMode) {
-            rtnStr += "strokeGradientMode: "    + this._strokeColor.gradientMode        + "\n";
-            rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n";
-        } else {
-            rtnStr += "strokeColor: "   + String(this._strokeColor)  + "\n";
-        }
-
-        if(this._fillColor.gradientMode) {
-            rtnStr += "fillGradientMode: "      + this._fillColor.gradientMode  + "\n";
-            rtnStr += "fillColor: " + this.gradientToString(this._fillColor.color) + "\n";
-        } else {
-            rtnStr += "fillColor: "     + String(this._fillColor)  + "\n";
-        }
-
-                rtnStr += "strokeMat: ";
-                if (this._strokeMaterial) {
-                        rtnStr += this._strokeMaterial.getName();
-        } else {
-                        rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-
-                rtnStr += "\n";
-
-                rtnStr += "fillMat: ";
-                if (this._fillMaterial) {
-                        rtnStr += this._fillMaterial.getName();
-        } else {
-                        rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-                rtnStr += "\n";
-
-                rtnStr += this.exportMaterials();
-
-                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 ) );
-                this._strokeWidth               = Number( this.getPropertyFromString( "strokeWidth: ",  importStr ) );
-                this._innerRadius               = Number( this.getPropertyFromString( "innerRadius: ",  importStr ) );
-                this._strokeStyle               = this.getPropertyFromString( "strokeStyle: ",  importStr );
-                var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
-                var fillMaterialName    = this.getPropertyFromString( "fillMat: ",              importStr );
-        if(importStr.indexOf("fillGradientMode: ") < 0) {
-            this._fillColor             =  eval( "[" + this.getPropertyFromString( "fillColor: ",       importStr ) + "]" );
-        } else {
-            this._fillColor = {};
-            this._fillColor.gradientMode = this.getPropertyFromString( "fillGradientMode: ",    importStr );
-            this._fillColor.color = this.stringToGradient(this.getPropertyFromString( "fillColor: ",    importStr ));
-        }
-
-        if(importStr.indexOf("strokeGradientMode: ") < 0)
-        {
-            this._strokeColor           =  eval( "[" + this.getPropertyFromString( "strokeColor: ",     importStr ) + "]" );
-        } else {
-            this._strokeColor = {};
-            this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ",        importStr );
-            this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ",        importStr ));
-        }
-
-                var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
-                if (!strokeMat) {
-                        console.log( "object material not found in library: " + strokeMaterialName );
-                        strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
-                }
-
-                this._strokeMaterial = strokeMat;
-
-                var fillMat = MaterialsModel.getMaterial( fillMaterialName );
-                if (!fillMat) {
-                        console.log( "object material not found in library: " + fillMaterialName );
-                        fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
-                }
-                this._fillMaterial = fillMat;
-
-                this.importMaterials( importStr );
-        };
-
     this.collidesWithPoint = function( x, y ) {
 //        if(x < this._xOffset) return false;
 //        if(x > (this._xOffset + this._width)) return false;
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index f1aa9f8a..bb5b4a9a 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -14,19 +14,19 @@ var GeomObj = function GLGeomObj() {
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
-        this.GEOM_TYPE_RECTANGLE                =  1;
-        this.GEOM_TYPE_CIRCLE                   =  2;
-        this.GEOM_TYPE_LINE             =  3;
-        this.GEOM_TYPE_PATH                         =  4;
-        this.GEOM_TYPE_CUBIC_BEZIER     =  5;
-    this.GEOM_TYPE_BRUSH_STROKE     =  6;
-        this.GEOM_TYPE_UNDEFINED                = -1;
+    this.GEOM_TYPE_RECTANGLE = 1;
+    this.GEOM_TYPE_CIRCLE = 2;
+    this.GEOM_TYPE_LINE = 3;
+    this.GEOM_TYPE_PATH = 4;
+    this.GEOM_TYPE_CUBIC_BEZIER = 5;
+    this.GEOM_TYPE_BRUSH_STROKE = 6;
+    this.GEOM_TYPE_UNDEFINED = -1;
 
     // Needed for calculating dashed/dotted strokes
     this.DASH_LENGTH = 0.15;
     this.DOT_LENGTH = 0.05;
     this.GAP_LENGTH = 0.05;
-        
+
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -40,109 +40,111 @@ var GeomObj = function GLGeomObj() {
     this.m_world = null;
 
     // stroke and fill colors
-    this._strokeColor   = [0,0,0,0];
-    this._fillColor             = [0,0,0,0];
+    this._strokeColor = [0, 0, 0, 0];
+    this._fillColor = [0, 0, 0, 0];
 
-        // stroke and fill materials
-        this._fillMaterial = null;
-        this._strokeMaterial = null;
+    // stroke and fill materials
+    this._fillMaterial = null;
+    this._strokeMaterial = null;
 
-        // array of primitives - used in RDGE
-        this._primArray = [];
+    // array of primitives - used in RDGE
+    this._primArray = [];