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

Check curve bounds before recursively clipping.

Browse source 
The speeds are back to "normal"!
This commit is contained in:
hkrish 2013-05-15 21:53:05 +02:00
parent 3449f7e69b
commit f6e474da50
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fatline/Intersect.js
View file

@ -229,9 +229,7 @@ function _clipBezierFatLine( v1, v2, v2t ){
} }
// Return the parameter values for v2 for which we can be sure that the // Return the parameter values for v2 for which we can be sure that the
// intersection with v1 lies within. // intersection with v1 lies within.
if(tmin === Infinity || tmax === -Infinity){ if(tmin !== Infinity && tmax !== -Infinity){
return -1;
}
if( tmaxdmin > tmax ){ tmax = 1; } if( tmaxdmin > tmax ){ tmax = 1; }
// Debug: Plot the non-parametric graph and hull // Debug: Plot the non-parametric graph and hull
// plotD_vs_t( 500, 110, Dt, [dq0, dq1, dq2, dq3], v1, dmin, dmax, tmin, tmax, 1.0 / ( tmax - tmin + 0.3 ) ) // plotD_vs_t( 500, 110, Dt, [dq0, dq1, dq2, dq3], v1, dmin, dmax, tmin, tmax, 1.0 / ( tmax - tmin + 0.3 ) )
@ -243,10 +241,16 @@ function _clipBezierFatLine( v1, v2, v2t ){
v2t.t2 = v2tmin + tmax * tdiff; v2t.t2 = v2tmin + tmax * tdiff;
// If the new parameter range fails to converge by atleast 20% of the original range, // If the new parameter range fails to converge by atleast 20% of the original range,
// possibly we have multiple intersections. We need to subdivide one of the curves. // possibly we have multiple intersections. We need to subdivide one of the curves.
if( (tdiff - ( v2t.t2 - v2t.t1 ))/tdiff < 0.2 ){ if( (tdiff - ( v2t.t2 - v2t.t1 ))/tdiff >= 0.2 ){
return 1;
}
}
// TODO: Try checking with a perpendicular fatline to see if the curves overlap
// if it is any faster than this
if( Curve.getBounds( v1 ).touches( Curve.getBounds( v2 ) ) ){
return -1; return -1;
} }
return 1; return 0;
} }
/** /**