revert to using the angle without flipping its sign...fixing some minor bugs and code cleanup

GOOD status before doing 3D unprojection step

4 files changed, 43 insertions, 27 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index b5e63514..46e337b7 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -122,7 +122,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     break;
                 case "strokeAngle":
                     this.setShapeProperty(el, "strokeAngle", value);
-                    el.elementModel.shapeModel.GLGeomObj.setStrokeAngle(Math.PI * -val/180);
+                    el.elementModel.shapeModel.GLGeomObj.setStrokeAngle(Math.PI * val/180);
                     el.elementModel.shapeModel.GLWorld.render();
                     break;
                 default:
@@ -146,35 +146,35 @@ exports.ShapesController = Montage.create(CanvasController, {
                     return this.getShapeProperty(el, p);
                 case "strokeHardness":
                     if (el.elementModel && el.elementModel.shapeModel){
-                        return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();;
+                        return el.elementModel.shapeModel.GLGeomObj.getStrokeHardness();
                     } else {
                         return null;
                     }
                     break;
                 case "doSmoothing":
                     if (el.elementModel && el.elementModel.shapeModel){
-                        return el.elementModel.shapeModel.GLGeomObj.getDoSmoothing();;
+                        return el.elementModel.shapeModel.GLGeomObj.getDoSmoothing();
                     } else {
                         return null;
                     }
                     break;
                 case "strokeSmoothing":
                     if (el.elementModel && el.elementModel.shapeModel){
-                        return el.elementModel.shapeModel.GLGeomObj.getSmoothingAmount();;
+                        return el.elementModel.shapeModel.GLGeomObj.getSmoothingAmount();
                     } else {
                         return null;
                     }
                     break;
                 case "isCalligraphic":
                     if (el.elementModel && el.elementModel.shapeModel){
-                        return el.elementModel.shapeModel.GLGeomObj.getStrokeUseCalligraphic();;
+                        return el.elementModel.shapeModel.GLGeomObj.getStrokeUseCalligraphic();
                     } else {
                         return null;
                     }
                     break;
                 case "strokeAngle":
                     if (el.elementModel && el.elementModel.shapeModel){
-                        return el.elementModel.shapeModel.GLGeomObj.getStrokeAngle();;
+                        return 180*el.elementModel.shapeModel.GLGeomObj.getStrokeAngle()/Math.PI;
                     } else {
                         return null;
                     }
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 9d90aa3d..ad2f3088 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -649,7 +649,7 @@ exports.PiData = Montage.create( Montage, {
                             id : "strokeSize",
                             prop : "strokeSize",
                             label : "Stroke",
-                            valueMutator: parseFloat,
+                            valueMutator: parseInt,
                             min :   1,
                             max :   100,
                             value : 1,
@@ -661,7 +661,7 @@ exports.PiData = Montage.create( Montage, {
                             id : "strokeHardness",
                             prop : "strokeHardness",
                             label : "Hardness",
-                            valueMutator: parseFloat,
+                            valueMutator: parseInt,
                             min :   0,
                             max :   100,
                             value : 100,
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 68b9110f..afeaf6e6 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -24,6 +24,7 @@ var BrushStroke = function GLBrushStroke() {
     this._BBoxMin = [0, 0, 0];
     this._BBoxMax = [0, 0, 0];
     this._dirty = true;
+    this._isInit = false;
     this._addedSamples = false;
     this._storedOrigPoints = false;
 
@@ -286,7 +287,7 @@ var BrushStroke = function GLBrushStroke() {
 
     this.computeMetaGeometry = function() {
         var numPoints = this._Points.length;
-        if (this._addedSamples === false){
+        if (this._isInit === false){
             //**** add samples to the long sections of the path --- Catmull-Rom spline interpolation *****
             // instead of the following, may use 4-point subdivision iterations over continuous regions of 'long' segments
             // look at http://www.gvu.gatech.edu/~jarek/Split&Tweak/ for formula
@@ -325,16 +326,12 @@ var BrushStroke = function GLBrushStroke() {
             }
             this._Points = newSampledPoints.slice(0);
             newSampledPoints = [];
-            console.log("Inserted "+numInsertedPoints+" additional CatmullRom points");
-            this._addedSamples = true;
             this._dirty=true;
-        } //if we need to add samples to this curve (done only once)
 
-        //build a copy of the original points...this should be done only once
-        if (this._storedOrigPoints === false) {
+            //store the original points
             this._OrigPoints = this._Points.slice(0);
-            this._storedOrigPoints = true;
-        } //if we need to store a copy of the original points (done only once)
+            this._isInit = true;
+        } //if have not initialized this brush stroke  yet
 
         if (this._dirty) {
             this._Points = this._OrigPoints.slice(0);
@@ -377,7 +374,9 @@ var BrushStroke = function GLBrushStroke() {
 
             //increase the bbox given the stroke width and the angle (in case of calligraphic brush)
             var bboxPadding = this._strokeWidth/2;
-            if (this.__strokeUseCalligraphic) {
+            //if (this._strokeUseCalligraphic) {
+            //todo re-enable this if check once we are able to change the left and top of the brush canvas
+            if (false){
                 this._BBoxMin[0]-= bboxPadding*Math.cos(this._strokeAngle);
                 this._BBoxMin[1]-= bboxPadding*Math.sin(this._strokeAngle);
                 this._BBoxMax[0]+= bboxPadding*Math.cos(this._strokeAngle);
@@ -388,9 +387,9 @@ var BrushStroke = function GLBrushStroke() {
                     this._BBoxMax[d]+= bboxPadding;
                 }//for every dimension d from 0 to 2
             }
-            
         } //if this was dirty
         this._dirty = false;
+
     };
 
     this.buildBuffers = function () {
@@ -402,32 +401,47 @@ var BrushStroke = function GLBrushStroke() {
     this.render = function () {
         // get the world
         var world = this.getWorld();
-        if (!world)  throw( "null world in brushstroke render" );
-
-         // get the context
-        var ctx = world.get2DContext();
-        if (!ctx)  throw ("null context in brushstroke render");
+        if (!world){
+            throw( "null world in brushstroke render" );
+        }
 
         var numPoints = this.getNumPoints();
         if (numPoints === 0) {
             return; //nothing to do for empty paths
         }
 
-        ctx.save();
-
         this.computeMetaGeometry();
         var bboxMin = this.getBBoxMin();
         var bboxMax = this.getBBoxMax();
         var bboxWidth = bboxMax[0] - bboxMin[0];
         var bboxHeight = bboxMax[1] - bboxMin[1];
 
-        //assign the new width and height as the canvas dimensions through the canvas controller
+
         if (this._canvas) {
+            // this seems to produce drift as the stroke size is changed smoothly...bug due to floating point round off
+            //get the old left, top, width, and height
+//            var oldLeft = parseInt(CanvasController.getProperty(this._canvas, "left"));
+//            var oldTop  = parseInt(CanvasController.getProperty(this._canvas, "top"));
+//            var oldWidth  = parseInt(CanvasController.getProperty(this._canvas, "width"));
+//            var oldHeight = parseInt(CanvasController.getProperty(this._canvas, "height"));
+//            var newLeft = oldLeft - parseInt((bboxWidth-oldWidth)*0.5);
+//            var newTop = oldTop - parseInt((bboxHeight-oldHeight)*0.5);
+//
+//            //assign the new width and height as the canvas dimensions through the canvas controller
+//            CanvasController.setProperty(this._canvas, "left", newLeft+"px");
+//            CanvasController.setProperty(this._canvas, "top", newTop+"px");*/