1 files changed, 179 insertions, 90 deletions

diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index 6a5a9e9a..f99b78de 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 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.
+* 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 LLC 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
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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
@@ -47,17 +48,17 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     this._defaultColorStop2 = 0.3;
     this._defaultColorStop3 = 0.6;
     this._defaultColorStop4 = 1.0;
-    //  this._defaultColorCount = 4;
+    //  this._defaultColorCount = 4;
 
-        this._textureTransform = [1,0,0, 0,1,0, 0,0,1];
+    this._textureTransform = [1,0,0, 0,1,0, 0,0,1];
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    
 
-    this.isAnimated             = function ()   {  return false;                                                };
-        this.getShaderDef       = function()    {  return radialGradientMaterialDef;    };
+
+    this.isAnimated     = function ()   {  return false;                        };
+    this.getShaderDef   = function()    {  return radialGradientMaterialDef;    };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
@@ -95,49 +96,137 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
         this._materialNode.setShader(this._shader);
 
         // set the shader values in the shader
-                this._shader['default'].u_texTransform.set( this._textureTransform );
+        this._shader['default'].u_texTransform.set( this._textureTransform );
         this.setShaderValues();
     };
 
-        this.fitToPrimitive = function( prim )
+        this.resetToDefault = function()
+    {
+                this._propValues[this._propNames[0]] = this._defaultColor1.slice(0);
+                this._propValues[this._propNames[1]] = this._defaultColor2.slice(0);
+                this._propValues[this._propNames[2]] = this._defaultColor3.slice(0);
+                this._propValues[this._propNames[3]] = this._defaultColor4.slice(0);
+
+                this._propValues[this._propNames[4]] = this._defaultColorStop1;
+                this._propValues[this._propNames[5]] = this._defaultColorStop2;
+                this._propValues[this._propNames[6]] = this._defaultColorStop3;
+                this._propValues[this._propNames[7]] = this._defaultColorStop4;
+
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++) {
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        }
+        };
+
+        this.fitToBounds = function( bounds )
         {
-                var bounds = ShapePrimitive.getBounds( prim );
-                if (bounds)
+        if (bounds)
+        {
+            var dx = Math.abs( bounds[3] - bounds[0] ),
+                dy = Math.abs( bounds[4] - bounds[1] );
+            if (dy == 0)  dy = 1.0;
+            if (dx == 0)  dx = 1.0;
+            var xScale = 2.0, yScale = 2.0;
+            if (dx > dy)
+                yScale *= dy/dx;
+            else
+                xScale *= dx/dy;
+
+            // build the matrix - the translation to the origin, the scale,
+            // and the translation back to the center (hard coded at (0.5, 0.5) for now).
+            // the matrix is build directly instead of with matrix multiplications
+            // for efficiency, not to mention that the multiplication function does
+            // not exist for mat3's.
+            // the matrix as laid out below looks transposed - order is columnwise.
+            var xCtr = 0.5,  yCtr = 0.5;
+            this._textureTransform = [
+                                                     xScale,                0.0,  0.0,
+                                                        0.0,             yScale,  0.0,
+                                            xCtr*(1-xScale),  yCtr*(1 - yScale),  1.0
+                                    ];
+
+            if (this._shader && this._shader['default'])
+                this._shader['default'].u_texTransform.set( this._textureTransform );
+
+        }
+    };
+
+        this.fitToPrimitiveArray = function( primArray )
+        {
+                if (!primArray)  return;
+                var nPrims = primArray.length;
+                if (nPrims == 0)  return;
+                var bounds = ShapePrimitive.getBounds( primArray[0] );
+                for (var i=1;  i<nPrims;  i++)
                 {
-                        var dx = Math.abs( bounds[3] - bounds[0] ),
-                                dy = Math.abs( bounds[4] - bounds[1] );
-                        if (dy == 0)  dy = 1.0;
-                        if (dx == 0)  dx = 1.0;
-                        var xScale = 2.0, yScale = 2.0;
-                        if (dx > dy)
-                                yScale *= dy/dx;
-                        else
-                                xScale *= dx/dy;
-
-                        // build the matrix - the translation to the origin, the scale,
-                        // and the translation back to the center (hard coded at (0.5, 0.5) for now).
-                        // the matrix is build directly instead of with matrix multiplications
-                        // for efficiency, not to mention that the multiplication function does
-                        // not exist for mat3's.
-                        // the matrix as laid out below looks transposed - order is columnwise.
-                        var xCtr = 0.5,  yCtr = 0.5;
-                        this._textureTransform = [
-                                                                                                         xScale,                0.0,  0.0,
-                                                                                                                0.0,             yScale,  0.0,
-                                                                                        xCtr*(1-xScale),  yCtr*(1 - yScale),  1.0
-                                                                        ];
-                        
-                        if (this._shader && this._shader['default'])
-                                this._shader['default'].u_texTransform.set( this._textureTransform );   
+                        var prim = primArray[i];
+                        var b2 = ShapePrimitive.getBounds( prim );
+
+                        // [xMin, yMin, zMin,  xMax, yMax, zMax]
+                        if (b2[0] < bounds[0])  bounds[0] = b2[0];
+                        if (b2[1] < bounds[1])  bounds[1] = b2[1];
+                        if (b2[2] < bounds[2])  bounds[2] = b2[2];
 
+                        if (b2[3] > bounds[3])  bounds[3] = b2[3];
+                        if (b2[4] > bounds[4])  bounds[4] = b2[4];
+                        if (b2[5] > bounds[5])  bounds[5] = b2[5];
                 }
+
+                this.fitToBounds( bounds );
         };
 
-        this.customExport = function( jObj )
+        this.fitToPrimitive = function( prim )
         {
-                jObj.u_texTransform = this._textureTransform.slice();
-                return jObj;
-        }
+                var bounds = ShapePrimitive.getBounds( prim );
+                this.fitToBounds( bounds );
+        };
+
+    this.customExport = function( jObj )
+    {
+        jObj.u_texTransform = this._textureTransform.slice();
+        return jObj;
+        };
+
+    // Only Linear Gradient and Radial Gradient have gradient data.
+    this.gradientType = "radial";
+
+    this.getGradientData = function() {
+        var angle = Math.round(this._angle*180/Math.PI),
+            color,
+            colorStr,
+            css = "-webkit-gradient(linear, " + angle + "deg";
+
+        // TODO - Angle is not supported in -webkit-gradient syntax, so just default to across:
+        css = '-webk