1 files changed, 24 insertions, 5 deletions

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 7e1f2ec5..6cfc4eb4 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
@@ -201,6 +197,8 @@ var Material = function GLMaterial( world ) {
     };
 
     this.validateProperty = function( prop, value ) {
+        if(prop === "gradient") return true;
+
         var rtnVal = false;
         try
         {
@@ -264,6 +262,9 @@ var Material = function GLMaterial( world ) {
         var material = this._materialNode;
         if (material)  technique = material.shaderProgram[this.getTechniqueName()];
 
+        if(prop === "gradient") {
+            this.setGradientData(value);
+        } else {
         switch (this.getPropertyType(prop))
         {
             case "angle":
@@ -291,6 +292,7 @@ var Material = function GLMaterial( world ) {
                 if (technique)  technique[prop].set( value );
                 break;
         }
+        }
     };
 
     this.setShaderValues = function()
@@ -390,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
     };
@@ -398,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();
@@ -422,6 +432,15 @@ var Material = function GLMaterial( world ) {
         return tex;
     };
 
+    this.gradientType = null;
+
+    this.getGradientData = function() {
+        return null;
+};
+
+    this.setGradientData = function() {
+        // override in linear-gradient-material and radial-gradient-material
+    };
 };
 
 if (typeof exports === "object") {