1 files changed, 144 insertions, 21 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 852aab89..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) {
-                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 +231,15 @@ var GeomObj = function GLGeomObj() {
 
         if (strokeMaterial) {
             strokeMaterial.init( this.getWorld() );
-            if(this._strokeColor) {
-                strokeMaterial.setProperty("color", this._strokeColor);
-            }
         }
 
         this._materialArray.push( strokeMaterial );
         this._materialTypeArray.push( "stroke" );
 
+        if(this._strokeColor) {
+            this.setStrokeColor(this._strokeColor);
+        }
+
         return strokeMaterial;
     };
 
@@ -192,15 +253,15 @@ var GeomObj = function GLGeomObj() {
 
         if (fillMaterial) {
             fillMaterial.init( this.getWorld() );
-            //if(!this.getFillMaterial() && this._fillColor)
-            if (this._fillColor) {
-                fillMaterial.setProperty("color", this._fillColor);
-            }
         }
 
         this._materialArray.push( fillMaterial );
         this._materialTypeArray.push( "fill" );
 
+        if (this._fillColor) {
+            this.setFillColor(this._fillColor);
+        }
+
         return fillMaterial;
     };
 
@@ -235,7 +296,26 @@ var GeomObj = function GLGeomObj() {
                         var materialType = this.getPropertyFromString( "material: ",    importStr );
                         switch (materialType)
                         {
-                                case "flat":            mat = new FlatMaterial();               break;
+                                case "flat":                    mat = new FlatMaterial();                               break;
+                                case "radialGradient":  mat = new RadialGradientMaterial();             break;
+                                case "linearGradient":  mat = new LinearGradientMaterial();             break;
+                                case "bumpMetal":               mat = new BumpMetalMaterial();                  break;
+                                case "uber":                    mat = new UberMaterial();                               break;
+                                case "plasma":                  mat = new PlasmaMaterial();                             break;
+                                case "deform":                  mat = new DeformMaterial();                             break;
+                                case "water":                   mat = new WaterMaterial();                              break;
+                                case "tunnel":                  mat = new TunnelMaterial();                             break;
+                                case "reliefTunnel":    mat = new ReliefTunnelMaterial();               break;
+                                case "squareTunnel":    mat = new SquareTunnelMaterial();               break;
+                                case "twist":                   mat = new TwiseMaterial();                              break;
+                                case "fly":                             mat = new FlyMaterial();                                break;
+                                case "julia":                   mat = new JuliaMaterial();                              break;
+                                case "mandel":                  mat = new MandelMaterial();                             break;
+                                case "star":                    mat = new StarMaterial();                               break;
+                                case "zinvert":                 mat = new ZInvertMaterial();                    break;
+                                case "keleidoscope":    mat = new KeleidoscopeMaterial();               break;
+                                case "radialBlur":              mat = new RadialBlurMaterial();                 break;
+                                case "pulse":                   mat = new PulseMaterial();                              break;
 
                                 default:
                                         console.log( "material type: " + materialType + " is not supported" );
@@ -312,6 +392,49 @@ var GeomObj = function GLGeomObj() {
                 return rtnStr;
         };
 
+    // Gradient stops for rgba(255,0,0,1) at 0%; rgba(0,255,0,1) at 33%; rgba(0,0,255,1) at 100% will return
+    // 255,0,0,1@0;0,255,0,1@33;0,0,255,1@100
+    this.gradientToString = function(colors) {
+        var rtnStr = "";
+        if(colors && colors.length) {
+                var c = colors[0],
+                len = colors.length;
+
+            rtnStr += String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
+            for(var i=1; i<len; i++) {
+                c = colors[i];
+                rtnStr += ";" + String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
+            }
+        }
+        return rtnStr;
+    };
+
+    // Given a gradientStr "255,0,0,1@0;0,255,0,1@33;0,0,255,1@100" will return:
+    // colors array [{position:0, value:{r:255, g:0, b:0, a:1}},
+    //               {position:33, value:{r:0, g:255, b:0, a:1}},
+    //               {position:100, value:{r:0, g:0, b:255, a:1}}
+    //             ]
+    this.stringToGradient = function(gradientStr) {
+        var rtnArr = [];
+
+        var i,
+            len,
+            stops,
+            stop,
+            c;
+
+        stops = gradientStr.split(";");
+        len = stops.length;
+        for(i=0; i<len; i++)
+        {
+            stop = stops[i].split("@");
+            c = stop[0].split(",");
+            rtnArr.push({ position: Number(stop[1]), value:{r:Number(c[0]), g:Number(c[1]), b:Number(c[2]), a:Number(c[3])} });
+        }
+
+        return rtnArr;
+    };
+
     /*