Merge branch 'refs/heads/ninja-internal' into ToolFixes

22 files changed, 195 insertions, 69 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 61126952..fa6f5300 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -75,7 +75,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     this.setProperty = function( prop, value )
         {
                 // every material should do something with the "color" property
-                if (prop === "color")  prop = "lightDiff";
+                if (prop === "color")  return;
 
                 // make sure we have legitimate imput
                 var ok = this.validateProperty( prop, value );
@@ -116,7 +116,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 this._shader['default'].u_light0Diff.set( this.getLightDiff() );
 
                 // set up the material node
-                this._materialNode = createMaterialNode( this.getShaderName() );
+                this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
                 this._materialNode.setShader(this._shader);
 
                 // set some image maps
@@ -158,10 +158,14 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 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() );
+
                 exportStr += "lightDiff: "                      + this.getLightDiff()           + "\n";
                 exportStr += "diffuseTexture: "         + this.getDiffuseTexture()      + "\n";
                 exportStr += "specularTexture: "        + this.getSpecularTexture()     + "\n";
-                exportStr += "normalMap: "              + this.getNormalTexture()       + "\n";
+                exportStr += "normalMap: "                      + this.getNormalTexture()       + "\n";
 
                 // every material needs to terminate like this
                 exportStr += "endMaterial\n";
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index 1e6af6ac..dfd89d12 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -60,7 +60,7 @@ var DeformMaterial = function DeformMaterial() {
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("deformMaterial");
+                this._materialNode = createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index be8bf2b8..97e4f646 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -36,19 +36,27 @@ var FlatMaterial = function FlatMaterial() {
         // duplcate method requirde
         this.dup = function()   {  return new FlatMaterial();   } ;
 
-        this.init = function()
+        this.init = function( world )
         {
-                // set up the shader
-                this._shader = new jshader();
-                this._shader.def = flatShaderDef;
-                this._shader.init();
-
-        // set the defaults
-                this._shader.colorMe.color.set( this.getColor() );
-
-                // set up the material node
-                this._materialNode = createMaterialNode("flatMaterial");
-                this._materialNode.setShader(this._shader);
+                // save the world
+                if (world)
+                {
+                        this.setWorld( world );
+
+                        // set up the shader
+                        this._shader = new jshader();
+                        this._shader.def = flatShaderDef;
+                        this._shader.init();
+
+                        // set the defaults
+                        this._shader.colorMe.color.set( this.getColor() );
+
+                        // set up the material node
+                        this._materialNode = createMaterialNode("flatMaterial_" + world.generateUniqueNodeID() );
+                        this._materialNode.setShader(this._shader);
+                }
+                else
+                        throw new Error( "GLWorld not supplied to material initialization" );
         };
 
 
@@ -73,15 +81,12 @@ var FlatMaterial = function FlatMaterial() {
         };
     ///////////////////////////////////////////////////////////////////////
 
-        this.export = function() {
+        this.export = function()
+        {
                 // this function should be overridden by subclasses
                 var exportStr = "material: " + this.getShaderName() + "\n";
                 exportStr += "name: " + this.getName() + "\n";
-                
-                if (this._shader)
-                        exportStr += "color: " + String(this._shader.colorMe.color) + "\n";
-                else
-                        exportStr += "color: " + this.getColor() + "\n";
+                exportStr += "color: " + String(this._propValues["color"]) + "\n";
                 exportStr += "endMaterial\n";
 
                 return exportStr;
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index 8eadb3ab..bd92ecd8 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -53,7 +53,7 @@ var FlyMaterial = function FlyMaterial() {
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("flyMaterial");
+                this._materialNode = createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index 07536f33..976dfad3 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -55,7 +55,7 @@ var JuliaMaterial = function JuliaMaterial() {
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("juliaMaterial");
+                this._materialNode = createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js
index 3ef5d613..16d1ccfa 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -60,7 +60,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("keleidoscopeMaterial");
+                this._materialNode = createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 2c52c67d..8e05e23d 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -212,7 +212,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode( this.getShaderName() );
+                this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
                 this._materialNode.setShader(this._shader);
 
                 // send the current values to the shader
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 07e009a2..d9f00383 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -66,7 +66,7 @@ var MandelMaterial = function MandelMaterial() {
                 this._shader.init();