1 files changed, 34 insertions, 198 deletions

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index c1d1913c..ca244629 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -6,6 +6,7 @@
 
 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;
 
     ///////////////////////////////////////////////////////////////////////
@@ -189,6 +194,7 @@ var UberMaterial = function UberMaterial() {
                 if (material) {
                         var technique = material.shaderProgram.defaultTechnique;    
                         technique.u_diffuseColor.set(this._diffuseColor);
+            this.getWorld().restartRenderLoop();
                 }
         };
 
@@ -258,6 +264,7 @@ var UberMaterial = function UberMaterial() {
                 if ((value == null) || (value.length == 0)) {
                         if (this._useDiffuseMap) {
                                 this._useDiffuseMap = false;
+                this._diffuseTexture = undefined;
                                 this.rebuildShader();
                         }
                 } else {
@@ -270,8 +277,8 @@ var UberMaterial = function UberMaterial() {
                                         var technique = material.shaderProgram.defaultTechnique;
                                         var renderer = g_Engine.getContext().renderer;
                                         if (renderer && technique) {
-                                                var tex = renderer.getTextureByName(value, caps.diffuseMap.wrap);
-                                                this.registerTexture( tex );
+                        this._diffuseTexture = new Texture( this.getWorld(), value,  caps.diffuseMap.wrap );
+                        var tex = this._diffuseTexture.getTexture();
                                                 technique.s_diffuseMap.set( tex );
                                         }
                                 }
@@ -370,118 +377,29 @@ var UberMaterial = function UberMaterial() {
                 this._materialNode.setShader(this._shader);
         };
 
-        this.import = function( importStr )
-        {
-                // limit the key searches to this material
-        var endKey = "endMaterial\n";
-        var index = importStr.indexOf( endKey );
-        index += endKey.length;
-        importStr = importStr.slice( 0, index );
-                var pu = new MaterialParser( importStr );
-
-                var matProps = pu.nextValue( "materialProps: " );
-                if (matProps)
-                {
-                        var ambientColor  = eval( "[" + pu.nextValue("ambientColor: ")   + ']' );        this.setProperty( "ambientColor", ambientColor );
-                        var diffuseColor  = eval( "[" + pu.nextValue( "diffuseColor: ")  + ']' );        this.setProperty( "diffuseColor", diffuseColor );
-                        var specularColor = eval( "[" + pu.nextValue( "specularColor: ") + ']' );        this.setProperty( "specularColor", specularColor );
-                        var specularPower = eval( "[" + pu.nextValue( "specularPower: ") + ']' );    this.setProperty( "specularPower", specularPower );
-                }
-
-                var lightProps = pu.nextValue( "lightProps: " );
-                if (lightProps)
-                {
-                        this._lights = [];
-                        var lightStr;
-                        for (var i=0;  i<this._MAX_LIGHTS;  i++)
-                        {
-                                var type = pu.nextValue( "light" + i + ": " );
-                                if (type)
-                                {
-                                                var light = new Object;
-                                                switch (type)
-                                                {
-                                                        case "directional":
-                                                                lightStr = pu.nextValue( 'light' + i + 'Dir: ');
-                                                                light.direction = eval( "[" + lightStr + "]" );
-                                                                break;
-
-                                                        case "spot":
-                                                                lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
-                                                                light.position =  eval( "[" + lightStr + "]" );
-
-                                                                lightStr = pu.nextValue( 'light' + i + 'OuterSpotCutoff: ' );
-                                                                light['spotInnerCutoff'] = Number( lightStr );
-
-                                                                lightStr = pu.nextValue( 'light' + i + 'InnerSpotCutoff: ' );
-                                                                light['spotOuterCutoff'] = Number( lightStr );
-                                                                break;
-
-                                                        case "point":
-                                                                lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
-                                                                light.position =  eval( "[" + lightStr + "]" );
-
-                                                                lightStr = pu.nextValue( 'light' + i + 'Attenuation: ' );
-                                                                light.attenuation =  eval( "[" + lightStr + "]" );
-                                                                break;
-
-                                                        default:
-                                                                throw new Error( "unrecognized light type on import: " + type );
-                                                                break;
-                                                }
-
-                                                // common to all lights
-                                                light.diffuseColor = eval( "[" + pu.nextValue( 'light' + i + 'Color: ') + "]" );
-                                                light.specularColor = eval( "[" + pu.nextValue( 'light' + i + 'SpecularColor: ') + "]" );
-
-                                                // push the light
-                                                this._lights.push( light );
-                                }
-                                else
-                                        this._lights[i] = 'undefined';
-
-                                // advance to the next light
-                                var endLightKey = "endMaterial\n";
-                                index = importStr.indexOf( endLightKey );
-                                if (index < 0)  throw new Error( "ill-formed light encountered in import" );
-                                index += endLightKey.length;
-                                importStr = importStr.slice( 0, index );
-
-                        }
-
-                        if (this._lights.length > 0)
-                        {
-                                this._ubershaderCaps.lighting =
-                                {
-                                        'light0' : this._lights[0],
-                                        'light1' : this._lights[1],
-                                        'light2' : this._lights[2],        
-                                        'light3' : this._lights[3]                                     
-                                }
-                        }
-                }
-
-                var diffuseMap = pu.nextValue( "diffuseMap: "  )
-                if(diffuseMap)
-                        this.setProperty( "diffuseMap", diffuseMap );
-
-                var normalMap = pu.nextValue( "normalMap: "  );
-                if(normalMap)
-                        this.setProperty( "normalMap", normalMap );
-
-                var specularMap = pu.nextValue( "specularMap: "  );
-                if(specularMap)
-                        this.setProperty( "specularMap", specularMap );
-
-                var environmentMap = pu.nextValue( "environmentMap: "  );
-                if(environmentMap)
-                {
-                        this.setProperty( "environmentMap", environmentMap );
-                        this.setProperty( "environmentAmount", Number( pu.nextValue( "environmentAmount" ) ) );
-                }
+    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.rerender();
+                                    technique.s_diffuseMap.set( this._diffuseTexture.getTexture() );
+                }
+            }
+        }
+    }
 
-                this.rebuildShader();
-        }
+    this.isAnimated     = function()
+    {
+        var anim = (this._diffuseTexture && this._diffuseTexture.isAnimated());
+        return anim;
+    }
 
         this.importJSON = function( jObj )
         {
@@ -658,88 +576,6 @@ var UberMaterial = function UberMaterial() {
                 return jObj;