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, 14 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 6b71593f..e0324e69 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -105,6 +105,20 @@ var TwistVertMaterial = function TwistVertMaterial()
         this.setShaderValues();
         };
 
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = 0.0;
+                this._propValues[this._propNames[1]] = 1.0;
+                this._propValues[this._propNames[2]] = 2.0 * Math.PI;
+                this._propValues[this._propNames[3]] = this._speed;
+                this._propValues[this._propNames[4]] = this._tex0.slice();
+                this._propValues[this._propNames[5]] = this._tex1.slice();
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
+
         this.update = function (time)
         {
                 if (this._shader && this._shader.twistMe)