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, 9 insertions, 5 deletions

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index e1d17aa8..a7183187 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -56,16 +56,12 @@ var Material = function GLMaterial( world ) {
         // vertex deformation variables
         this._hasVertexDeformation = false;
         this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
-        this._vertexDeformationTolerance = 0.1;
+        this._vertexDeformationTolerance = 0.02;
 
         // RDGE variables
         this._shader = null;
         this._materialNode = null;
 
-        // vertex deformation variables
-        this._hasVertexDeformation = false;
-        this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
-        this._vertexDeformationTolerance = 0.02;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
@@ -396,6 +392,10 @@ var Material = function GLMaterial( world ) {
                 throw new Error( "Material.init() must be overridden by subclass" );
         };
 
+        this.resetToDefault = function()  {
+                // materials should override this functinon
+        };
+
         this.update = function( time ) {
                 // animated materials should implement the update method
         };
@@ -404,6 +404,10 @@ var Material = function GLMaterial( world ) {
                 // some materials need to preserve an aspect ratio - or someting else.
         };
 
+        this.fitToPrimitiveArray = function( primArray )  {
+                // some materials need to preserve an aspect ratio - or someting else.
+        };
+
         this.registerTexture = function( texture ) {
                 // the world needs to know about the texture map
                 var world = this.getWorld();