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, 22 insertions, 2 deletions

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 50ef56f0..137ced27 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -26,7 +26,7 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
+ </copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -104,6 +104,26 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
                 this.update( 0 );
     };
 
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = this._color1.slice(0);
+                this._propValues[this._propNames[1]] = this._color2.slice(0);
+                this._propValues[this._propNames[2]] = this._color3.slice(0);
+                this._propValues[this._propNames[3]] = this._color4.slice(0);
+
+                this._propValues[this._propNames[4]] = this._colorStop1;
+                this._propValues[this._propNames[5]] = this._colorStop2;
+                this._propValues[this._propNames[6]] = this._colorStop3;
+                this._propValues[this._propNames[7]] = this._colorStop4;
+
+                this._propValues[this._propNames[8]] = [ Math.cos(this._angle), Math.sin(this._angle) ];
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++) {
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+                }
+        };
+
     // Only Linear Gradient and Radial Gradients support gradients;
     this.gradientType = "linear";
 
@@ -134,7 +154,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         css += ')';
 
         return css;
-    };
+        };
 
     // Only Linear Gradient and Radial Gradient have gradient data.
     this.setGradientData = function(colors) {