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

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-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
	js/preloader/Preloader.js

1 files changed, 58 insertions, 3 deletions

diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index faac7f1b..28a66a2c 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -158,7 +158,8 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     this._propValues[ this._propNames[6] ] = this._colorStop3;
     this._propValues[ this._propNames[7] ] = this._colorStop4;
 
-    this.setProperty = function( prop, value ) {
+    this.setProperty = function( prop, value )
+        {
                 if (prop === "color")  prop = "color1";
 
                 // make sure we have legitimate imput
@@ -193,14 +194,17 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
         return new RadialGradientMaterial();
     };
 
-        this.init = function() {
+        this.init = function( world )
+        {
+                this.setWorld( world );
+
                 // set up the shader
             this._shader = new RDGE.jshader();
                 this._shader.def = radialGradientMaterialDef;
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = RDGE.createMaterialNode("radialGradientMaterial");
+                this._materialNode = RDGE.createMaterialNode("radialGradientMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 // set the shader values in the shader
@@ -233,6 +237,57 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
                 }
         };
 
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+
+                        'color1'                : this.getColor1(),
+                        'color2'                : this.getColor2(),
+                        'color3'                : this.getColor3(),
+                        'color4'                : this.getColor4(),
+                        'colorStop1'    : this.getColorStop1(),
+                        'colorStop2'    : this.getColorStop2(),
+                        'colorStop3'    : this.getColorStop3(),
+                        'colorStop4'    : this.getColorStop4()
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+
+                try
+                {
+                        var color1      = jObj.color1,
+                                color2  = jObj.color2,
+                                color3  = jObj.color3,
+                                color4  = jObj.color4,
+                                colorStop1      = jObj.colorStop1,
+                                colorStop2      = jObj.colorStop2,
+                                colorStop3      = jObj.colorStop3,
+                                colorStop4      = jObj.colorStop4;
+
+                        this.setProperty( "color1", color1 );
+                        this.setProperty( "color2", color2 );
+                        this.setProperty( "color3", color3 );
+                        this.setProperty( "color4", color4 );
+                        this.setProperty( "colorStop1", colorStop1 );
+                        this.setProperty( "colorStop2", colorStop2 );
+                        this.setProperty( "colorStop3", colorStop3 );
+                        this.setProperty( "colorStop4", colorStop4 );
+                }
+                catch (e)
+                {
+                        throw new Error( "could not import material: " + importStr );
+                }
+        };
+
         this.export = function() {
                 // every material needs the base type and instance name
                 var exportStr = "material: " + this.getShaderName() + "\n";