Merge branch 'master' into pentool

4 files changed, 427 insertions, 54 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index dd82a4cc..4b155b4c 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,6 +61,8 @@ var Circle = function GLCircle() {
         } else {
                         this._fillMaterial = MaterialsModel.exportFlatMaterial();
         }
+
+                this.exportMaterials();
         };
 
     ///////////////////////////////////////////////////////////////////////
@@ -442,16 +444,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 +533,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 +608,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) {
@@ -577,9 +638,10 @@ var Circle = function GLCircle() {
         } else {
                         rtnStr += "flatMaterial";
         }
-
                 rtnStr += "\n";
 
+                rtnStr += this.exportMaterials();
+
                 return rtnStr;
         };
 
@@ -593,8 +655,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) {
@@ -609,8 +685,9 @@ var Circle = function GLCircle() {
                         console.log( "object material not found in library: " + fillMaterialName );
                         fillMat = MaterialsModel.exportFlatMaterial();
                 }
-
                 this._fillMaterial = fillMat;
+
+                this.importMaterials( importStr );
         };
 
     this.collidesWithPoint = function( x, y ) {
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index c5880843..f285f24a 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -5,6 +5,27 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
+var FlatMaterial = require("js/lib/rdge/materials/flat-material").FlatMaterial;
+var LinearGradientMaterial = require("js/lib/rdge/materials/linear-gradient-material").LinearGradientMaterial;
+var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial;
+var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
+var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
+var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
+var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
+var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
+var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial;
+var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
+var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
+var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
+var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
+var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
+var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
+var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial;
+var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial;
+var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial;
+var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLGeomObj
 //      Super class for all geometry classes
@@ -138,22 +159,61 @@ var GeomObj = function GLGeomObj() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
         this.setMaterialColor = function(c, type) {