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

Don't create handles if curves are linear

Browse source
This commit is contained in:
hkrish 2013-04-21 14:57:29 +02:00
parent c5984bb9f4
commit 0108f004f1
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Boolean.js
View file

@ -307,6 +307,7 @@
for (k = 0, l=loc.length; k<l; k++) { for (k = 0, l=loc.length; k<l; k++) {
graph[i].intersections.push( loc[k] ); graph[i].intersections.push( loc[k] );
var loc2 = new CurveLocation( c2, null, loc[k].point ); var loc2 = new CurveLocation( c2, null, loc[k].point );
// TODO: change this to loc2._id when CurveLocation has an id property
loc2.id = loc[k].id; loc2.id = loc[k].id;
graph[j].intersections.push( loc2 ); graph[j].intersections.push( loc2 );
} }
@ -320,20 +321,20 @@
* Walk the graph, sort the intersections on each individual link. * Walk the graph, sort the intersections on each individual link.
* for each link that intersects with another one, replace it with new split links. * for each link that intersects with another one, replace it with new split links.
*/ */
var ix, ixPoint, ixHandleI, ixHandleOut, param, isLinear, parts, left, right;
for ( i = graph.length - 1; i >= 0; i--) { for ( i = graph.length - 1; i >= 0; i--) {
if( graph[i].intersections.length ){ if( graph[i].intersections.length ){
var ix = graph[i].intersections; ix = graph[i].intersections;
// Sort the intersections if there is more than one // Sort the intersections if there is more than one
if( graph[i].intersections.length > 1 ){ ix.sort( ixSort ); } if( graph[i].intersections.length > 1 ){ ix.sort( ixSort ); }
// Remove the graph link, this link has to be split and replaced with the splits // Remove the graph link, this link has to be split and replaced with the splits
lnk = graph.splice( i, 1 )[0]; lnk = graph.splice( i, 1 )[0];
for (j =0, l=ix.length; j<l && lnk; j++) { for (j =0, l=ix.length; j<l && lnk; j++) {
var splitLinks = [];
crv = lnk.getCurve(); crv = lnk.getCurve();
// We need to recalculate parameter after each curve split // We need to recalculate parameter after each curve split
// This operation (except for recalculating the curve parameter), // This operation (except for recalculating the curve parameter),
// is fairly similar to Curve.split method, except that it operates on Node and Link objects. // is fairly similar to Curve.split method, except that it operates on Node and Link objects.
var param = crv.getParameterOf( ix[j].point ); param = crv.getParameterOf( ix[j].point );
// var param = crv.getNearestLocation( ix[j] ).parameter; // var param = crv.getNearestLocation( ix[j] ).parameter;
if( param === 0.0 || param === 1.0) { if( param === 0.0 || param === 1.0) {
// Intersection falls on an existing node // Intersection falls on an existing node
@ -349,23 +350,30 @@
rightLink = null; rightLink = null;
} }
} else { } else {
var parts = Curve.subdivide(crv.getValues(), param); isLinear = crv.isLinear();
var left = parts[0]; parts = Curve.subdivide(crv.getValues(), param);
var right = parts[1]; left = parts[0];
right = parts[1];
// Make new link and convert handles from absolute to relative // Make new link and convert handles from absolute to relative
// TODO: check if link is linear and set handles to null ixPoint = new Point( left[6], left[7] );
var ixPoint = new Point( left[6], left[7] ); if( !isLinear ){
nuNode = new Node( ixPoint, new Point(left[4] - ixPoint.x, left[5] - ixPoint.y), ixHandleIn = new Point(left[4] - ixPoint.x, left[5] - ixPoint.y);
new Point(right[2] - ixPoint.x, right[3] - ixPoint.y), lnk.id, lnk.isBaseContour ); ixHandleOut = new Point(right[2] - ixPoint.x, right[3] - ixPoint.y);
} else {
ixHandleIn = ixHandleOut = null;
}
nuNode = new Node( ixPoint, ixHandleIn, ixHandleOut, lnk.id, lnk.isBaseContour );
nuNode.type = INTERSECTION_NODE; nuNode.type = INTERSECTION_NODE;
nuNode._intersectionID = ix[j].id; nuNode._intersectionID = ix[j].id;
// clear the cached Segment on original end nodes and Update their handles // clear the cached Segment on original end nodes and Update their handles
lnk.nodeIn._segment = null; lnk.nodeIn._segment = null;
var tmppnt = lnk.nodeIn.point; if( !isLinear ){
lnk.nodeIn.handleOut = new Point( left[2] - tmppnt.x, left[3] - tmppnt.y ); var tmppnt = lnk.nodeIn.point;
lnk.nodeOut._segment = null; lnk.nodeIn.handleOut = new Point( left[2] - tmppnt.x, left[3] - tmppnt.y );
tmppnt = lnk.nodeOut.point; lnk.nodeOut._segment = null;
lnk.nodeOut.handleIn = new Point( right[4] - tmppnt.x, right[5] - tmppnt.y ); tmppnt = lnk.nodeOut.point;
lnk.nodeOut.handleIn = new Point( right[4] - tmppnt.x, right[5] - tmppnt.y );
}
// Make new links after the split // Make new links after the split
leftLink = new Link( lnk.nodeIn, nuNode, lnk.id, lnk.isBaseContour ); leftLink = new Link( lnk.nodeIn, nuNode, lnk.id, lnk.isBaseContour );
rightLink = new Link( nuNode, lnk.nodeOut, lnk.id, lnk.isBaseContour ); rightLink = new Link( nuNode, lnk.nodeOut, lnk.id, lnk.isBaseContour );