Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal

Conflicts:
	js/lib/geom/circle.js
	js/lib/rdge/materials/linear-gradient-material.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 416cb980..d242f8f5 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -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);