4 files changed, 459 insertions, 359 deletions

diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index efd21c4a..1fae0c1d 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -117,7 +117,7 @@ var BrushStroke = function GLBrushStroke() {
     };
 
     this.getPoint = function (index) {
-        return this._Points[index];
+        return this._Points[index].slice(0);
     };
 
     this.addPoint = function (pt) {
@@ -399,7 +399,7 @@ var BrushStroke = function GLBrushStroke() {
 
             // ***** unproject all the centered points and convert them to 2D (plane space)*****
             // (undo the projection step performed by the browser)
-            localPoint = this._unprojectPt(localPoint, 1400); //todo get the perspective distance from the canvas
+            //localPoint = this._unprojectPt(localPoint, 1400); //todo get the perspective distance from the canvas
             localPoint = MathUtils.transformPoint(localPoint, this._planeMatInv);
 
             //add to the list of local points
@@ -568,17 +568,17 @@ var BrushStroke = function GLBrushStroke() {
         }
         ctx.save();
         ctx.clearRect(0, 0, bboxWidth, bboxHeight);
-        this.drawToContext(ctx, 0, 0, false);
+        this.drawToContext(ctx, false);
         ctx.restore();
     } //this.render()
 
-    this.drawToContext = function(ctx, origX, origY, drawStageWorldPts){
+    this.drawToContext = function(ctx, drawStageWorldPts, stageWorldDeltaX, stageWorldDeltaY, stageWorldToScreenMat){
         var points = this._LocalPoints;
-        if (drawStageWorldPts){
+        if (drawStageWorldPts){ //this is usually true when we're drawing the brush stroke on the stage (no canvas yet)
             points = this._Points;
         }
         var numPoints = points.length;
-
+        var tempP, p;
         if (this._strokeUseCalligraphic) {
             //build the stamp for the brush stroke
             var t=0;
@@ -623,9 +623,23 @@ var BrushStroke = function GLBrushStroke() {
                 //ctx.strokeStyle="rgba("+parseInt(255*currStrokeColor[0])+","+parseInt(255*currStrokeColor[1])+","+parseInt(255*currStrokeColor[2])+","+alphaVal+")";
                 ctx.translate(disp[0],disp[1]);
                 ctx.beginPath();
-                ctx.moveTo(points[0][0]-origX, points[0][1]-origY);
+                if (drawStageWorldPts) {
+                    tempP = points[0].slice(0);
+                    tempP[0]+=stageWorldDeltaX; tempP[1]+=stageWorldDeltaY;
+                    p = MathUtils.transformAndDivideHomogeneousPoint(tempP, stageWorldToScreenMat);
+                } else {
+                    p = points[0];
+                }
+                ctx.moveTo(p[0],p[1]);
                 for (var i=0;i<numPoints;i++){
-                    ctx.lineTo(points[i][0]-origX, points[i][1]-origY);
+                    if (drawStageWorldPts) {
+                        tempP = points[i].slice(0);
+                        tempP[0]+=stageWorldDeltaX; tempP[1]+=stageWorldDeltaY;
+                        p = MathUtils.transformAndDivideHomogeneousPoint(tempP, stageWorldToScreenMat);
+                    } else {
+                        p = points[i];
+                    }
+                    ctx.lineTo(p[0],p[1]);
                 }
                 ctx.stroke();
                 ctx.restore();
@@ -641,13 +655,27 @@ var BrushStroke = function GLBrushStroke() {
             ctx.strokeStyle="rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+","+alphaVal+")";
             for (var l=0;l<numlayers;l++){
                 ctx.beginPath();
-                ctx.moveTo(points[0][0]-origX, points[0][1]-origY);
+                if (drawStageWorldPts) {
+                    tempP = points[0].slice(0);
+                    tempP[0]+=stageWorldDeltaX; tempP[1]+=stageWorldDeltaY;
+                    p = MathUtils.transformAndDivideHomogeneousPoint(tempP, stageWorldToScreenMat);
+                } else {
+                    p = points[0];
+                }
+                ctx.moveTo(p[0],p[1]);
                 if (numPoints===1){
                     //display a tiny segment as a single point
-                   ctx.lineTo(points[0][0]-origX, points[0][1]-origY+0.01);
+                   ctx.lineTo(p[0],p[1]+0.01);
                 }
                 for (var i=1;i<numPoints;i++){
-                    ctx.lineTo(points[i][0]-origX, points[i][1]-origY);
+                    if (drawStageWorldPts) {
+                        tempP = points[i].slice(0);
+                        tempP[0]+=stageWorldDeltaX; tempP[1]+=stageWorldDeltaY;
+                        p = MathUtils.transformAndDivideHomogeneousPoint(tempP, stageWorldToScreenMat);
+                    } else {
+                        p = points[i];
+                    }
+                    ctx.lineTo(p[0],p[1]);
                 }
                 ctx.lineWidth=2*l+minStrokeWidth;
                 ctx.stroke();
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 79967799..f8934669 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -180,7 +180,7 @@ exports.KeyboardMediator = Montage.create(Component, {
                 }
 
                 // Shortcut for Eyedropper Tool is I
-                if(evt.keyCode === Keyboard.I ) {
+                if(evt.keyCode === Keyboard.I && !(evt.ctrlKey || evt.metaKey)) {
                     evt.preventDefault();
                     this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]});
                     return;
diff --git a/js/panels/presets/default-animation-presets.js b/js/panels/presets/default-animation-presets.js
index 578c1622..753b3365 100644
--- a/js/panels/presets/default-animation-presets.js
+++ b/js/panels/presets/default-animation-presets.js
@@ -52,7 +52,6 @@ exports.animationPresets = {
                     "-webkit-animation-direction": "normal",
                     "-webkit-animation-timing-function": "ease",
                     "-webkit-transform-style": "preserve-3d",
-                    "-webkit-transform": "perspective(1000)",
                     "-webkit-animation-delay": "0s"
                 }
             },{
@@ -100,7 +99,6 @@ exports.animationPresets = {
                         "-webkit-animation-timing-function": "ease-out",
                         "-webkit-transform-origin": "100% 50%",
                         "-webkit-transform-style": "preserve-3d",
-                        "-webkit-transform": "perspective(1000)",
                         "-webkit-animation-delay": "0s"
                     }
                 },{
@@ -109,31 +107,31 @@ exports.animationPresets = {
                         "keyText": "0%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }, {
                         "keyText": "70%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }, {
                         "keyText": "85%",
                         "styles": {
                             "opacity": "0",
-                            "-webkit-transform": "perspective(1000) rotateY(95deg)"
+                            "-webkit-transform": "rotateY(95deg)"
                         }
                     }, {
                         "keyText": "86%",
                         "styles": {
                             "opacity": "0",
-                            "-webkit-transform": "perspective(1000) rotateY(-90deg)"
+                            "-webkit-transform": "rotateY(-90deg)"
                         }
                     }, {
                         "keyText": "100%",
                         "styles": {
                             "opacity": "1",
-                            "-webkit-transform": "perspective(1000) rotateY(0deg)"
+                            "-webkit-transform": "rotateY(0deg)"
                         }
                     }]
                 }]
@@ -151,7 +149,6 @@ exports.animationPresets = {
                         "-webkit-animation-timing-function": "ease-out",
                         "-webkit-transform-origin": "100% 50%",
                         "-webkit-transform-style": "preserve-3d",
-                        "-webkit-transform": "perspective(1000)",
                         "-webkit-animation-delay": "0s"
                     }
                 },{
@@ -160,25 +157,25 @@ exports.animationPresets = {
                         "keyText": "0%",
                         "styles": {
                             "opacity": "0",