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

Rework handling of weighted and normalized curve tangents and normals.

Browse source 
Relates to
This commit is contained in:
Jürg Lehni 2015-08-19 17:15:41 +02:00
parent eb8c5b4a3e
commit da82116501
7 changed files with 164 additions and 87 deletions

16
src/path/PathItem.Boolean.js
View file

@ -271,7 +271,7 @@ PathItem.inject(new function() {
var values = curves[i].values;
if (Curve.solveCubic(values, 0, px, roots, 0, 1) > 0) {
for (var j = roots.length - 1; j >= 0; j--) {
var y = Curve.evaluate(values, roots[j], 0).y;
var y = Curve.getPoint(values, roots[j]).y;
if (y < yBefore && y > yTop) {
yTop = y;
} else if (y > yAfter && y < yBottom) {
@ -325,8 +325,8 @@ PathItem.inject(new function() {
// sure we're still on the same loop.
|| t < tMin && prevT > tMax
&& curve.previous === prevCurve)) {
var x = Curve.evaluate(values, t, 0).x,
slope = Curve.evaluate(values, t, 1).y,
var x = Curve.getPoint(values, t).x,
slope = Curve.getTangent(values, t).y,
counted = false;
// Take care of cases where the curve and the preceding
// curve merely touches the ray towards +-x direction,
@ -334,11 +334,11 @@ PathItem.inject(new function() {
// This essentially is not a crossing.
if (Numerical.isZero(slope) && !Curve.isLinear(values)
// Does the slope over curve beginning change?
|| t < tMin && slope * Curve.evaluate(
curve.previous.values, 1, 1).y < 0
|| t < tMin && slope * Curve.getTangent(
curve.previous.values, 1).y < 0
// Does the slope over curve end change?
|| t > tMax && slope * Curve.evaluate(
curve.next.values, 0, 1).y < 0) {
|| t > tMax && slope * Curve.getTangent(
curve.next.values, 0).y < 0) {
if (testContains && x >= xBefore && x <= xAfter) {
++windLeft;
++windRight;
@ -695,7 +695,7 @@ Path.inject(/** @lends Path# */{
|| y >= values[7] && y <= values[1])
&& Curve.solveCubic(values, 1, y, roots, 0, 1) > 0) {
for (var j = roots.length - 1; j >= 0; j--)
xIntercepts.push(Curve.evaluate(values, roots[j], 0).x);
xIntercepts.push(Curve.getPoint(values, roots[j]).x);
}
if (xIntercepts.length > 1)
break;