Merge branch 'master' into pentool

1 files changed, 351 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
new file mode 100755
index 00000000..13be50f5
--- /dev/null
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -0,0 +1,351 @@
+/* <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> */
+
+var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
+var Material = require("js/lib/rdge/materials/material").Material;
+
+var RadialGradientMaterial = function RadialGradientMaterial() {
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+        this._name = "RadialGradientMaterial";
+        this._shaderName = "radialGradient";
+
+        this._color1            = [1,0,0,1];
+        this._color2            = [0,1,0,1];
+        this._color3            = [0,0,1,1];
+        this._color4            = [0,1,1,1];
+        this._colorStop1        = 0.0;
+        this._colorStop2        = 0.3;
+        this._colorStop3        = 0.6;
+        this._colorStop4        = 1.0;
+//      this._colorCount        = 4;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+        this.getName            = function()    {
+        return this._name;
+    };
+
+        this.getShaderName      = function()    {
+        return this._shaderName;
+    };
+
+        this.getColor1  = function()            {
+        return this._color1;
+    };
+
+        this.setColor1  = function(c)           {
+        this._color1 = c.slice();
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_color1.set(c);
+        }
+    };
+
+        this.getColor2  = function()            {
+        return this._color2;
+    };
+
+        this.setColor2  = function(c)           {
+        this._color2 = c.slice();
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_color2.set(c);
+        }
+
+    };
+
+        this.getColor3  = function()            {
+        return this._color3;
+    };
+
+        this.setColor3  = function(c)           {
+        this._color3 = c.slice();
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_color3.set(c);
+        }
+    };
+
+        this.getColor4  = function()            {
+        return this._color4;
+    };
+
+        this.setColor4  = function(c)           {
+        this._color4 = c.slice();
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_color4.set(c);
+        }
+    };
+
+        this.getColorStop1 = function()         {
+        return this._colorStop1;
+    };
+
+        this.setColorStop1 = function(s)        {
+        this._colorStop1 = s;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_colorStop1.set([s]);
+        }
+    };
+
+        this.getColorStop2 = function()         {
+        return this._colorStop2;
+    };
+
+        this.setColorStop2 = function(s)        {
+        this._colorStop2 = s;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_colorStop2.set([s]);
+        }
+    };
+
+        this.getColorStop3 = function()         {
+        return this._colorStop3;
+    };
+
+        this.setColorStop3 = function(s)        {
+        this._colorStop3 = s;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_colorStop3.set([s]);
+        }
+    };
+
+        this.getColorStop4 = function()         {
+        return this._colorStop4;
+    };
+
+        this.setColorStop4 = function(s)        {
+        this._colorStop4 = s;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_colorStop4.set([s]);
+        }
+    };
+
+        this.getColorCount      = function()    {
+        return this._colorCount;
+    };
+
+        this.setColorCount      = function(c)   {
+        this._colorCount = c;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_colorCount.set([c]);
+        }
+    };
+
+        this.isAnimated         = function()    {
+        return false;
+    };
+
+
+    ///////////////////////////////////////////////////////////////////////
+    // Material Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+    this._propNames                     = ["color1",            "color2",               "color3",               "color4",   "colorStop1",               "colorStop2",           "colorStop3",                   "colorStop4",       "angle"];
+    this._propLabels            = ["Color 1",       "Color 2",      "Color 3",      "Color 4",  "Color Stop 1",     "Color Stop 2",      "Color Stop 3",                "Color Stop 4",     "Angle"];
+    this._propTypes                     = ["color",                     "color",                "color",        "color",    "float",            "float",             "float",                     "float",          "float"];
+    this._propValues            = [];
+
+    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.setProperty = function( prop, value ) {
+                if (prop === "color")  prop = "color1";
+
+                // make sure we have legitimate imput
+                var ok = this.validateProperty( prop, value );
+                if (!ok) {
+                        console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value );
+        }
+
+        switch (prop)
+        {
+            case "color1":                  this.setColor1( value );                break;
+            case "color2":                  this.setColor2( value );                break;
+            case "color3":                  this.setColor3( value );                break;
+            case "color4":                  this.setColor4( value );                break;
+            case "colorStop1":          this.setColorStop1( value );            break;
+            case "colorStop2":          this.setColorStop2( value );            break;
+            case "colorStop3":          this.setColorStop3( value );            break;
+            case "colorStop4":          this.setColorStop4( value );            break;
+            case "angle":                   this.setAngle( value );                         break;
+        }
+
+                //this.updateValuesInShader();
+        };
+    ///////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+        // duplcate method requirde
+        this.dup = function()   {
+        return new RadialGradientMaterial();
+    };
+
+        this.init = function() {
+                // set up the shader
+                this._shader = new jshader();
+                this._shader.def = radialGradientMaterialDef;
+                this._shader.init();
+
+                // set up the material node
+                this._materialNode = createMaterialNode("radialGradientMaterial");
+                this._materialNode.setShader(this._shader);
+
+                // set the shader values in the shader
+                this.updateValuesInShader();
+        };
+
+        this.updateValuesInShader = function() {
+                if (this._shader && this._shader['default']) {