4 files changed, 328 insertions, 49 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index dd82a4cc..05501ec3 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -442,16 +442,43 @@ var Circle = function GLCircle() {
                 var bezPts = MathUtils.circularArcToBezier( [0,0,0], [1,0,0], 2.0*Math.PI );
                 if (bezPts) {
                         var n = bezPts.length;
+            var gradient,
+                colors,
+                len,
+                j,
+                position,
+                cs,
+                c;
 
                         // set up the fill style
                         ctx.beginPath();
                         ctx.lineWidth = 0;
                         if (this._fillColor) {
-                                var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
-                                ctx.fillStyle = c;
-
+                if(this._fillColor.gradientMode) {
+                    if(this._fillColor.gradientMode === "radial") {
+                        gradient = ctx.createRadialGradient(xCtr, yCtr, 0,
+                                                            xCtr, yCtr, Math.max(yScale, xScale));
+                    } else {
+                        gradient = ctx.createLinearGradient(0, this._height/2, this._width, this._height/2);
+                    }
+                    colors = this._fillColor.color;
+
+                    len = colors.length;
+
+                    for(j=0; j<len; j++) {
+                        position = colors[j].position/100;
+                        cs = colors[j].value;
+                        gradient.addColorStop(position, "rgba(" + cs.r + "," + cs.g + "," + cs.b + "," + cs.a + ")");
+                    }
+
+                    ctx.fillStyle = gradient;
+
+                } else {
+                    c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";
+                    ctx.fillStyle = c;
+                }
                                 // draw the fill
-                                ctx.beginPath();
+//                              ctx.beginPath();
                                 var p = MathUtils.transformPoint( bezPts[0],   mat );
                                 ctx.moveTo( p[0],  p[1] );
                                 var index = 1;
@@ -504,9 +531,29 @@ var Circle = function GLCircle() {
                         ctx.beginPath();
                         ctx.lineWidth   = lineWidth;
                         if (this._strokeColor) {
-                                var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";  
-                                ctx.strokeStyle = c;
-                        
+                if(this._strokeColor.gradientMode) {
+                    if(this._strokeColor.gradientMode === "radial") {
+                        gradient = ctx.createRadialGradient(xCtr, yCtr, Math.min(xScale, yScale),
+                                                            xCtr, yCtr, 0.5*Math.max(this._height, this._width));
+                    } else {
+                        gradient = ctx.createLinearGradient(0, this._height/2, this._width, this._height/2);
+                    }
+                    colors = this._strokeColor.color;
+
+                    len = colors.length;
+
+                    for(j=0; j<len; j++) {
+                        position = colors[j].position/100;
+                        cs = colors[j].value;
+                        gradient.addColorStop(position, "rgba(" + cs.r + "," + cs.g + "," + cs.b + "," + cs.a + ")");
+                    }
+
+                    ctx.strokeStyle = gradient;
+
+                } else {
+                    c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";
+                    ctx.strokeStyle = c;
+                }
                                 // draw the stroke
                                 p = MathUtils.transformPoint( bezPts[0],   mat );
                                 ctx.moveTo( p[0],  p[1] );
@@ -559,8 +606,20 @@ var Circle = function GLCircle() {
                 rtnStr += "strokeWidth: "       + this._strokeWidth     + "\n";
                 rtnStr += "innerRadius: "       + this._innerRadius     + "\n";
                 rtnStr += "strokeStyle: "       + this._strokeStyle     + "\n";
-                rtnStr += "strokeColor: "       + String(this._strokeColor)  + "\n";
-                rtnStr += "fillColor: "         + String(this._fillColor)        + "\n";
+
+        if(this._strokeColor.gradientMode) {
+            rtnStr += "strokeGradientMode: "    + this._strokeColor.gradientMode        + "\n";
+            rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n";
+        } else {
+            rtnStr += "strokeColor: "   + String(this._strokeColor)  + "\n";
+        }
+
+        if(this._fillColor.gradientMode) {
+            rtnStr += "fillGradientMode: "      + this._fillColor.gradientMode  + "\n";
+            rtnStr += "fillColor: " + this.gradientToString(this._fillColor.color) + "\n";
+        } else {
+            rtnStr += "fillColor: "     + String(this._fillColor)  + "\n";
+        }
 
                 rtnStr += "strokeMat: ";
                 if (this._strokeMaterial) {
@@ -593,8 +652,22 @@ var Circle = function GLCircle() {
                 this._strokeStyle               = this.getPropertyFromString( "strokeStyle: ",  importStr );
                 var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
                 var fillMaterialName    = this.getPropertyFromString( "fillMat: ",              importStr );
-                this._fillColor                 =  eval( "[" + this.getPropertyFromString( "fillColor: ",       importStr ) + "]" );
-                this._strokeColor               =  eval( "[" + this.getPropertyFromString( "strokeColor: ",     importStr ) + "]" );
+        if(importStr.indexOf("fillGradientMode: ") < 0) {
+            this._fillColor             =  eval( "[" + this.getPropertyFromString( "fillColor: ",       importStr ) + "]" );
+        } else {
+            this._fillColor = {};
+            this._fillColor.gradientMode = this.getPropertyFromString( "fillGradientMode: ",    importStr );
+            this._fillColor.color = this.stringToGradient(this.getPropertyFromString( "fillColor: ",    importStr ));
+        }
+
+        if(importStr.indexOf("strokeGradientMode: ") < 0)
+        {
+            this._strokeColor           =  eval( "[" + this.getPropertyFromString( "strokeColor: ",     importStr ) + "]" );
+        } else {
+            this._strokeColor = {};
+            this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ",        importStr );
+            this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ",        importStr ));
+        }
 
                 var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
                 if (!strokeMat) {
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index c5880843..fb1cb246 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -138,22 +138,61 @@ var GeomObj = function GLGeomObj() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
         this.setMaterialColor = function(c, type) {
-                if (type == "fill") {
-                        this._fillColor = c.slice(0);
+        var i = 0,
+            nMats = 0;
+        if(c.gradientMode) {
+            // Gradient support
+            if (this._materialArray && this._materialTypeArray) {
+                nMats = this._materialArray.length;
+            }
+
+            var stops = [],
+                colors = c.color;
+
+            var len = colors.length;
+            // TODO - Current shaders only support 4 color stops
+            if(len > 4) {
+                len = 4;
+            }
+
+            for(var n=0; n<len; n++) {
+                var position = colors[n].position/100;
+                var cs = colors[n].value;
+                var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+                stops.push(stop);
+
+                if (nMats === this._materialTypeArray.length) {
+                    for (i=0;  i<nMats;  i++) {
+                        if (this._materialTypeArray[i] == type) {
+                            this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
+                            this._materialArray[i].setProperty( "colorStop"+(n+1), position );
+                        }
+                    }
+                }
+            }
+            if (type === "fill") {
+                this._fillColor = c;
+            } else {
+                this._strokeColor = c;
+            }
         } else {
-                        this._strokeColor = c.slice(0);
-        }
+            if (type === "fill") {
+                this._fillColor = c.slice(0);
+            } else {
+                this._strokeColor = c.slice(0);
+            }
 
-                if (this._materialArray && this._materialTypeArray) {
-                        var nMats = this._materialArray.length;
-                        if (nMats === this._materialTypeArray.length) {
-                                for (var i=0;  i<nMats;  i++) {
-                                        if (this._materialTypeArray[i] == type) {
-                                                this._materialArray[i].setProperty( "color", c.slice(0) );
+            if (this._materialArray && this._materialTypeArray) {
+                nMats = this._materialArray.length;
+                if (nMats === this._materialTypeArray.length) {
+                    for (i=0;  i<nMats;  i++) {
+                        if (this._materialTypeArray[i] == type) {
+                            this._materialArray[i].setProperty( "color", c.slice(0) );
+                        }
                     }
-                                }
-                        }
-                }
+                }
+            }
+        }
 
                 var world = this.getWorld();
                 if (world)  {
@@ -171,14 +210,15 @@ var GeomObj = function GLGeomObj() {
 
         if (strokeMaterial) {
             strokeMaterial.init( this.getWorld() );
-            if(this._strokeColor) {
-                strokeMaterial.setProperty("color", this._strokeColor);
-            }