Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 15 insertions, 110 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 70f6b01b..ef91d158 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -191,65 +191,6 @@ var Rectangle = function GLRectangle()
         ///////////////////////////////////////////////////////////////////////
         // Methods
         ///////////////////////////////////////////////////////////////////////
-        /*
-    this.export = function() {
-                var rtnStr = "type: " + this.geomType() + "\n";
-
-                /////////////////////////////////////////////////////////////////////////
-                //
-                //      world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor,
-        //    tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle
-                //
-                /////////////////////////////////////////////////////////////////////////////
-
-                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";
-
-        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 += "tlRadius: "          + this._tlRadius        + "\n";
-                rtnStr += "trRadius: "          + this._trRadius        + "\n";
-                rtnStr += "blRadius: "          + this._blRadius        + "\n";
-                rtnStr += "brRadius: "          + this._brRadius        + "\n";
-                rtnStr += "innerRadius: "       + this._innerRadius     + "\n";
-                rtnStr += "strokeStyle: "       + this._strokeStyle     + "\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;
-        };
-    */
-
         // JSON export
         this.exportJSON = function()
         {
@@ -294,58 +235,22 @@ var Rectangle = function GLRectangle()
                 this._strokeStyle               = jObj.strokeStyle;
                 var strokeMaterialName  = jObj.strokeMat;
                 var fillMaterialName    = jObj.fillMat;
-                this.importMaterialsJSON( jObj.materials );
-        };
 
-        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               = Number( this.getPropertyFromString( "strokeStyle: ",  importStr )  );
-                var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
-                var fillMaterialName    = this.getPropertyFromString( "fillMat: ",              importStr );
-                this._strokeStyle               =  this.getPropertyFromString( "strokeStyle: ", 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 ));
+        var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+        if (!strokeMat) {
+            console.log( "object material not found in library: " + strokeMaterialName );
+            strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
         }
+        this._strokeMaterial = strokeMat;
 
-        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 fillMat = MaterialsModel.getMaterial( fillMaterialName );
+        if (!fillMat) {
+            console.log( "object material not found in library: " + fillMaterialName );
+            fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
         }
+        this._fillMaterial = fillMat;
 
-        this._tlRadius                  =  Number( this.getPropertyFromString( "tlRadius: ",    importStr )  );
-                this._trRadius                  =  Number( this.getPropertyFromString( "trRadius: ",    importStr )  );
-                this._blRadius                  =  Number( this.getPropertyFromString( "blRadius: ",    importStr )  );
-                this._brRadius                  =  Number( this.getPropertyFromString( "brRadius: ",    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.importMaterialsJSON( jObj.materials );
         };
 
         this.buildBuffers = function() {
@@ -356,7 +261,7 @@ var Rectangle = function GLRectangle()
                 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();
@@ -956,7 +861,7 @@ RectangleFill.create = function( rectCtr,  width, height, tlRad, blRad,  brRad,
         }
 
         // create the RDGE primitive
-        return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+        return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
 };
 
 RectangleFill.pushVertex = function( x, y, z ) {
@@ -1188,7 +1093,7 @@ RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad,
         }
 
         // create the RDGE primitive
-        return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+        return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
 };
 
 RectangleStroke.getRoundedCorner = function( ctr, insidePt, outsidePt ) {
@@ -1274,7 +1179,7 @@ RectangleGeometry.create = function( ctr,  width, height, material ) {
         }
 
         // create the RDGE primitive
-        return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+        return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
 };
 
 RectangleGeometry.pushVertex    = RectangleFill.pushVertex;