363 |
<< ab<<" "<<fract<<" "<<va1<<" "<<va2<< |
<< ab<<" "<<fract<<" "<<va1<<" "<<va2<< |
364 |
"\n"; |
"\n"; |
365 |
if (overlap1) |
if (overlap1) |
366 |
renderSpan(CircularNodeSpan(node, a1-w1, a1+w1), 0); |
renderSpan(CircularSliceSpan(node, a1-w1, a1+w1), 0); |
367 |
else |
else |
368 |
renderSpan( |
renderSpan( |
369 |
makeLerpFilletSpan( |
makeLerpFilletSpan( |
373 |
); |
); |
374 |
|
|
375 |
if (overlap2) |
if (overlap2) |
376 |
renderSpan(CircularNodeSpan(node, a2-w2, a2+w2), 0); |
renderSpan(CircularSliceSpan(node, a2-w2, a2+w2), 0); |
377 |
else |
else |
378 |
renderSpan( |
renderSpan( |
379 |
makeLerpFilletSpan( |
makeLerpFilletSpan( |
489 |
|
|
490 |
if(f1.overlaps(f2)) { |
if(f1.overlaps(f2)) { |
491 |
if (overlap1) |
if (overlap1) |
492 |
renderSpan(CircularNodeSpan(node, a1-w1, a1+w1), 0); |
renderSpan(CircularSliceSpan(node, a1-w1, a1+w1), 0); |
493 |
else |
else |
494 |
renderSpan(makeFilletBlend(f1, f2), 1); |
renderSpan(makeFilletBlend(f1, f2), 1); |
495 |
|
|
496 |
if (overlap2) |
if (overlap2) |
497 |
renderSpan(CircularNodeSpan(node, a2-w2, a2+w2), 0); |
renderSpan(CircularSliceSpan(node, a2-w2, a2+w2), 0); |
498 |
else |
else |
499 |
renderSpan(makeFilletBlend(f2, f1), -1); |
renderSpan(makeFilletBlend(f2, f1), -1); |
500 |
|
|
501 |
} else { |
} else { |
502 |
if (overlap1) |
if (overlap1) |
503 |
renderSpan(CircularNodeSpan(node, a1-w1, a1+w1), 0); |
renderSpan(CircularSliceSpan(node, a1-w1, a1+w1), 0); |
504 |
else |
else |
505 |
renderSpan(f1, 1); |
renderSpan(f1, 1); |
506 |
float ta1 = f1.dirTang.atan(); |
float ta1 = f1.dirTang.atan(); |
508 |
if(ta2 < ta1) ta2 += 2*M_PI; |
if(ta2 < ta1) ta2 += 2*M_PI; |
509 |
renderSpan(CircularNodeSpan(node, ta1, ta2), 1); |
renderSpan(CircularNodeSpan(node, ta1, ta2), 1); |
510 |
if (overlap2) |
if (overlap2) |
511 |
renderSpan(CircularNodeSpan(node, a2-w2, a2+w2), 0); |
renderSpan(CircularSliceSpan(node, a2-w2, a2+w2), 0); |
512 |
else |
else |
513 |
renderSpan(f2, -1); |
renderSpan(f2, -1); |
514 |
} |
} |