scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-08 05:42:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix wrong calculation of rough bounds for square caps.

Browse source 
And add some comments to stroke hit-testing code.
This commit is contained in:
Jürg Lehni 2013-06-15 05:15:48 -07:00
parent 26971672b2
commit 8c09d19f7c
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/path/Path.js
View file

@ -1682,6 +1682,8 @@ var Path = PathItem.extend(/** @lends Path# */{
area.push(point); area.push(point);
} }
// In order to be able to reuse crossings counting code, we describe
// each line as a curve values array.
function getAreaCurve(index) { function getAreaCurve(index) {
var p1 = area[index], var p1 = area[index],
p2 = area[(index + 1) % area.length]; p2 = area[(index + 1) % area.length];
@ -1745,6 +1747,9 @@ var Path = PathItem.extend(/** @lends Path# */{
if (radius > 0) { if (radius > 0) {
loc = this.getNearestLocation(point); loc = this.getNearestLocation(point);
if (loc) { if (loc) {
// Now see if we're on a segment, and if so, check for its
// stroke join / cap first. If not, do a normal radius check
// for round strokes.
var param = loc.getParameter(); var param = loc.getParameter();
if (param === 0 || param === 1) { if (param === 0 || param === 1) {
if (!checkSegmentStroke(loc.getSegment())) if (!checkSegmentStroke(loc.getSegment()))
@ -1753,6 +1758,8 @@ var Path = PathItem.extend(/** @lends Path# */{
loc = null; loc = null;
} }
} }
// If we have miter joins, we may not be done yet, since they can be
// longer than the radius. Check for each segment within reach now.
if (!loc && join === 'miter') { if (!loc && join === 'miter') {
for (var i = 0, l = segments.length; i < l; i++) { for (var i = 0, l = segments.length; i < l; i++) {
var segment = segments[i]; var segment = segments[i];
@ -2577,11 +2584,13 @@ statics: {
// Delegate to handleBounds, but pass on radius values for stroke and // Delegate to handleBounds, but pass on radius values for stroke and
// joins. Hanlde miter joins specially, by passing the largets radius // joins. Hanlde miter joins specially, by passing the largets radius
// possible. // possible.
var strokeWidth = style.getStrokeColor() ? style.getStrokeWidth() : 0; var strokeWidth = style.getStrokeColor() ? style.getStrokeWidth() : 0,
joinWidth = strokeWidth;
if (style.getStrokeJoin() === 'miter')
joinWidth = strokeWidth * style.getMiterLimit();
if (style.getStrokeCap() === 'square')
joinWidth = Math.max(joinWidth, strokeWidth * Math.sqrt(2));
return Path.getHandleBounds(segments, closed, style, matrix, return Path.getHandleBounds(segments, closed, style, matrix,
strokeWidth, strokeWidth, joinWidth);
style.getStrokeJoin() == 'miter'
? strokeWidth * style.getMiterLimit()
: strokeWidth);
} }
}}); }});