Merge branch 'refs/heads/master' into PresetsPanel

1 files changed, 69 insertions, 37 deletions

diff --git a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
index 0aa3ee78..a7a3724e 100644
--- a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
+++ b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
@@ -22,44 +22,43 @@ function BumpMetalMaterial()
         this._shaderName = "bumpMetal";
 
         this._lightDiff = [0.3, 0.3, 0.3, 1.0];
-        this._diffuseTexture = "metal";
-        this._specularTexture = "silver";
-        this._normalTexture = "normalMap";
+        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.getName                    = function()            {       return this._name;                                                              };
+        this.getShaderName              = function()            {       return this._shaderName;                                                };
 
-        this.getLightDiff               = function()            {       return this._lightDiff;                                                 }
+        this.getLightDiff               = function()            {       return this._lightDiff;                                                 };
         this.setLightDiff               = function(ld)          {       this._lightDiff = ld;
                                                                                                         if (this._shader && this._shader.default)
-                                                                                                                this._shader.default.u_light0Diff.set( ld );    }
+                                                                                                                this._shader.default.u_light0Diff.set( ld );    };
 
-        this.getDiffuseTexture  = function()            {       return this._diffuseTexture;                                    }
-        this.setDiffuseTexture  = function(dt)          {       this._diffuseTexture = dt;
-                                                                                                        if (this._materialNode)  this._materialNode.setDiffuseTexture( dt );    }
+        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.getSpecularTexture = function()            {       return this._specularTexture;                                   }
-        this.setSpecularTexture = function(st)          {       this._specularTexture = st;
-                                                                                                        if (this._materialNode)  this._materialNode.setSpecularTexture( st );   }
+        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.getNormalTexture   = function()            {       return this._normalTexture;                                             }
-        this.setNormalTexture   = function(nt)          {       this._normalTexture = nt;
-                                                                                                        if (this._materialNode)  this._materialNode.setNormalTexture( nt );             }
+        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.isAnimated                 = function()            {  return true;                                 };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["lightDiff",         "diffuseMap",   "normalMap",    "specularMap"];
+        this._propNames                 = ["lightDiff",         "diffuseTexture",       "normalMap",    "specularTexture"];
         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._specularTexture.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"
@@ -87,16 +86,19 @@ function BumpMetalMaterial()
                                 console.log( "invalid property to Bump Metal Material: " + prop + ", value: " + value );
                                 break;
                 }
-        }
+        };
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
         // duplcate method requirde
-        this.dup = function()   {  return new BumpMetalMaterial();      } 
+        this.dup = function()   {  return new BumpMetalMaterial();      };
 
-        this.init = function()
+        this.init = function( world )
         {
+                // save the world
+                if (world)  this.setWorld( world );
+
                 // set up the shader
                 this._shader = new jshader();
                 this._shader.def = bumpMetalMaterialDef;
@@ -108,10 +110,37 @@ function BumpMetalMaterial()
                 this._materialNode.setShader(this._shader);
 
                 // set some image maps
-                this._materialNode.setDiffuseTexture( this.getDiffuseTexture() );
-        this._materialNode.setSpecTexture( this.getSpecularTexture() );
-        this._materialNode.setNormalTexture( this.getNormalTexture() );
-        }
+                this.updateTexture(1);
+        this.updateTexture(2);
+        this.updateTexture(3);
+        };
+
+        this.updateTexture = function( index )
+        {
+                var material = this._materialNode;
+                if (material)
+                {
+                        var technique = material.shaderProgram.default;
+                        var renderer = g_Engine.getContext().renderer;
+                        if (renderer && technique)
+                        {
+                                var texMapName = this._propValues[this._propNames[index]];
+                                var wrap = 'REPEAT',  mips = true;
+                                var tex = this.loadTexture( texMapName, wrap, mips );
+
+                                if (tex)
+                                {
+                                        switch (index)
+                                        {
+                                                case 1:         technique.u_colMap.set( tex );          break;
+                                                case 2:         technique.u_normalMap.set( tex );       break;
+                                                case 3:         technique.u_glowMap.set( tex );         break;
+                                                default:        console.log( "invalid map index in BumpMetalMaterial, " + index );
+                                        }
+                                }
+                        }
+                }
+        };
 
         this.export = function()
         {
@@ -122,13 +151,13 @@ function BumpMetalMaterial()
                 exportStr += "lightDiff: "                      + this.getLightDiff()           + "\n";
                 exportStr += "diffuseTexture: "         + this.getDiffuseTexture()      + "\n";
                 exportStr += "specularTexture: "        + this.getSpecularTexture()     + "\n";
-                exportStr += "normalTexture: "          + this.getNormalTexture()       + "\n";
+                exportStr += "normalMap: "              + this.getNormalTexture()       + "\n";
 
                 // every material needs to terminate like this
                 exportStr += "endMaterial\n";
 
                 return exportStr;
-        }
+        };
 
         this.import = function( importStr )
         {
@@ -143,12 +172,12 @@ function BumpMetalMaterial()
                         var lightDiff  = eval( "[" + pu.nextValue( "lightDiff: " ) + "]" ),
                                 dt = pu.nextValue( "diffuseTexture: " ),
                                 st = pu.nextValue( "specularTexture: " ),
-                                nt = pu.nextValue( "normalTexture: " );
+                                nt = pu.nextValue( "normalMap: " );
                 
-                        this.setProperty( "lightDiff",  lightDif);
+                        this.setProperty( "lightDiff",  lightDiff);
                         this.setProperty( "diffuseTexture", dt );
                         this.setProperty( "specularTexture", st );
-                        this.setProperty( "normalTexture", nt ); 
+                        this.setProperty( "normalMap", nt );
 
                         var endKey = "endMaterial\n";
                         var index = importStr.indexOf( endKey );
@@ -161,7 +190,7 @@ function BumpMetalMaterial()
                 }