Merge branch 'refs/heads/Ninja-Internal' into FileIO

20 files changed, 925 insertions, 307 deletions

diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index 608111bd..98442164 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html
@@ -33,7 +33,8 @@
                     "maxValue": 100,
                     "value": 100,
                     "decimalPlace": 10,
-                    "acceptableUnits" : ["px", "pt"]
+                    "acceptableUnits" : ["%"],
+                    "units" : "%"
                 }
             },
 
@@ -46,7 +47,20 @@
                     "maxValue": 90,
                     "value": 0,
                     "decimalPlace": 10,
-                    "acceptableUnits" : ["px", "pt"]
+                    "acceptableUnits" : ["deg."],
+                    "units" : "deg."
+                }
+            },
+
+            "smoothingAmountHT": {
+                "module": "js/components/hottext.reel",
+                "name": "HotText",
+                "properties": {
+                    "element": {"#": "smoothingAmount"},
+                    "minValue": 0,
+                    "maxValue": 100,
+                    "value": 0,
+                    "decimalPlace": 10
                 }
             },
 
@@ -58,8 +72,10 @@
                     "_strokeSize": {"@": "strokeSizeHT"},
                     "_strokeHardness": {"@": "strokeHardnessHT"},
                     "_doSmoothing": {"#": "doSmoothing"},
+                    "_smoothingAmount": {"@": "smoothingAmountHT"},
                     "_useCalligraphic":{"#": "useCalligraphic"},
-                    "_strokeAngle": {"@": "strokeAngleHT"}
+                    "_strokeAngle": {"@": "strokeAngleHT"},
+                    "_angleLabel": {"#": "angleLabel"}
                 }
             }
         }
@@ -75,8 +91,9 @@
                 <label class="label"> Hardness:</label>
                 <div id="strokeHardness" class="label"></div>
                 <label class="label"><input id="doSmoothing" type="checkbox" name="doSmoothingControl" class="checkBoxAlign"/>Smoothing</label>
+                <div id="smoothingAmount" class="label"></div>
                 <label class="label"><input id="useCalligraphic" type="checkbox" name="useCalligraphicControl" class="checkBoxAlign"/>Calligraphic</label>
-                <label class="label"> Angle:</label>
+                <label class="label" id="angleLabel"> Angle:</label>
                 <div id="strokeAngle" class="label"></div>
 
             </div>
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js
index e6faa0f0..fdcd50f8 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -9,6 +9,33 @@ var Component = require("montage/ui/component").Component;
 var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
 
 exports.BrushProperties = Montage.create(ToolProperties, {
+    _subPrepare: {
+        value: function() {
+            this.handleChange(null);
+            this._useCalligraphic.addEventListener("change", this, false);
+            this._doSmoothing.addEventListener("change", this, false);
+        }
+    },
+    handleChange: {
+        value: function(event) {
+            if(this._useCalligraphic.checked) {
+                this._strokeAngle.element.style["display"] = "";
+                this._strokeAngle.visible = true;
+                this._angleLabel.style["display"] = "";
+            } else {
+                this._strokeAngle.element.style["display"] = "none";
+                this._strokeAngle.visible = false;
+                this._angleLabel.style["display"] = "none";
+            }
+            if(this._doSmoothing.checked) {
+                this._smoothingAmount.element.style["display"] = "";
+                this._smoothingAmount.visible = true;
+            } else {
+                this._smoothingAmount.element.style["display"] = "none";
+                this._smoothingAmount.visible = false;
+            }
+        }
+    },
     strokeSize: {
         get: function() { return this._strokeSize; }
     },
@@ -18,6 +45,9 @@ exports.BrushProperties = Montage.create(ToolProperties, {
     doSmoothing:{
         get: function() {return this._doSmoothing.checked; }
     },
+    smoothingAmount:{
+        get: function() {return this._smoothingAmount;}
+    },
     useCalligraphic: {
         get: function() {return this._useCalligraphic.checked;}
     },
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index f0e9458b..ef453bea 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -119,6 +119,31 @@ exports.ShapesController = Montage.create(CanvasController, {
                         el.elementModel.shapeModel.GLWorld._canvas.task.stop();
                     }
                     break;
+                case "strokeHardness":
+                    this.setShapeProperty(el, "strokeHardness", value);
+                    el.elementModel.shapeModel.GLGeomObj.setStrokeHardness(val);
+                    el.elementModel.shapeModel.GLWorld.render();
+                    break;
+                case "strokeSmoothing":
+                    this.setShapeProperty(el, "strokeSmoothing", value);
+                    el.elementModel.shapeModel.GLGeomObj.setSmoothingAmount(val);
+                    el.elementModel.shapeModel.GLWorld.render();
+                    break;
+                case "doSmoothing":
+                    this.setShapeProperty(el, "doSmoothing", value);
+                    el.elementModel.shapeModel.GLGeomObj.setDoSmoothing(value);
+                    el.elementModel.shapeModel.GLWorld.render();
+                    break;
+                case "isCalligraphic":
+                    this.setShapeProperty(el, "isCalligraphic", value);
+                    el.elementModel.shapeModel.GLGeomObj.setStrokeUseCalligraphic(value);
+                    el.elementModel.shapeModel.GLWorld.render();
+                    break;
+                case "strokeAngle":
+                    this.setShapeProperty(el, "strokeAngle", value);
+                    el.elementModel.shapeModel.GLGeomObj.setStrokeAngle(Math.PI * val/180);
+                    el.elementModel.shapeModel.GLWorld.render();
+                    break;
                 default:
                     CanvasController.setProperty(el, p, value);
             }
@@ -139,6 +164,43 @@ exports.ShapesController = Montage.create(CanvasController, {
                 case "useWebGl":
                 case "animate":
                     return this.getShapeProperty(el, p);
+                case "strokeHardness":
+                    if (el.elementModel && el.elementModel.shapeModel){
+                        return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();
+                    } else {
+                        return null;
+                    }
+                    break;
+                case "doSmoothing":