Prebuilt module for commit 31732917c0

This commit is contained in:
Paper.js Bot 2016-07-23 11:33:48 +00:00
parent e122305bec
commit ef33ac0580
5 changed files with 34 additions and 25 deletions

View file

@ -9,7 +9,7 @@
* *
* All rights reserved. * All rights reserved.
* *
* Date: Fri Jul 22 23:30:36 2016 +0200 * Date: Sat Jul 23 13:30:40 2016 +0200
* *
*** ***
* *
@ -9856,9 +9856,9 @@ PathItem.inject(new function() {
windingR = 0, windingR = 0,
pathWindingL = 0, pathWindingL = 0,
pathWindingR = 0, pathWindingR = 0,
onPath = false,
onPathWinding = 0, onPathWinding = 0,
onPathCount = 0, onPathCount = 0,
onPath = false,
roots = [], roots = [],
vPrev, vPrev,
vClose; vClose;
@ -9891,14 +9891,15 @@ PathItem.inject(new function() {
: Curve.getPoint(v, t)[dir ? 'y' : 'x'], : Curve.getPoint(v, t)[dir ? 'y' : 'x'],
winding = o0 > o3 ? 1 : -1, winding = o0 > o3 ? 1 : -1,
windingPrev = vPrev[io] > vPrev[io + 6] ? 1 : -1, windingPrev = vPrev[io] > vPrev[io + 6] ? 1 : -1,
a3Prev = vPrev[ia + 6]; a3Prev = vPrev[ia + 6],
onCurve = false;
if (po !== o0) { if (po !== o0) {
if (a < paL) { if (a < paL) {
pathWindingL += winding; pathWindingL += winding;
} else if (a > paR) { } else if (a > paR) {
pathWindingR += winding; pathWindingR += winding;
} else { } else {
onPath = true; onCurve = true;
pathWindingL += winding; pathWindingL += winding;
pathWindingR += winding; pathWindingR += winding;
} }
@ -9910,7 +9911,7 @@ PathItem.inject(new function() {
pathWindingR += winding; pathWindingR += winding;
} }
} else if (a3Prev < paL && a > paL || a3Prev > paR && a < paR) { } else if (a3Prev < paL && a > paL || a3Prev > paR && a < paR) {
onPath = true; onCurve = true;
if (a3Prev < paL) { if (a3Prev < paL) {
pathWindingR += winding; pathWindingR += winding;
} else if (a3Prev > paR) { } else if (a3Prev > paR) {
@ -9918,7 +9919,9 @@ PathItem.inject(new function() {
} }
} }
vPrev = v; vPrev = v;
return onPath && !dontFlip if (onCurve)
onPath = true;
return onCurve && !dontFlip
&& Curve.getTangent(v, t)[dir ? 'x' : 'y'] === 0 && Curve.getTangent(v, t)[dir ? 'x' : 'y'] === 0
&& getWinding(point, curves, dir ? 0 : 1, true); && getWinding(point, curves, dir ? 0 : 1, true);
} }
@ -9982,7 +9985,7 @@ PathItem.inject(new function() {
if (i + 1 === l || curves[i + 1]._path !== path) { if (i + 1 === l || curves[i + 1]._path !== path) {
if (vClose && (res = handleCurve(vClose))) if (vClose && (res = handleCurve(vClose)))
return res; return res;
if (!pathWindingL && !pathWindingR && onPath) { if (onPath && !pathWindingL && !pathWindingR) {
var add = path.isClockwise() ^ dir ? 1 : -1; var add = path.isClockwise() ^ dir ? 1 : -1;
windingL += add; windingL += add;
windingR -= add; windingR -= add;

17
dist/paper-core.js vendored
View file

@ -9,7 +9,7 @@
* *
* All rights reserved. * All rights reserved.
* *
* Date: Fri Jul 22 23:30:36 2016 +0200 * Date: Sat Jul 23 13:30:40 2016 +0200
* *
*** ***
* *
@ -9856,9 +9856,9 @@ PathItem.inject(new function() {
windingR = 0, windingR = 0,
pathWindingL = 0, pathWindingL = 0,
pathWindingR = 0, pathWindingR = 0,
onPath = false,
onPathWinding = 0, onPathWinding = 0,
onPathCount = 0, onPathCount = 0,
onPath = false,
roots = [], roots = [],
vPrev, vPrev,
vClose; vClose;
@ -9891,14 +9891,15 @@ PathItem.inject(new function() {
: Curve.getPoint(v, t)[dir ? 'y' : 'x'], : Curve.getPoint(v, t)[dir ? 'y' : 'x'],
winding = o0 > o3 ? 1 : -1, winding = o0 > o3 ? 1 : -1,
windingPrev = vPrev[io] > vPrev[io + 6] ? 1 : -1, windingPrev = vPrev[io] > vPrev[io + 6] ? 1 : -1,
a3Prev = vPrev[ia + 6]; a3Prev = vPrev[ia + 6],
onCurve = false;
if (po !== o0) { if (po !== o0) {
if (a < paL) { if (a < paL) {
pathWindingL += winding; pathWindingL += winding;
} else if (a > paR) { } else if (a > paR) {
pathWindingR += winding; pathWindingR += winding;
} else { } else {
onPath = true; onCurve = true;
pathWindingL += winding; pathWindingL += winding;
pathWindingR += winding; pathWindingR += winding;
} }
@ -9910,7 +9911,7 @@ PathItem.inject(new function() {
pathWindingR += winding; pathWindingR += winding;
} }
} else if (a3Prev < paL && a > paL || a3Prev > paR && a < paR) { } else if (a3Prev < paL && a > paL || a3Prev > paR && a < paR) {
onPath = true; onCurve = true;
if (a3Prev < paL) { if (a3Prev < paL) {
pathWindingR += winding; pathWindingR += winding;
} else if (a3Prev > paR) { } else if (a3Prev > paR) {
@ -9918,7 +9919,9 @@ PathItem.inject(new function() {
} }
} }
vPrev = v; vPrev = v;
return onPath && !dontFlip if (onCurve)
onPath = true;
return onCurve && !dontFlip
&& Curve.getTangent(v, t)[dir ? 'x' : 'y'] === 0 && Curve.getTangent(v, t)[dir ? 'x' : 'y'] === 0
&& getWinding(point, curves, dir ? 0 : 1, true); && getWinding(point, curves, dir ? 0 : 1, true);
} }
@ -9982,7 +9985,7 @@ PathItem.inject(new function() {
if (i + 1 === l || curves[i + 1]._path !== path) { if (i + 1 === l || curves[i + 1]._path !== path) {
if (vClose && (res = handleCurve(vClose))) if (vClose && (res = handleCurve(vClose)))
return res; return res;
if (!pathWindingL && !pathWindingR && onPath) { if (onPath && !pathWindingL && !pathWindingR) {
var add = path.isClockwise() ^ dir ? 1 : -1; var add = path.isClockwise() ^ dir ? 1 : -1;
windingL += add; windingL += add;
windingR -= add; windingR -= add;

File diff suppressed because one or more lines are too long

17
dist/paper-full.js vendored
View file

@ -9,7 +9,7 @@
* *
* All rights reserved. * All rights reserved.
* *
* Date: Fri Jul 22 23:30:36 2016 +0200 * Date: Sat Jul 23 13:30:40 2016 +0200
* *
*** ***
* *
@ -9856,9 +9856,9 @@ PathItem.inject(new function() {
windingR = 0, windingR = 0,
pathWindingL = 0, pathWindingL = 0,
pathWindingR = 0, pathWindingR = 0,
onPath = false,
onPathWinding = 0, onPathWinding = 0,
onPathCount = 0, onPathCount = 0,
onPath = false,
roots = [], roots = [],
vPrev, vPrev,
vClose; vClose;
@ -9891,14 +9891,15 @@ PathItem.inject(new function() {
: Curve.getPoint(v, t)[dir ? 'y' : 'x'], : Curve.getPoint(v, t)[dir ? 'y' : 'x'],
winding = o0 > o3 ? 1 : -1, winding = o0 > o3 ? 1 : -1,
windingPrev = vPrev[io] > vPrev[io + 6] ? 1 : -1, windingPrev = vPrev[io] > vPrev[io + 6] ? 1 : -1,
a3Prev = vPrev[ia + 6]; a3Prev = vPrev[ia + 6],
onCurve = false;
if (po !== o0) { if (po !== o0) {
if (a < paL) { if (a < paL) {
pathWindingL += winding; pathWindingL += winding;
} else if (a > paR) { } else if (a > paR) {
pathWindingR += winding; pathWindingR += winding;
} else { } else {
onPath = true; onCurve = true;
pathWindingL += winding; pathWindingL += winding;
pathWindingR += winding; pathWindingR += winding;
} }
@ -9910,7 +9911,7 @@ PathItem.inject(new function() {
pathWindingR += winding; pathWindingR += winding;
} }
} else if (a3Prev < paL && a > paL || a3Prev > paR && a < paR) { } else if (a3Prev < paL && a > paL || a3Prev > paR && a < paR) {
onPath = true; onCurve = true;
if (a3Prev < paL) { if (a3Prev < paL) {
pathWindingR += winding; pathWindingR += winding;
} else if (a3Prev > paR) { } else if (a3Prev > paR) {
@ -9918,7 +9919,9 @@ PathItem.inject(new function() {
} }
} }
vPrev = v; vPrev = v;
return onPath && !dontFlip if (onCurve)
onPath = true;
return onCurve && !dontFlip
&& Curve.getTangent(v, t)[dir ? 'x' : 'y'] === 0 && Curve.getTangent(v, t)[dir ? 'x' : 'y'] === 0
&& getWinding(point, curves, dir ? 0 : 1, true); && getWinding(point, curves, dir ? 0 : 1, true);
} }
@ -9982,7 +9985,7 @@ PathItem.inject(new function() {
if (i + 1 === l || curves[i + 1]._path !== path) { if (i + 1 === l || curves[i + 1]._path !== path) {
if (vClose && (res = handleCurve(vClose))) if (vClose && (res = handleCurve(vClose)))
return res; return res;
if (!pathWindingL && !pathWindingR && onPath) { if (onPath && !pathWindingL && !pathWindingR) {
var add = path.isClockwise() ^ dir ? 1 : -1; var add = path.isClockwise() ^ dir ? 1 : -1;
windingL += add; windingL += add;
windingR -= add; windingR -= add;

File diff suppressed because one or more lines are too long