8 files changed, 206 insertions, 52 deletions

diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 0940be3c..cedeef50 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -397,7 +397,8 @@ exports.GradientPicker = Montage.create(Component, {
             actionEvent.initEvent(type, true, true);
             actionEvent.type = type;
             actionEvent.wasSetByCode = userInitiated;
-            actionEvent.gradient = {stops: this.value, mode: this.mode, css: css};
+            // TODO - mode seems to get reset to "rgb", so also setting a gradientMode property
+            actionEvent.gradient = {stops: this.value, mode: this.mode, gradientMode: this.mode, css: css};
             this.dispatchEvent(actionEvent);
         }
     }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 3423a5a7..7079fc7f 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -259,24 +259,70 @@ exports.ShapesController = Montage.create(CanvasController, {
         }
     },
 
-    setColor: {
-        value: function(el, color, isFill) {
-            var webGl = color.webGlColor || color.color.webGlColor;
-            if(!webGl)
+    _setGradientMaterial: {
+        value: function(el, gradientMode, isFill) {
+            var m = "LinearGradientMaterial";
+            if(gradientMode === "radial")
             {
-                webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
+                m = "RadialGradientMaterial";
             }
+
+            if(el.elementModel.shapeModel.fillMaterial.getName() !== m)
+            {
+                var fm = Object.create(MaterialsModel.getMaterial(m));
+                if(fm)
+                {
+                    if(isFill)
+                    {
+                        el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
+                        el.elementModel.shapeModel.fillMaterial = fm;
+                    }
+                    else
+                    {
+                        el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(fm);
+                        el.elementModel.shapeModel.strokeMaterial = fm;
+                    }
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                }
+            }
+        }
+    },
+
+    setColor: {
+        value: function(el, color, isFill) {
+            var mode = color.mode,
+                webGl;
             if(isFill)
             {
-                el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
-                this.setShapeProperty(el, "fill", webGl);
-                this.setShapeProperty(el, "background", color);
+                if(mode)
+                {
+                    switch (mode) {
+                        case 'nocolor':
+                            el.elementModel.shapeModel.GLGeomObj.setFillColor(null);
+                            this.setShapeProperty(el, "fill", null);
+                            this.setShapeProperty(el, "background", color);
+//                            el.elementModel.fill = null;
+                            return;
+                        case 'gradient':
+                            this._setGradientMaterial(el, color.color.gradientMode, isFill);
+                            el.elementModel.shapeModel.GLGeomObj.setFillColor({gradientMode:color.color.gradientMode, color:color.color.stops});
+                            el.elementModel.shapeModel.GLWorld.render();
+                            this.setShapeProperty(el, "fill", color.color.css);
+                            this.setShapeProperty(el, "background", color);
+//                            el.elementModel.fill = color;
+                            break;
+                        default:
+                            webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
+                            el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
+                            this.setShapeProperty(el, "fill", webGl);
+                            this.setShapeProperty(el, "background", color);
+//                            el.elementModel.fill = color;
+                    }
+                }
             }
             else
             {
-                el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);
-                this.setShapeProperty(el, "stroke", webGl);
-                this.setShapeProperty(el, "border", color);
+                // Support for ink-bottle tool
                 if(color.strokeInfo)
                 {
                     var strokeWidth = this.GetValueInPixels(color.strokeInfo.strokeSize,
@@ -285,7 +331,64 @@ exports.ShapesController = Montage.create(CanvasController, {
                     this.setShapeProperty(el, "strokeSize", color.strokeInfo.strokeSize + " "
                                                                 + color.strokeInfo.strokeUnits);
                 }
+
+                if(mode)
+                {
+                    switch (mode) {
+                        case 'nocolor':
+                            el.elementModel.shapeModel.GLGeomObj.setStrokeColor(null);
+                            this.setShapeProperty(el, "stroke", null);
+                            this.setShapeProperty(el, "border", color);
+//                            el.elementModel.fill = null;
+                            return;
+                        case 'gradient':
+                            this._setGradientMaterial(el, color.color.gradientMode, isFill);
+                            el.elementModel.shapeModel.GLGeomObj.setStrokeColor({gradientMode:color.color.gradientMode, color:color.color.stops});
+                            el.elementModel.shapeModel.GLWorld.render();
+                            this.setShapeProperty(el, "stroke", color.color.css);
+                            this.setShapeProperty(el, "border", color);
+//                            el.elementModel.fill = color;
+                            break;
+                        default:
+                            webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
+                            el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);
+                            this.setShapeProperty(el, "stroke", webGl);
+                            this.setShapeProperty(el, "border", color);
+//                            el.elementModel.fill = color;
+                    }
+                }
             }
+
+
+
+
+
+
+//            var webGl = color.webGlColor || color.color.webGlColor;
+//            if(!webGl)
+//            {
+//                webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
+//            }
+//            if(isFill)
+//            {
+//                el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
+//                this.setShapeProperty(el, "fill", webGl);
+//                this.setShapeProperty(el, "background", color);
+//            }
+//            else
+//            {
+//                el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);
+//                this.setShapeProperty(el, "stroke", webGl);
+//                this.setShapeProperty(el, "border", color);
+//                if(color.strokeInfo)
+//                {
+//                    var strokeWidth = this.GetValueInPixels(color.strokeInfo.strokeSize,
+//                                                            color.strokeInfo.strokeUnits);
+//                    el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(strokeWidth);
+//                    this.setShapeProperty(el, "strokeSize", color.strokeInfo.strokeSize + " "
+//                                                                + color.strokeInfo.strokeUnits);
+//                }
+//            }
             el.elementModel.shapeModel.GLWorld.render();
         }
     },
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index cf8a91db..1caacd00 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1978,12 +1978,20 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
         },
 
         setupDragPlanes : {
-                value: function( hitRec ) {
+                value: function( hitRec, inGlobalMode ) {
                         // get the location of the point in stage world space
                         var elt = hitRec.getElt();
                         var localPt = hitRec.getLocalPoint();
                         var planeMat = hitRec.getPlaneMatrix();
-                        var stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            var stageWorldPt;
+            if(inGlobalMode)
+            {
+                stageWorldPt = MathUtils.transformPoint(localPt,planeMat);
+            }
+            else
+            {
+                stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            }
 
                         /*
                          // get a working plane parallel to the current working plane through the stage world point
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index c5880843..1ea74475 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -138,22 +138,61 @@ var GeomObj = function GLGeomObj() {