1 files changed, 24 insertions, 41 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 4b8e1c69..d859d025 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -215,27 +215,10 @@ exports.GeomObj = Object.create(Object.prototype, {
                         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 (nMats === this._materialTypeArray.length) {
+                        for (i = 0; i < nMats; i++) {
+                            if (this._materialTypeArray[i] == type) {
+                                this._materialArray[i].setGradientData(c.color);
                             }
                         }
                     }
@@ -305,13 +288,13 @@ exports.GeomObj = Object.create(Object.prototype, {
             this._materialArray.push(strokeMaterial);
             this._materialTypeArray.push("stroke");
 
-                        // don't set the value here.  The material editor may set a color directly
-                        // to the material without setting this value in the obj.  The following
-                        // lines of code will clobber the value in the material
+            // don't set the value here.  The material editor may set a color directly
+            // to the material without setting this value in the obj.  The following
+            // lines of code will clobber the value in the material
             //if (this._strokeColor)
             //    this.setStrokeColor(this._strokeColor);
 
-                        this._strokeMaterial = strokeMaterial;
+            this._strokeMaterial = strokeMaterial;
 
             return strokeMaterial;
         }
@@ -332,14 +315,14 @@ exports.GeomObj = Object.create(Object.prototype, {
 
             this._materialArray.push(fillMaterial);
             this._materialTypeArray.push("fill");
-                        
-                        // don't set the value here.  The material editor may set a color directly
-                        // to the material without setting this value in the obj.  The following
-                        // lines of code will clobber the value in the material
+
+            // don't set the value here.  The material editor may set a color directly
+            // to the material without setting this value in the obj.  The following
+            // lines of code will clobber the value in the material
             //if (this._fillColor)
             //     this.setFillColor(this._fillColor);
 
-                        this._fillMaterial = fillMaterial;
+            this._fillMaterial = fillMaterial;
 
             return fillMaterial;
         }
@@ -347,7 +330,7 @@ exports.GeomObj = Object.create(Object.prototype, {
 
     exportMaterialsJSON: {
         value: function() {
-                        MaterialsModel = require("js/models/materials-model").MaterialsModel;
+            MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
             var jObj;
             if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
@@ -379,7 +362,7 @@ exports.GeomObj = Object.create(Object.prototype, {
 
     importMaterialsJSON: {
         value: function(jObj) {
-                        MaterialsModel = require("js/models/materials-model").MaterialsModel;
+            MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
             this._materialArray = [];
             this._materialTypeArray = [];
@@ -406,7 +389,7 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "tunnel":
                     case "reliefTunnel":
                     case "squareTunnel":
-                                        case "flag":
+                    case "flag":
                     case "twist":
                     case "fly":
                     case "julia":
@@ -416,8 +399,8 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "keleidoscope":
                     case "radialBlur":
                     case "pulse":
-                                        case "twistVert":
-                                        case "taper":
+                    case "twistVert":
+                    case "taper":
                         mat = MaterialsModel.getMaterialByShader(shaderName);
                         if (mat)  mat = mat.dup();
                         break;
@@ -471,12 +454,12 @@ exports.GeomObj = Object.create(Object.prototype, {
             // get the normalized device coordinates (NDC) for
             // all position and dimensions.
             var world = this.getWorld();
-            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-            var xNDC = 2*this._xOffset/vpw,  yNDC = -2*this._yOffset/vph;
+            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
+            var xNDC = 2*this._xOffset/vpw,  yNDC = -2*this._yOffset/vph;
 
             var aspect = world.getAspect();
             var zn = world.getZNear(),  zf = world.getZFar();
-            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
+            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
                 b = -t,
                 r = aspect*t,
                 l = -r;
@@ -501,12 +484,12 @@ exports.GeomObj = Object.create(Object.prototype, {
             // get the normalized device coordinates (NDC) for
             // all position and dimensions.
             var world = this.getWorld();
-            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-            var xNDC = 2*preViewPt[0]/vpw,  yNDC = -2*preViewPt[1]/vph;
+            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
+            var xNDC = 2*preViewPt[0]/vpw,  yNDC = -2*preViewPt[1]/vph;
 
             var aspect = world.getAspect();
             var zn = world.getZNear(),  zf = world.getZFar();
-            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
+            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
                 b = -t,
                 r = aspect*t,
                 l = -r;