Merge branch 'pentool' into brushtool

22 files changed, 140 insertions, 55 deletions

diff --git a/js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js b/js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
index a7a3724e..52332ab8 100755
--- a/js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
@@ -65,7 +65,7 @@ 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;  //prop = "lightDiff";
 
                 // make sure we have legitimate imput
                 var ok = this.validateProperty( prop, value );
@@ -97,22 +97,27 @@ function BumpMetalMaterial()
         this.init = function( world )
         {
                 // save the world
-                if (world)  this.setWorld( world );
-
-                // set up the shader
-                this._shader = new jshader();
-                this._shader.def = bumpMetalMaterialDef;
-                this._shader.init();
-                this._shader.default.u_light0Diff.set( this.getLightDiff() );
-
-                // set up the material node
-                this._materialNode = createMaterialNode( this.getShaderName() );
-                this._materialNode.setShader(this._shader);
-
-                // set some image maps
-                this.updateTexture(1);
-        this.updateTexture(2);
-        this.updateTexture(3);
+                if (world)  
+                {
+                        this.setWorld( world );
+
+                        // set up the shader
+                        this._shader = new jshader();
+                        this._shader.def = bumpMetalMaterialDef;
+                        this._shader.init();
+                        this._shader.default.u_light0Diff.set( this.getLightDiff() );
+
+                        // set up the material node
+                        this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
+                        this._materialNode.setShader(this._shader);
+
+                        // set some image maps
+                        this.updateTexture(1);
+                        this.updateTexture(2);
+                        this.updateTexture(3);
+                }
+                else
+                        throw new Error( "GLWorld not supplied to material initialization" );
         };
 
         this.updateTexture = function( index )
diff --git a/js/helper-classes/backup-delete/Materials/DeformMaterial.js b/js/helper-classes/backup-delete/Materials/DeformMaterial.js
index ddc97383..b7101227 100644
--- a/js/helper-classes/backup-delete/Materials/DeformMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/DeformMaterial.js
@@ -71,7 +71,7 @@ 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/helper-classes/backup-delete/Materials/FlatMaterial.js b/js/helper-classes/backup-delete/Materials/FlatMaterial.js
index 570e7f9e..eb8970b8 100755
--- a/js/helper-classes/backup-delete/Materials/FlatMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/FlatMaterial.js
@@ -40,19 +40,27 @@ 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();
+                // 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 the defaults
+                        this._shader.colorMe.color.set( this.getColor() );
 
-                // set up the material node
-                this._materialNode = createMaterialNode("flatMaterial");
-                this._materialNode.setShader(this._shader);
+                        // 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" );
         };
 
 
@@ -83,11 +91,7 @@ function FlatMaterial()
                 // 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/helper-classes/backup-delete/Materials/FlyMaterial.js b/js/helper-classes/backup-delete/Materials/FlyMaterial.js
index 4a44e2e5..a70b53e8 100644
--- a/js/helper-classes/backup-delete/Materials/FlyMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/FlyMaterial.js
@@ -71,7 +71,7 @@ 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/helper-classes/backup-delete/Materials/JuliaMaterial.js b/js/helper-classes/backup-delete/Materials/JuliaMaterial.js
index f95263f4..9b5d588c 100644
--- a/js/helper-classes/backup-delete/Materials/JuliaMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/JuliaMaterial.js
@@ -73,7 +73,7 @@ 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/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js b/js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
index 1547aca9..af7ce97c 100644
--- a/js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
@@ -71,7 +71,7 @@ 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);