14 files changed, 222 insertions, 1013 deletions

diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl
index 1dbe45a0..a2bb4fa0 100644
--- a/assets/shaders/Deform.frag.glsl
+++ b/assets/shaders/Deform.frag.glsl
@@ -3,6 +3,7 @@ precision highp float;
 #endif
 
 uniform float u_time;
+uniform float u_speed;
 uniform vec2 u_resolution;
 //uniform vec4 mouse;
 uniform sampler2D u_tex0;
@@ -19,7 +20,7 @@ void main(void)
     float r2 = sqrt(dot(p+m,p+m));
 
     vec2 uv;
-    uv.x = 0.2*u_time + (r1-r2)*0.25;
+    uv.x = 0.2*u_time*u_speed + (r1-r2)*0.25;
     uv.y = sin(2.0*(a1-a2));
 
     float w = r1*r2*0.8;
diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl
index f99b5ab8..d36928a1 100644
--- a/assets/shaders/Fly.frag.glsl
+++ b/assets/shaders/Fly.frag.glsl
@@ -4,6 +4,7 @@ precision highp float;
 
 uniform vec2 u_resolution;
 uniform float u_time;
+uniform float u_speed;
 uniform sampler2D u_tex0;
 
 void main(void)
@@ -11,13 +12,13 @@ void main(void)
     vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
     vec2 uv;
 
-    float an = u_time*.25;
+    float an = u_time*u_speed*.25;
 
     float x = p.x*cos(an)-p.y*sin(an);
     float y = p.x*sin(an)+p.y*cos(an);
      
     uv.x = .25*x/abs(y);
-    uv.y = .20*u_time + .25/abs(y);
+    uv.y = .20*u_time*u_speed + .25/abs(y);
 
     gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0);
 }
diff --git a/assets/shaders/Julia.frag.glsl b/assets/shaders/Julia.frag.glsl
index 68cda703..7e616c40 100644
--- a/assets/shaders/Julia.frag.glsl
+++ b/assets/shaders/Julia.frag.glsl
@@ -4,11 +4,12 @@ precision highp float;
 
 uniform vec2 u_resolution;
 uniform float u_time;
+uniform float u_speed;
 
 void main(void)
 {
     vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
-    vec2 cc = vec2( cos(.25*u_time), sin(.25*u_time*1.423) );
+    vec2 cc = vec2( cos(.25*u_time*u_speed), sin(.25*u_time*u_speed*1.423) );
 
     float dmin = 1000.0;
     vec2 z  = p*vec2(1.33,1.0);
diff --git a/assets/shaders/Keleidoscope.frag.glsl b/assets/shaders/Keleidoscope.frag.glsl
index 7d1bdb17..7d95a95b 100644
--- a/assets/shaders/Keleidoscope.frag.glsl
+++ b/assets/shaders/Keleidoscope.frag.glsl
@@ -4,20 +4,24 @@ precision highp float;
 
 uniform vec2 u_resolution;
 uniform float u_time;
+uniform float u_speed;
 uniform sampler2D u_tex0;
 
 void main(void)
 {
     vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
     vec2 uv;
+
+        float time = u_time * u_speed;
    
     float a = atan(p.y,p.x);
     float r = sqrt(dot(p,p));
 
     uv.x =          7.0*a/3.1416;
-    uv.y = -u_time+ sin(7.0*r+u_time) + .7*cos(u_time+7.0*a);
+    uv.y = -time + sin(7.0*r+time) + .7*cos(
+        +7.0*a);
 
-    float w = .5+.5*(sin(u_time+7.0*r)+ .7*cos(u_time+7.0*a));
+    float w = .5+.5*(sin(time+7.0*r)+ .7*cos(time+7.0*a));
 
     vec3 col =  texture2D(u_tex0,uv*.5).xyz;
 
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 30624f7b..f73f1d34 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -19,11 +19,10 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this._name = "BumpMetalMaterial";
         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";
+
+    this._defaultDiffuseTexture = "assets/images/metal.png";
+    this._defaultSpecularTexture = "assets/images/silver.png";
+        this._defaultNormalTexture = "assets/images/normalMap.png";
 
     // keep the array of initialized textures
     this._textures = [];
@@ -33,77 +32,22 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // 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.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.initTexture(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.initTexture(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.initTexture(3);          };
-
         this.isAnimated                 = function()            {  return true;                                 };
+        this.getShaderDef               = function()            {  return bumpMetalMaterialDef; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["lightDiff",         "diffuseTexture",       "normalMap" ];
-        this._propLabels                = ["Diffuse Color",     "Diffuse Map",          "Bump Map" ];
-        this._propTypes                 = ["color",                     "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);
-
-    // 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;
+        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);
 
-                // 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;
-                }
-
-                switch (prop)
-                {
-                        case "lightDiff":               this.setLightDiff( value );                     break;