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

26 files changed, 1851 insertions, 1947 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 27d5793c..99a80da2 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -6,6 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
+var Texture = require("js/lib/rdge/texture").Texture;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
@@ -14,184 +16,61 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "BumpMetalMaterial";
+        this._name = "Bump Metal";
         this._shaderName = "bumpMetal";
 
-        this._lightDiff = [0.3, 0.3, 0.3, 1.0];
-        this._diffuseTexture = "assets/images/metal.png";
-        this._specularTexture = "assets/images/silver.png";
-        this._normalTexture = "assets/images/normalMap.png";
-
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-        this.getName = function() {
-        return this._name;
-    };
 
-    this.getShaderName = function() {
-        return this._shaderName;
-    };
-
-        this.getLightDiff = function() {
-        return this._lightDiff;
-    };
-
-        this.setLightDiff = function(ld) {
-        this._lightDiff = ld;
-        // Bad property name. Commenting for now
-
-        if (this._shader && this._shader['default']){
-            this._shader['default'].u_light0Diff.set( ld );
-        }
+    this._defaultDiffuseTexture = "assets/images/metal.png";
+    this._defaultSpecularTexture = "assets/images/silver.png";
+        this._defaultNormalTexture = "assets/images/normalMap.png";
 
-    };
+    // array textures indexed by shader uniform name
+    this._glTextures = [];
 
-        this.getDiffuseTexture  = function()            {  return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null    };
-        this.setDiffuseTexture  = function(m)           {  this._propValues[this._propNames[1]] = m ? m.slice(0) : null;  this.updateTexture(1);        };
-
-        this.getNormalTexture   = function()            {  return this._propValues[this._propNames[2]] ? this._propValues[this._propNames[2]].slice() : null    };
-        this.setNormalTexture   = function(m)           {  this._propValues[this._propNames[2]] = m ? m.slice(0) : null;  this.updateTexture(2);        };
-
-        this.getSpecularTexture = function()            {  return this._propValues[this._propNames[3]] ? this._propValues[this._propNames[3]].slice() : null    };
-        this.setSpecularTexture = function(m)           {  this._propValues[this._propNames[3]] = m ? m.slice(0) : null;  this.updateTexture(3);        };
+        this._speed = 1.0;
 
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
         this.isAnimated                 = function()            {  return true;                                 };
+        this.getShaderDef               = function()            {  return bumpMetalMaterialDef; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["lightDiff",         "diffuseTexture",       "normalMap",    "specularTexture"];
-        this._propLabels                = ["Diffuse Color",     "Diffuse Map",  "Bump Map",             "Specular Map"];
-        this._propTypes                 = ["color",                     "file",                 "file",                 "file"];
+        this._propNames                 = ["u_light0Diff",              "u_colMap",                     "u_normalMap",  "u_glowMap" ];
+        this._propLabels                = ["Diffuse Color",             "Diffuse Map",          "Bump Map",             "Specular Map" ];
+        this._propTypes                 = ["color",                             "file",                         "file",                 "file" ];
         this._propValues                = [];
 
-        this._propValues[ this._propNames[0] ] = this._lightDiff.slice(0);
-        this._propValues[ this._propNames[1] ] = this._diffuseTexture.slice(0);
-        this._propValues[ this._propNames[2] ] = this._normalTexture.slice(0);
-        this._propValues[ this._propNames[3] ] = this._specularTexture.slice(0);
-
-    // TODO - shader techniques are not all named the same, i.e., FlatMaterial uses "colorMe" and BrickMaterial uses "default"
-    this.setProperty = function( prop, value )
-        {
-                // every material should do something with the "color" property
-                if (prop === "color")  return;
-
-                // make sure we have legitimate imput
-                var ok = this.validateProperty( prop, value );
-                if (!ok)
-                {
-                        console.log( "invalid property in Bump Metal Materia;" + prop + " : " + value );
-                        return;
-                }
+        this._propValues[ this._propNames[0] ] = [0.3, 0.3, 0.3, 1.0];
+        this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+        this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+        this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
 
-                switch (prop)
-                {
-                        case "lightDiff":               this.setLightDiff( value );                     break;
-                        case "diffuseTexture":  this.setDiffuseTexture( value );        break;
-                        case "specularTexture": this.setSpecularTexture( value );       break;
-                        case "normalMap":               this.setNormalTexture( value );         break;
-
-                        default:
-                                console.log( "invalid property to Bump Metal Material: " + prop + ", value: " + value );
-                                break;
-                }
-        };
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-        // duplcate method requirde
-        this.dup = function()   {  return new BumpMetalMaterial();      };
 
         this.init = function( world )
         {
                 // save the world
                 if (world) {
-                     this.setWorld( world );
-                }
+                         this.setWorld( world );
+        }
 
                 // set up the shader
                 this._shader = new RDGE.jshader();
                 this._shader.def = bumpMetalMaterialDef;
                 this._shader.init();
-                this._shader['default'].u_light0Diff.set( this.getLightDiff() );
 
                 // set up the material node
                 this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
                 this._materialNode.setShader(this._shader);
 
-                // set some image maps
-                this.updateTexture(1);
-        this.updateTexture(2);
-        this.updateTexture(3);
-        };
-
-        this.updateTexture = function( index )
-        {
-                var material = this._materialNode;
+                this.setShaderValues();
+                this.update(0);