1 files changed, 58 insertions, 2 deletions

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index e94458cc..d7bc2a87 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -6,6 +6,7 @@ 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;
 
 var UberMaterial = function UberMaterial() {
     ///////////////////////////////////////////////////////////////////////
@@ -23,7 +24,8 @@ var UberMaterial = function UberMaterial() {
     this._environmentAmount = 0.2;      // 0 .. 1
 
     // set the default maps
-    this._diffuseMapOb = { 'texture': 'assets/images/rocky-diffuse.jpg', 'wrap': 'REPEAT' };
+        this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
+        //this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
     this._normalMapOb = { 'texture': 'assets/images/rocky-normal.jpg', 'wrap': 'REPEAT' };
     this._specularMapOb = { 'texture': 'assets/images/rocky-spec.jpg', 'wrap': 'REPEAT' };
     this._environmentMapOb = { 'texture': 'assets/images/silver.png', 'wrap': 'CLAMP', 'envReflection': this._environmentAmount };
@@ -34,6 +36,9 @@ var UberMaterial = function UberMaterial() {
     this._useEnvironmentMap = true;
     this._useLights = [true, true, true, true];
 
+    // these are the abstracted texture objects - defined where they are set
+    this._diffuseTexture;
+
     this._MAX_LIGHTS = 4;
 
     ///////////////////////////////////////////////////////////////////////
@@ -188,6 +193,7 @@ var UberMaterial = function UberMaterial() {
         if (material) {
             var technique = material.shaderProgram.defaultTechnique;
             technique.u_diffuseColor.set(this._diffuseColor);
+            this.getWorld().restartRenderLoop();
         }
     };
 
@@ -256,6 +262,7 @@ var UberMaterial = function UberMaterial() {
         if ((value == null) || (value.length == 0)) {
             if (this._useDiffuseMap) {
                 this._useDiffuseMap = false;
+                this._diffuseTexture = undefined;
                 this.rebuildShader();
             }
         } else {
@@ -277,6 +284,30 @@ var UberMaterial = function UberMaterial() {
         }
     };
 
+                
+        this.updateTextures = function()
+        {
+                var material = this._materialNode;
+                if (material)
+                {
+                        var technique = material.shaderProgram.defaultTechnique;
+                        var renderer = RDGE_globals.engine.getContext().renderer;
+                        if (renderer && technique)
+                        {
+                                if (this._diffuseTexture)
+                                {
+                                        if (!this._diffuseTexture.isAnimated())
+                                        {
+                                                this._diffuseTexture.render();
+                        var tex = this._diffuseTexture.getTexture();
+                                                technique.s_diffuseMap.set( tex );
+                                        }
+                                }
+                        }
+                }
+        }
+
+
     this.updateSpecularMap = function () {
         var value = this._propValues["specularMap"];
         this._specularMapOb.texture = value;
@@ -367,7 +398,32 @@ var UberMaterial = function UberMaterial() {
         this._materialNode.setShader(this._shader);
     };
 
-    this.importJSON = function (jObj) {
+   this.update = function()
+    {
+                var material = this._materialNode;
+                if (material)
+        {
+                    var technique = material.shaderProgram.defaultTechnique;
+                    var renderer = g_Engine.getContext().renderer;
+                    if (renderer && technique)
+            {
+                if (this._diffuseTexture && this._diffuseTexture.isAnimated())
+                {
+                    this._diffuseTexture.render();
+                                    technique.s_diffuseMap.set( this._diffuseTexture.getTexture() );
+                }
+            }
+        }
+    }
+        
+    this.isAnimated     = function()
+    {
+        var anim = (this._diffuseTexture && this._diffuseTexture.isAnimated());
+        return anim;
+    }
+
+    this.importJSON = function (jObj)
+        {
         if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
         this.setName(jObj.name);