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

diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js
index 0b4923aa..02af8ec0 100644
--- a/js/lib/rdge/materials/plasma-material.js
+++ b/js/lib/rdge/materials/plasma-material.js
@@ -104,6 +104,18 @@ var PlasmaMaterial = function PlasmaMaterial() {
                 this._shader['default'].u_time.set( [this._time] );
                 this._time += this._dTime;
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._wave;
+                this._propValues[ this._propNames[1] ] = this._wave1;
+                this._propValues[ this._propNames[2] ] = this._wave2;
+                this._propValues[ this._propNames[3] ] = this._speed;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////