From 76db3eb0aa4ffe9e75812db570c793e9f852f853 Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Mon, 11 Jun 2012 14:06:09 -0700
Subject: fix the brush tool runtime: update the brush coordinates to account
 for change in bounding box due to smoothing

---
 assets/canvas-runtime.js | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'assets')

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index fe5f839c..c2ab0bd8 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -2107,7 +2107,40 @@ NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
                     }
                     this._LocalPoints = newPoints.slice(0);
                 }
-            }
+
+                // *** compute the bounding box *********
+                var BBoxMin = [Infinity, Infinity, Infinity];
+                var BBoxMax = [-Infinity, -Infinity, -Infinity];
+                if (numPoints === 0) {
+                    BBoxMin = [0, 0, 0];
+                    BBoxMax = [0, 0, 0];
+                } else {
+                    for (var i=0;i<numPoints;i++){
+                        var pt = this._LocalPoints[i];
+                        for (var d = 0; d < 3; d++) {
+                            if (BBoxMin[d] > pt[d]) {
+                                BBoxMin[d] = pt[d];
+                            }
+                            if (BBoxMax[d] < pt[d]) {
+                                BBoxMax[d] = pt[d];
+                            }
+                        }//for every dimension d from 0 to 2
+                    }
+                }
+
+                //increase the bbox given the stroke width and the angle (in case of calligraphic brush)
+                var bboxPadding = this._strokeWidth*0.5;
+                for (var d = 0; d < 3; d++) {
+                    BBoxMin[d]-= bboxPadding;
+                    BBoxMax[d]+= bboxPadding;
+                }//for every dimension d from 0 to 2
+
+                //******* update the local coords so that the bbox min is at the origin ******
+                for (var i=0;i<numPoints;i++) {
+                    this._LocalPoints[i][0]-= BBoxMin[0];
+                    this._LocalPoints[i][1]-= BBoxMin[1];
+                }
+            }//if we need to do smoothing
         }
     },
 
-- 
cgit v1.2.3


From c7135de92b25b380bebcafac541821a3696cfdfa Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Tue, 12 Jun 2012 10:21:03 -0700
Subject: change the brush runtime to ignore hardness in case of strokewidth of
 1

---
 assets/canvas-runtime.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'assets')

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index c2ab0bd8..feb35187 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -2264,7 +2264,10 @@ NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
                     var disp = [brushStamp[t][0], brushStamp[t][1]];
                     var alphaVal = 1.0;
                     var distFromOpaqueRegion = Math.abs(t-halfNumTraces) - opaqueRegionHalfWidth;
-                    if (distFromOpaqueRegion>0) {
+                    if (numTraces === 1){
+                        distFromOpaqueRegion = 0;
+                    }
+                    else if (distFromOpaqueRegion>0) {
                         var transparencyFactor = distFromOpaqueRegion/maxTransparentRegionHalfWidth;
                         alphaVal = 1.0 - transparencyFactor;//(transparencyFactor*transparencyFactor);//the square term produces nonlinearly varying alpha values
                         alphaVal *= 0.5; //factor that accounts for lineWidth == 2
-- 
cgit v1.2.3


From 7214ada78f570f7897d33446e280086640666a14 Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Wed, 13 Jun 2012 13:31:34 -0700
Subject: fix bug #1704 where small paths/strokes with large stroke width
 caused a flip of the gradient colors

---
 assets/canvas-runtime.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'assets')

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index feb35187..6268f0bb 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -1969,7 +1969,8 @@ NinjaCvsRt.RuntimeSubPath = Object.create(NinjaCvsRt.RuntimeGeomObj, {
             if (ipColor.gradientMode){
                 var position, gradient, cs, inset; //vars used in gradient calculations
                 inset = Math.ceil( lw ) - 0.5;
-
+                inset=0;
+                
                 if(ipColor.gradientMode === "radial") {
                     var ww = w - 2*lw,  hh = h - 2*lw;
                     gradient = ctx.createRadialGradient(w/2, h/2, 0, w/2, h/2, Math.max(ww, hh)/2);
@@ -2181,6 +2182,7 @@ NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
             if (ipColor.gradientMode){
                 var position, gradient, cs, inset; //vars used in gradient calculations
                 inset = Math.ceil( lw ) - 0.5;
+                inset=0;
 
                 if(ipColor.gradientMode === "radial") {
                     var ww = w - 2*lw,  hh = h - 2*lw;
-- 
cgit v1.2.3