Merge branch 'refs/heads/WebGLFileIO' into ToolFixes

Conflicts:
	assets/canvas-runtime.js
	js/controllers/elements/shapes-controller.js
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/geom/line.js
	js/mediators/element-mediator.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 242 insertions, 129 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index e792c646..f9b63942 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -13,12 +13,62 @@ var Montage = 			require("montage/core/core").Montage,
 exports.ShapesController = Montage.create(CanvasController, {
 
     setProperty: {
-        value: function(el, p, value) {
-            var val = parseInt(value);
+        value: function(el, p, value, eventType, source) {
+            var val = parseInt(value),
+                canvas,
+                m,
+                color;
             switch(p) {
                 case "strokeSize":
                     // TODO - For now, just handling px units.
                     this.setShapeProperty(el, "strokeSize", value);
+                    // Changing stroke size should grow/shrink the shape from the center.
+                    var delta = ~~(val - el.elementModel.shapeModel.GLGeomObj.getStrokeWidth()),
+                        l = this.application.ninja.elementMediator.getProperty(el, "left", parseInt),
+                        t = this.application.ninja.elementMediator.getProperty(el, "top", parseInt),
+                        w = this.application.ninja.elementMediator.getProperty(el, "width", parseInt),
+                        h = this.application.ninja.elementMediator.getProperty(el, "height", parseInt);
+
+                    if(el.elementModel.selection === "Line")
+                    {
+                        var slope = el.elementModel.shapeModel.slope;
+                        // set the dimensions
+                        if(slope === "horizontal")
+                        {
+                            h = Math.max(val, 1);
+                        }
+                        else if(slope === "vertical")
+                        {
+                            w = Math.max(val, 1);
+                        }
+                        else
+                        {
+                            var oldXAdj = el.elementModel.shapeModel.GLGeomObj.getXAdj();
+                            var oldYAdj = el.elementModel.shapeModel.GLGeomObj.getYAdj();
+                            var theta = Math.atan(el.elementModel.shapeModel.slope);
+                            var xAdj = Math.abs((val/2)*Math.sin(theta));
+                            var yAdj = Math.abs((val/2)*Math.cos(theta));
+                            var dX = ~~(xAdj*2 - oldXAdj*2);
+                            var dY = ~~(yAdj*2 - oldYAdj*2);
+
+                            if(delta > 0)
+                            {
+                                l -= dX*2;
+                                t -= dY*2;
+                                w += dX*2;
+                                h += dY*2;
+                            }
+
+                            el.elementModel.shapeModel.GLGeomObj.setXAdj(xAdj);
+                            el.elementModel.shapeModel.GLGeomObj.setYAdj(yAdj);
+
+                        }
+                    }
+                    this.application.ninja.elementMediator.setProperties([el],
+                                                    { "left": [l + "px"],
+                                                      "top": [t + "px"],
+                                                      "width": [w + "px"],
+                                                      "height": [h + "px"] }, eventType, source );
                     el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(val);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                     el.elementModel.shapeModel.GLWorld.render();
@@ -68,39 +118,47 @@ exports.ShapesController = Montage.create(CanvasController, {
                     el.elementModel.shapeModel.GLWorld.render();
                     break;
                 case "useWebGl":
-                    var canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
+                    canvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", el.className, true);
                     canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                     canvas.width = el.width;
                     canvas.height = el.height;
                     canvas.elementModel = el.elementModel;
                     this.toggleWebGlMode(canvas, value);
                     this.application.ninja.elementMediator.replaceElement(canvas, el);
-                    return;
+                    break;
                 case "strokeMaterial":
-                    var sm = Object.create(MaterialsModel.getMaterial(value));
-                    if(sm)
+                    m = Object.create(MaterialsModel.getMaterial(value));
+                    if(m)
                     {
-                        el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm);
-                        el.elementModel.shapeModel.strokeMaterial = sm;
+                        el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(m);
+                        color = this.getMaterialColor(value);
+                        if(color)
+                        {
+                            el.elementModel.shapeModel.GLGeomObj.setStrokeColor(color);
+                        }
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                         el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 case "fillMaterial":
-                    var fm = Object.create(MaterialsModel.getMaterial(value));
-                    if(fm)
+                    m = Object.create(MaterialsModel.getMaterial(value));
+                    if(m)
                     {
-                        el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
-                        el.elementModel.shapeModel.fillMaterial = fm;
+                        el.elementModel.shapeModel.GLGeomObj.setFillMaterial(m);
+                        color = this.getMaterialColor(value);
+                        if(color)
+                        {
+                            el.elementModel.shapeModel.GLGeomObj.setFillColor(color);
+                        }
                         el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                         el.elementModel.shapeModel.GLWorld.render();
                     }
                     break;
                 case "editStrokeMaterial":
-                    NJevent("showMaterialPopup",{materialId : el.elementModel.shapeModel.strokeMaterial.getName()});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "strokeMaterial")});
                     break;
                 case "editFillMaterial":
-                    NJevent("showMaterialPopup",{materialId : el.elementModel.shapeModel.fillMaterial.getName()});
+                    NJevent("showMaterialPopup",{materialId : this.getProperty(el, "fillMaterial")});
                     break;
                 case "animate":
                     if(value)
@@ -144,6 +202,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 default:
                     CanvasController.setProperty(el, p, value);
             }
+            this.application.ninja.documentController.activeDocument.needsSave = true;
         }
     },
 
@@ -156,11 +215,13 @@ exports.ShapesController = Montage.create(CanvasController, {
                 case "trRadius":
                 case "blRadius":
                 case "brRadius":
-                case "border":
-                case "background":
                 case "useWebGl":
                 case "animate":
                     return this.getShapeProperty(el, p);
+                case "border":
+                    return this.getColor(el, false);
+                case "background":
+                    return this.getColor(el, true);
                 case "strokeHardness":
                     if (el.elementModel && el.elementModel.shapeModel){
                         return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();
@@ -199,11 +260,20 @@ exports.ShapesController = Montage.create(CanvasController, {
                 
 
                 case "strokeMaterial":
+                    var sm = el.elementModel.shapeModel.GLGeomObj.getStrokeMaterial();
+                    if(sm)
+                    {
+                        return sm.getName();
+                    }
+                    else
+                    {
+                        return "FlatMaterial";
+                    }
                 case "fillMaterial":
-                    var m = this.getShapeProperty(el, p);
-                    if(m)
+                    var fm = el.elementModel.shapeModel.GLGeomObj.getFillMaterial();
+                    if(fm)
                     {
-                        return this.getShapeProperty(el, p).getName();
+                        return fm.getName();
                     }
                     else
                     {
@@ -314,70 +384,97 @@ exports.ShapesController = Montage.create(CanvasController, {
     // Routines to get/set color properties
     getColor: {