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, 42 insertions, 13 deletions

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 89cbaea4..47059533 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -101,7 +101,7 @@ var PulseMaterial = function PulseMaterial() {
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = RDGE.createMaterialNode("pulseMaterial");
+                this._materialNode = RDGE.createMaterialNode("pulseMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
@@ -126,18 +126,6 @@ var PulseMaterial = function PulseMaterial() {
                                 var wrap = 'REPEAT',  mips = true;
                                 var tex = this.loadTexture( texMapName, wrap, mips );
                                 
-                                /*
-                                var glTex = new GLTexture( this.getWorld() );
-                                var prevWorld = this.findPreviousWorld();
-                                if (prevWorld)
-                                {
-                                        var srcCanvas = prevWorld.getCanvas();
-                                        tex = glTex.loadFromCanvas( srcCanvas );
-                                }
-                                else
-                                        tex = glTex.loadFromFile( texMapName, wrap, mips );
-                                */
-
                                 if (tex) {
                                         technique.u_tex0.set( tex );
                 }
@@ -174,11 +162,50 @@ var PulseMaterial = function PulseMaterial() {
                 }
         };
 
+        // JSON export
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'texture'               : this._propValues[this._propNames[0]],
+            'dTime'         : this._dTime
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj ) {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+
+        try {
+                        this._propValues[this._propNames[0]] = jObj.texture;
+                        this._texMap = jObj.texture;
+            if (jObj.dTime) {
+                this._dTime = jObj.dTime;
+            }
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + jObj );
+        }
+        };
+
+
         this.export = function() {
                 // every material needs the base type and instance name
                 var exportStr = "material: " + this.getShaderName() + "\n";
                 exportStr += "name: " + this.getName() + "\n";
                 
+                var world = this.getWorld();
+                if (!world)
+                        throw new Error( "no world in material.export, " + this.getName() );
+
+                var texMapName =  this._propValues[this._propNames[0]];
+                exportStr += "texture: " +texMapName + "\n";
+                
                 // every material needs to terminate like this
                 exportStr += "endMaterial\n";
 
@@ -193,6 +220,8 @@ var PulseMaterial = function PulseMaterial() {
 
                 var rtnStr;
         try {
+                        this._propValues[this._propNames[0]] = pu.nextValue( "texture: " );
+
             var endKey = "endMaterial\n";
             var index = importStr.indexOf( endKey );
             index += endKey.length;