23 files changed, 967 insertions, 317 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 27d5793c..4bc5dfe8 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,14 @@ 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 = [];
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -48,13 +54,13 @@ 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;                                 };
 
@@ -108,8 +114,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 +127,35 @@ 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);
+                // DEBUG CODE
+                this.initTextures();
         };
 
+        this.initTexture = function( index )
+        {
+                var dstWorld = this.getWorld();
+                if (dstWorld)
+                {
+                        var texMapName = this._propValues[this._propNames[index]];
+                        var texture = new Texture( dstWorld, texMapName );
+                        this._textures[index] = texture;
+                        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,20 +165,24 @@ 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 );
-
-                                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 );
-                                        }
-                                }
+                var glTex = this._textures[ index ];
+                if (glTex)
+                {
+                    if (glTex.isAnimated())
+                        glTex.render();
+
+                    var tex = glTex.getTexture();
+                                    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 );
+                                            }
+                                    }
+                }
                         }
                 }
         };
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index bde42ac3..0cf428b0 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -4,25 +4,55 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
-var Material = require("js/lib/rdge/materials/material").Material;
+var MaterialParser              = require("js/lib/rdge/materials/material-parser").MaterialParser;
+var Material                    = require("js/lib/rdge/materials/material").Material;
+var GLWorld                             = require("js/lib/drawing/world").World;
+var Texture                             = require("js/lib/rdge/texture").Texture;
+var ElementMediator             = require("js/mediators/element-mediator").ElementMediator;
+var TagTool                             = require("js/tools/TagTool").TagTool;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
 ///////////////////////////////////////////////////////////////////////
-var CloudMaterial = function CloudMaterial() {
+var CloudMaterial = function CloudMaterial()
+{
     ///////////////////////////////////////////////////////////////////////
     // Instance variables