26 files changed, 1920 insertions, 546 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 27d5793c..4d19c9c1 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.
@@ -18,10 +20,16 @@ var BumpMetalMaterial = function 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._diffuseTexture = "assets/images/metal.png";
+    this._specularTexture = "assets/images/silver.png";
         this._normalTexture = "assets/images/normalMap.png";
 
+    // keep the array of initialized textures
+    this._textures = [];
+
+        this._speed = 1.0;
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -48,28 +56,27 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     };
 
         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.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.updateTexture(2);        };
+        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.updateTexture(3);        };
+        this.setSpecularTexture = function(m)           {  this._propValues[this._propNames[3]] = m ? m.slice(0) : null;  this.initTexture(3);          };
 
         this.isAnimated                 = function()            {  return true;                                 };
 
     ///////////////////////////////////////////////////////////////////////
     // 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                 = ["lightDiff",         "diffuseTexture",       "normalMap" ];
+        this._propLabels                = ["Diffuse Color",     "Diffuse Map",          "Bump Map" ];
+        this._propTypes                 = ["color",                     "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 )
@@ -108,8 +115,8 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         {
                 // save the world
                 if (world) {
-                     this.setWorld( world );
-                }
+                         this.setWorld( world );
+        }
 
                 // set up the shader
                 this._shader = new RDGE.jshader();
@@ -121,12 +128,40 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 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.initTextures();
         };
 
+        this.initTexture = function( index )
+        {
+                var dstWorld = this.getWorld();
+                if (dstWorld)
+                {
+                        var texMapName = this._propValues[this._propNames[index]];
+                        if (texMapName)
+                        {
+                                var texture = new Texture( dstWorld, texMapName );
+                                this._textures[index] = texture;
+                        }
+                        else
+                                this._textures[index] = null;
+                                
+                        this.updateTexture( index );
+                }
+        }
+
+        this.initTextures = function()
+        {
+                 var dstWorld = this.getWorld();
+                if (dstWorld)
+                {
+                        // find the world with the given id
+                        for (var i=1;  i<=3;  i++)
+                        {
+                                this.initTexture( i );
+                        }
+                }
+   }
+
         this.updateTexture = function( index )
         {
                 var material = this._materialNode;
@@ -136,11 +171,16 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                         var renderer = RDGE.globals.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 );
+                                var glTex = this._textures[ index ];
+                                var tex;
+                                if (glTex)
+                                {
+                                        if (glTex.isAnimated())
+                                                glTex.render();
+
+                                        tex = glTex.getTexture();
+                                }
 
-                                if (tex)
                                 {
                                         switch (index)
                                         {
@@ -258,7 +298,6 @@ var bumpMetalMaterialDef = bumpMetalShaderDef =
                                 'params' : 
                                 {