1 files changed, 150 insertions, 133 deletions

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 416cb980..7c7dced4 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -45,11 +45,11 @@ var UberMaterial = function UberMaterial() {
     this._diffuseColor = [1.0, 1.0, 1.0, 1.0];
     this._specularColor = [1.0, 1.0, 1.0, 1.0];
     this._specularPower = 32.0;
-    this._environmentAmount = 0.2;      // 0 .. 1
+    this._environmentAmount = 0.2;  // 0 .. 1
 
     // set the default maps
-        this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
-        //this._diffuseMapOb = { 'texture' : 'texture', '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 };
@@ -86,6 +86,23 @@ var UberMaterial = function UberMaterial() {
     this._propValues[this._propNames[7]] = this._environmentMapOb['texture'];
     this._propValues[this._propNames[8]] = this._environmentMapOb['envReflection'];
 
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = this._ambientColor.slice(0);
+                this._propValues[this._propNames[1]] = this._diffuseColor.slice(0);
+                this._propValues[this._propNames[2]] = this._specularColor.slice(0);
+                this._propValues[this._propNames[3]] = this._specularPower;
+                this._propValues[this._propNames[4]] = this._diffuseMapOb['texture'];
+                this._propValues[this._propNames[5]] = this._normalMapOb['texture'];
+                this._propValues[this._propNames[6]] = this._specularMapOb['texture'];
+                this._propValues[this._propNames[7]] = this._environmentMapOb['texture'];
+                this._propValues[this._propNames[8]] = this._environmentMapOb['envReflection'];
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
+
     this.setProperty = function (prop, value) {
         if (prop == "color") prop = "ambientColor";
         var valid = this.validateProperty(prop, value);
@@ -140,86 +157,86 @@ var UberMaterial = function UberMaterial() {
     // define the 4 lights
     this._lights = [
 
-                {
-                    'type': 'point',                           // can be 'directional', 'point' or 'spot'
-                    'spotInnerCutoff': 14.0,                   // fragments in the inner cutoff 'cone' are full intensity.
-                    'spotOuterCutoff': 15.0,                   // fragments outside the outer cutoff 'cone' are unlit.
-                    'position': [8.0, 2.0, 8.0],             // light position; ignored for directional lights
-                    'direction': [-1.0, -1.0, -1.0],         // light direction; ignored for point lights
-                    'attenuation': [1.0, 0.025, 0.00125],    // light attenuation; constant, linear, quadratic 
-                    'diffuseColor': [1.0, 0.5, 0.5, 1.0],    // diffuse light color
-                    'specularColor': [1.0, 1.0, 1.0, 1.0]    // specular light color  
-                },
-                {
-                    'type': 'point',
-                    'spotInnerCutoff': 9.0,
-                    'spotOuterCutoff': 20.0,
-                    'position': [-8.0, 2.0, 8.0],
-                    'direction': [1.0, -1.0, -1.0],
-                    'attenuation': [1.0, 0.025, 0.00125],
-                    'diffuseColor': [0.5, 1.0, 0.5, 1.0],
-                    'specularColor': [1.0, 1.0, 1.0, 1.0]
-                },
-                {
-                    'type': 'point',
-                    'spotInnerCutoff': 9.0,
-                    'spotOuterCutoff': 20.0,
-                    'position': [-8.0, 2.0, -8.0],
-                    'direction': [1.0, -1.0, 1.0],
-                    'attenuation': [1.0, 0.25, 0.0125],
-                    'diffuseColor': [0.5, 0.5, 1.0, 1.0],
-                    'specularColor': [1.0, 1.0, 1.0, 1.0]
-                },
-                {
-                    'type': 'point',
-                    'spotInnerCutoff': 9.0,
-                    'spotOuterCutoff': 20.0,
-                    'position': [8.0, 4.0, -8.0],
-                    'direction': [-1.0, -1.0, 1.0],
-                    'attenuation': [1.0, 0.25, 0.0125],
-                    'diffuseColor': [1.0, 1.0, 0.5, 1.0],
-                    'specularColor': [1.0, 1.0, 1.0, 1.0]
-                }
-        ];
+        {
+            'type': 'point',                           // can be 'directional', 'point' or 'spot'
+            'spotInnerCutoff': 14.0,                   // fragments in the inner cutoff 'cone' are full intensity.
+            'spotOuterCutoff': 15.0,                   // fragments outside the outer cutoff 'cone' are unlit.
+            'position': [8.0, 2.0, 8.0],             // light position; ignored for directional lights
+            'direction': [-1.0, -1.0, -1.0],         // light direction; ignored for point lights
+            'attenuation': [1.0, 0.025, 0.00125],    // light attenuation; constant, linear, quadratic
+            'diffuseColor': [1.0, 0.5, 0.5, 1.0],    // diffuse light color
+            'specularColor': [1.0, 1.0, 1.0, 1.0]    // specular light color
+        },
+        {
+            'type': 'point',
+            'spotInnerCutoff': 9.0,
+            'spotOuterCutoff': 20.0,
+            'position': [-8.0, 2.0, 8.0],
+            'direction': [1.0, -1.0, -1.0],
+            'attenuation': [1.0, 0.025, 0.00125],
+            'diffuseColor': [0.5, 1.0, 0.5, 1.0],
+            'specularColor': [1.0, 1.0, 1.0, 1.0]
+        },
+        {
+            'type': 'point',
+            'spotInnerCutoff': 9.0,
+            'spotOuterCutoff': 20.0,
+            'position': [-8.0, 2.0, -8.0],
+            'direction': [1.0, -1.0, 1.0],
+            'attenuation': [1.0, 0.25, 0.0125],
+            'diffuseColor': [0.5, 0.5, 1.0, 1.0],
+            'specularColor': [1.0, 1.0, 1.0, 1.0]
+        },
+        {
+            'type': 'point',
+            'spotInnerCutoff': 9.0,
+            'spotOuterCutoff': 20.0,
+            'position': [8.0, 4.0, -8.0],
+            'direction': [-1.0, -1.0, 1.0],
+            'attenuation': [1.0, 0.25, 0.0125],
+            'diffuseColor': [1.0, 1.0, 0.5, 1.0],
+            'specularColor': [1.0, 1.0, 1.0, 1.0]
+        }
+    ];
 
     this._ubershaderCaps =
-        {
-            // ubershader material properties. 
-            'material': {
-                'ambientColor': this._ambientColor,    // material ambient color
-                'diffuseColor': this._diffuseColor,    // material diffuse color
-                'specularColor': this._specularColor,   // material specular color
-                'specularPower': this._specularPower    // material specular power (shininess)
-            },
-
-            // ubershader supports up to four lights. 
-            'lighting': {
-                'light0': this._lights[0],
-                'light1': this._lights[1],
-                'light2': this._lights[2],
-                'light3': this._lights[3]
-            },
-
-            // uvTransform can be used to scale or offset the texture coordinates.
-            'uvTransform': [2.0, 0, 0, 0, 0, 2.0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1],
-
-            // optional diffuse map
-            'diffuseMap': this._diffuseMapOb,
-
-            // optional normal map
-            'normalMap': this._normalMapOb,
-
-            // optional specular map
-            'specularMap': this._specularMapOb,
-
-            // optional environment map
-            'environmentMap': this._environmentMapOb
-        };
+    {
+        // ubershader material properties.
+        'material': {
+            'ambientColor': this._ambientColor,    // material ambient color
+            'diffuseColor': this._diffuseColor,    // material diffuse color
+            'specularColor': this._specularColor,   // material specular color
+            'specularPower': this._specularPower    // material specular power (shininess)
+        },
+
+        // ubershader supports up to four lights.
+        'lighting': {
+            'light0': this._lights[0],
+            'light1': this._lights[1],
+            'light2': this._lights[2],
+            'light3': this._lights[3]
+        },
+
+        // uvTransform can be used to scale or offset the texture coordinates.
+        'uvTransform': [2.0, 0, 0, 0, 0, 2.0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1],
+
+        // optional diffuse map
+        'diffuseMap': this._diffuseMapOb,
+
+        // optional normal map
+        'normalMap': this._normalMapOb,
+
+        // optional specular map
+        'specularMap': this._specularMapOb,
+
+        // optional environment map
+        'environmentMap': this._environmentMapOb
+    };
 
     this.updateAmbientColor = function () {
         this._ambientColor = this._propValues['ambientColor'].slice(0);
         var material = this._materialNode;
-                //console.log( "ambient color: " + this._ambientColor );
+        //console.log( "ambient color: " + this._ambientColor );
         if (material) {
             var technique = material.shaderProgram.defaultTechnique;
             technique.u_ambientColor.set(this._ambientColor);
@@ -295,34 +312,34 @@ var UberMaterial = function UberMaterial() {
         }
     };
 
-        this.updateDiffuseMap = function(value) {
-                var value = this._propValues[ "diffuseMap" ];
-                this._diffuseMapOb.texture = value;
+    this.updateDiffuseMap = function(value) {
+        var value = this._propValues[ "diffuseMap" ];
+        this._diffuseMapOb.texture = value;
 
-                if ((value == null) || (value.length == 0)) {
-                        if (this._useDiffuseMap) {
-                                this._useDiffuseMap = false;
+        if ((value == null) || (value.length == 0)) {
+            if (this._useDiffuseMap) {
+                this._useDiffuseMap = false;
                 this._diffuseTexture = undefined;
-                                this.rebuildShader();
-                        }
-                } else {
-                        if (!this._useDiffuseMap) {
-                                this._useDiffuseMap = true;
-                                this.rebuildShader();
-                        } else {
-                                var material = this._materialNode;
+                this.rebuildShader();
+            }
+        } else {
+            if (!this._useDiffuseMap) {
+                this._useDiffuseMap = true;
+                this.rebuildShader();
+            } else {
+                var material = this._materialNode;