6 files changed, 19 insertions, 75 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 0d6defe2..da4e6d1b 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -142,7 +142,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     if(m)
                     {
                         el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(m);
-                        color = this.getMaterialColor(m);
+                        color = this.getMaterialColor(value);
                         if(color)
                         {
                             el.elementModel.shapeModel.GLGeomObj.setStrokeColor(color);
@@ -156,7 +156,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     if(m)
                     {
                         el.elementModel.shapeModel.GLGeomObj.setFillMaterial(m);
-                        color = this.getMaterialColor(m);
+                        color = this.getMaterialColor(value);
                         if(color)
                         {
                             el.elementModel.shapeModel.GLGeomObj.setFillColor(color);
@@ -750,34 +750,14 @@ exports.ShapesController = Montage.create(CanvasController, {
         value: function(m)
         {
             var css,
-                colorObj,
-                c,
-                mName = m.getName();
-            if(mName === "LinearGradientMaterial")
+                colorObj;
+            if(m === "LinearGradientMaterial")
             {
-                css = "-webkit-gradient(linear, left top, right top, from(";
-                c = this.webGlColorToCss(m, 1);
-                css += c.rgb + ")";
-                c = this.webGlColorToCss(m, 2);
-                css += ", color-stop(" + c.stop + ", " + c.rgb + ")";
-                c = this.webGlColorToCss(m, 3);
-                css += ", color-stop(" + c.stop + ", " + c.rgb + ")";
-                c = this.webGlColorToCss(m, 4);
-                css += ", to(" + c.rgb + "))";
-//                console.log(css);
+                css = "-webkit-gradient(linear, left top, right top, from(rgb(255, 0, 0)), color-stop(0.3, rgb(0, 255, 0)), color-stop(0.6, rgb(0, 0, 255)), to(rgb(0, 255, 255)))";
             }
-            else if(mName === "RadialGradientMaterial")
+            else if(m === "RadialGradientMaterial")
             {
-                css = "-webkit-radial-gradient(50% 50%, ellipse cover, ";
-                c = this.webGlColorToCss(m, 1);
-                css += c.rgb + " " + c.stop*100 + "%";
-                c = this.webGlColorToCss(m, 2);
-                css += c.rgb + " " + c.stop*100 + "%";
-                c = this.webGlColorToCss(m, 3);
-                css += c.rgb + " " + c.stop*100 + "%";
-                c = this.webGlColorToCss(m, 4);
-                css += c.rgb + " " + c.stop*100 + "%)";
-//                console.log(css);
+                css = "-webkit-radial-gradient(50% 50%, ellipse cover, rgb(255, 0, 0) 0%, rgb(0, 255, 0) 30%, rgb(0, 0, 255) 60%, rgb(0, 255, 255) 100%)";
             }
 
             if(css)
@@ -791,18 +771,6 @@ exports.ShapesController = Montage.create(CanvasController, {
 
             return null;
         }
-    },
-
-    webGlColorToCss: {
-        value: function(m, index)
-        {
-            var color, rgba, cStop;
-            color = m["getColor" + index]();
-            rgba = 'rgba(' + color[0]*255 + ',' + color[1]*255 + ',' + color[2]*255 + ',' + color[3] + ')';
-            cStop = m["getColorStop" + index]();
-
-            return {rgb:rgba, stop: cStop};
-        }
     }
 
 });
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index b46a002b..14e63f4a 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -31,7 +31,6 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
     this._canvas = canvas;
         if (this._useWebGL)
         {
-        preserveDrawingBuffer = true;
         if(preserveDrawingBuffer)
                 {
             this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true});
@@ -79,7 +78,6 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         this._firstRender = true;
 
         this._worldCount = worldCounter;
-        console.log( "creating world " + this._worldCount );
         worldCounter++;
 
         // keep a counter for generating node names
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 803dbb53..6f37ad1c 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -11,7 +11,6 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 //      Super class for all geometry classes
 ///////////////////////////////////////////////////////////////////////
 exports.GeomObj = Object.create(Object.prototype, {
-{
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
@@ -181,14 +180,12 @@ exports.GeomObj = Object.create(Object.prototype, {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-    setMaterialColor: {
+   setMaterialColor: {
         value: function(c, type) {
             var i = 0,
                 nMats = 0;
             if (c) {
                 if (c.gradientMode) {
-            if (c.gradientMode)
-                        {
                     // Gradient support
                     if (this._materialArray && this._materialTypeArray) {
                         nMats = this._materialArray.length;
@@ -204,7 +201,6 @@ exports.GeomObj = Object.create(Object.prototype, {
                     }
 
                     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];
@@ -213,9 +209,6 @@ exports.GeomObj = Object.create(Object.prototype, {
                         if (nMats === this._materialTypeArray.length) {
                             for (i = 0; i < nMats; i++) {
                                 if (this._materialTypeArray[i] == type) {
-                                                {
-                            if (this._materialTypeArray[i] == type)
-                                                        {
                                     this._materialArray[i].setProperty("color" + (n + 1), stop.slice(0));
                                     this._materialArray[i].setProperty("colorStop" + (n + 1), position);
                                 }
@@ -225,15 +218,12 @@ exports.GeomObj = Object.create(Object.prototype, {
                     if (type === "fill") {
                         this._fillColor = c;
                     } else {
-                                else {
                         this._strokeColor = c;
                     }
                 } else {
-                        else {
                     if (type === "fill") {
                         this._fillColor = c.slice(0);
                     } else {
-                                else {
                         this._strokeColor = c.slice(0);
                     }
 
@@ -241,7 +231,6 @@ exports.GeomObj = Object.create(Object.prototype, {
                         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));
                                 }
@@ -250,24 +239,17 @@ exports.GeomObj = Object.create(Object.prototype, {
                     }
                 }
             } else {
-                else
-                {
                 if (type === "fill") {
                     this._fillColor = null;
                 } else {
-                        else {
                     this._strokeColor = null;
                 }
 
                 if (this._materialArray && this._materialTypeArray) {
-                        {
                     nMats = this._materialArray.length;