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, 32 insertions, 2 deletions

diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 1f7b06b1..9af1953d 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -46,8 +46,10 @@ function TwistVertMaterial()
         // duplcate method requirde
         this.dup = function()   {  return new TwistVertMaterial();      } 
 
-        this.init = function()
+        this.init = function( world )
         {
+                this.setWorld( world );
+
                 // set up the shader
             this._shader = new RDGE.jshader();
                 this._shader.def = twistVertShaderDef;
@@ -57,7 +59,7 @@ function TwistVertMaterial()
                 this._shader.twistMe.color.set( this.getColor() );
 
                 // set up the material node
-                this._materialNode = RDGE.createMaterialNode("twistVertMaterial");
+                this._materialNode = RDGE.createMaterialNode("twistVertMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 // initialize the twist vert properties
@@ -100,6 +102,34 @@ function TwistVertMaterial()
         }
         ///////////////////////////////////////////////////////////////////////
 
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'color'                 : this._propValues["color"]
+                };
+
+                return jObj;
+        }
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+        
+                try
+                {
+                        var color  = jObj.color;
+                        this.setProperty( "color",  color);
+                }
+                catch (e)
+                {
+                        throw new Error( "could not import material: " + importStr );
+                }
+        }
+
         this.export = function()
         {
                 // this function should be overridden by subclasses