Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

1 files changed, 3 insertions, 99 deletions

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;