1 files changed, 79 insertions, 36 deletions

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 65448c0c..a7183187 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -1,7 +1,31 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+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> */
 
 var Texture = require("js/lib/rdge/texture").Texture;
@@ -32,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
@@ -177,6 +197,8 @@ var Material = function GLMaterial( world ) {
     };
 
         this.validateProperty = function( prop, value ) {
+        if(prop === "gradient") return true;
+
                 var rtnVal = false;
                 try
                 {
@@ -240,33 +262,37 @@ var Material = function GLMaterial( world ) {
                 var material = this._materialNode;
                 if (material)  technique = material.shaderProgram[this.getTechniqueName()];
 
-                switch (this.getPropertyType(prop))
-                {
-                        case "angle":
-                        case "float":
-                                this._propValues[prop] = value;
-                                if (technique)  technique[prop].set( [value] );
-                                break;
-
-                        case "file":
-                                this._propValues[prop] = value.slice();
-                                if (technique)
-                                {
-                                        var glTex = new Texture( this.getWorld(),  value );
-                                        this._glTextures[prop] = glTex;
-                                        glTex.render();
-                                        var tex = glTex.getTexture();
-                                        if (tex)  technique[prop].set( tex );
-                                }
-                                break;
-
-                        case "color":
-                        case "vector2d":
-                        case "vector3d":
-                                this._propValues[prop] = value.slice();
-                                if (technique)  technique[prop].set( value );
-                                break;
-                }
+        if(prop === "gradient") {
+            this.setGradientData(value);
+        } else {
+            switch (this.getPropertyType(prop))
+            {
+                case "angle":
+                case "float":
+                    this._propValues[prop] = value;
+                    if (technique)  technique[prop].set( [value] );
+                    break;
+
+                case "file":
+                    this._propValues[prop] = value.slice();
+                    if (technique)
+                    {
+                        var glTex = new Texture( this.getWorld(),  value );
+                        this._glTextures[prop] = glTex;
+                        glTex.render();
+                        var tex = glTex.getTexture();
+                        if (tex)  technique[prop].set( tex );
+                    }
+                    break;
+
+                case "color":
+                case "vector2d":
+                case "vector3d":
+                    this._propValues[prop] = value.slice();
+                    if (technique)  technique[prop].set( value );
+                    break;
+            }
+        }
         };
 
         this.setShaderValues = function()
@@ -366,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
         };
@@ -374,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();
@@ -398,8 +432,17 @@ 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") {
     exports.Material = Material;
-}
\ No newline at end of file
+}