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

Prebuilt module for commit 452bbfdaa4

Browse source
This commit is contained in:
Paper.js Bot 2016-06-11 11:15:45 +00:00
parent 1d73f441bd
commit 837feb494e
6 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -243,6 +243,8 @@ contribute to the code.
were previously inserted in the same parent (#1015). were previously inserted in the same parent (#1015).
- Add capability to `PathItem#closePath()` to handle imprecise SVG data due to - Add capability to `PathItem#closePath()` to handle imprecise SVG data due to
rounding (#1045). rounding (#1045).
- Improve reliability of fat-line clipping for curves that are very similar
(#904).
### Removed ### Removed
- Canvas attributes "resize" and "data-paper-resize" no longer cause paper to - Canvas attributes "resize" and "data-paper-resize" no longer cause paper to

25
dist/docs/assets/js/paper.js vendored
View file

@ -9,7 +9,7 @@
* *
* All rights reserved. * All rights reserved.
* *
* Date: Sat Jun 11 12:43:37 2016 +0200 * Date: Sat Jun 11 13:13:08 2016 +0200
* *
*** ***
* *
@ -6639,8 +6639,8 @@ new function() {
} }
function addCurveIntersections(v1, v2, c1, c2, locations, param, tMin, tMax, function addCurveIntersections(v1, v2, c1, c2, locations, param, tMin, tMax,
uMin, uMax, reverse, calls) { uMin, uMax, flip, calls) {
if (++calls > 4000) if (++calls > 4096)
return calls; return calls;
var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7], var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7],
getSignedDistance = Line.getSignedDistance, getSignedDistance = Line.getSignedDistance,
@ -6663,7 +6663,7 @@ new function() {
|| (tMinClip = clipConvexHull(top, bottom, dMin, dMax)) == null || (tMinClip = clipConvexHull(top, bottom, dMin, dMax)) == null
|| (tMaxClip = clipConvexHull(top.reverse(), bottom.reverse(), || (tMaxClip = clipConvexHull(top.reverse(), bottom.reverse(),
dMin, dMax)) == null) dMin, dMax)) == null)
return; return calls;
var tMinNew = tMin + (tMax - tMin) * tMinClip, var tMinNew = tMin + (tMax - tMin) * tMinClip,
tMaxNew = tMin + (tMax - tMin) * tMaxClip; tMaxNew = tMin + (tMax - tMin) * tMaxClip;
if (Math.max(uMax - uMin, tMaxNew - tMinNew) if (Math.max(uMax - uMin, tMaxNew - tMinNew)
@ -6673,8 +6673,8 @@ new function() {
v1 = c1.getValues(); v1 = c1.getValues();
v2 = c2.getValues(); v2 = c2.getValues();
addLocation(locations, param, addLocation(locations, param,
reverse ? v2 : v1, reverse ? c2 : c1, reverse ? u : t, null, flip ? v2 : v1, flip ? c2 : c1, flip ? u : t, null,
reverse ? v1 : v2, reverse ? c1 : c2, reverse ? t : u, null); flip ? v1 : v2, flip ? c1 : c2, flip ? t : u, null);
} else { } else {
v1 = Curve.getPart(v1, tMinClip, tMaxClip); v1 = Curve.getPart(v1, tMinClip, tMaxClip);
if (tMaxClip - tMinClip > 0.8) { if (tMaxClip - tMinClip > 0.8) {
@ -6683,23 +6683,24 @@ new function() {
t = (tMinNew + tMaxNew) / 2; t = (tMinNew + tMaxNew) / 2;
calls = addCurveIntersections( calls = addCurveIntersections(
v2, parts[0], c2, c1, locations, param, v2, parts[0], c2, c1, locations, param,
uMin, uMax, tMinNew, t, !reverse, calls); uMin, uMax, tMinNew, t, !flip, calls);
calls = addCurveIntersections( calls = addCurveIntersections(
v2, parts[1], c2, c1, locations, param, v2, parts[1], c2, c1, locations, param,
uMin, uMax, t, tMaxNew, !reverse, calls); uMin, uMax, t, tMaxNew, !flip, calls);
} else { } else {
var parts = Curve.subdivide(v2, 0.5), var parts = Curve.subdivide(v2, 0.5),
u = (uMin + uMax) / 2; u = (uMin + uMax) / 2;
calls = addCurveIntersections( calls = addCurveIntersections(
parts[0], v1, c2, c1, locations, param, parts[0], v1, c2, c1, locations, param,
uMin, u, tMinNew, tMaxNew, !reverse, calls); uMin, u, tMinNew, tMaxNew, !flip, calls);
calls = addCurveIntersections( calls = addCurveIntersections(
parts[1], v1, c2, c1, locations, param, parts[1], v1, c2, c1, locations, param,
u, uMax, tMinNew, tMaxNew, !reverse, calls); u, uMax, tMinNew, tMaxNew, !flip, calls);
} }
} else { } else {
calls = addCurveIntersections(v2, v1, c2, c1, locations, param, calls = addCurveIntersections(
uMin, uMax, tMinNew, tMaxNew, !reverse, calls); v2, v1, c2, c1, locations, param,
uMin, uMax, tMinNew, tMaxNew, !flip, calls);
} }
} }
return calls; return calls;

25
dist/paper-core.js vendored
View file

@ -9,7 +9,7 @@
* *
* All rights reserved. * All rights reserved.
* *
* Date: Sat Jun 11 12:43:37 2016 +0200 * Date: Sat Jun 11 13:13:08 2016 +0200
* *
*** ***
* *
@ -6639,8 +6639,8 @@ new function() {
} }
function addCurveIntersections(v1, v2, c1, c2, locations, param, tMin, tMax, function addCurveIntersections(v1, v2, c1, c2, locations, param, tMin, tMax,
uMin, uMax, reverse, calls) { uMin, uMax, flip, calls) {
if (++calls > 4000) if (++calls > 4096)
return calls; return calls;
var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7], var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7],
getSignedDistance = Line.getSignedDistance, getSignedDistance = Line.getSignedDistance,
@ -6663,7 +6663,7 @@ new function() {
|| (tMinClip = clipConvexHull(top, bottom, dMin, dMax)) == null || (tMinClip = clipConvexHull(top, bottom, dMin, dMax)) == null
|| (tMaxClip = clipConvexHull(top.reverse(), bottom.reverse(), || (tMaxClip = clipConvexHull(top.reverse(), bottom.reverse(),
dMin, dMax)) == null) dMin, dMax)) == null)
return; return calls;
var tMinNew = tMin + (tMax - tMin) * tMinClip, var tMinNew = tMin + (tMax - tMin) * tMinClip,
tMaxNew = tMin + (tMax - tMin) * tMaxClip; tMaxNew = tMin + (tMax - tMin) * tMaxClip;
if (Math.max(uMax - uMin, tMaxNew - tMinNew) if (Math.max(uMax - uMin, tMaxNew - tMinNew)
@ -6673,8 +6673,8 @@ new function() {
v1 = c1.getValues(); v1 = c1.getValues();
v2 = c2.getValues(); v2 = c2.getValues();
addLocation(locations, param, addLocation(locations, param,
reverse ? v2 : v1, reverse ? c2 : c1, reverse ? u : t, null, flip ? v2 : v1, flip ? c2 : c1, flip ? u : t, null,
reverse ? v1 : v2, reverse ? c1 : c2, reverse ? t : u, null); flip ? v1 : v2, flip ? c1 : c2, flip ? t : u, null);
} else { } else {
v1 = Curve.getPart(v1, tMinClip, tMaxClip); v1 = Curve.getPart(v1, tMinClip, tMaxClip);
if (tMaxClip - tMinClip > 0.8) { if (tMaxClip - tMinClip > 0.8) {
@ -6683,23 +6683,24 @@ new function() {
t = (tMinNew + tMaxNew) / 2; t = (tMinNew + tMaxNew) / 2;
calls = addCurveIntersections( calls = addCurveIntersections(
v2, parts[0], c2, c1, locations, param, v2, parts[0], c2, c1, locations, param,
uMin, uMax, tMinNew, t, !reverse, calls); uMin, uMax, tMinNew, t, !flip, calls);
calls = addCurveIntersections( calls = addCurveIntersections(
v2, parts[1], c2, c1, locations, param, v2, parts[1], c2, c1, locations, param,
uMin, uMax, t, tMaxNew, !reverse, calls); uMin, uMax, t, tMaxNew, !flip, calls);
} else { } else {
var parts = Curve.subdivide(v2, 0.5), var parts = Curve.subdivide(v2, 0.5),
u = (uMin + uMax) / 2; u = (uMin + uMax) / 2;
calls = addCurveIntersections( calls = addCurveIntersections(
parts[0], v1, c2, c1, locations, param, parts[0], v1, c2, c1, locations, param,
uMin, u, tMinNew, tMaxNew, !reverse, calls); uMin, u, tMinNew, tMaxNew, !flip, calls);
calls = addCurveIntersections( calls = addCurveIntersections(
parts[1], v1, c2, c1, locations, param, parts[1], v1, c2, c1, locations, param,
u, uMax, tMinNew, tMaxNew, !reverse, calls); u, uMax, tMinNew, tMaxNew, !flip, calls);
} }
} else { } else {
calls = addCurveIntersections(v2, v1, c2, c1, locations, param, calls = addCurveIntersections(
uMin, uMax, tMinNew, tMaxNew, !reverse, calls); v2, v1, c2, c1, locations, param,
uMin, uMax, tMinNew, tMaxNew, !flip, calls);
} }
} }
return calls; return calls;

6
dist/paper-core.min.js vendored
View file

File diff suppressed because one or more lines are too long

25
dist/paper-full.js vendored
View file

@ -9,7 +9,7 @@
* *
* All rights reserved. * All rights reserved.
* *
* Date: Sat Jun 11 12:43:37 2016 +0200 * Date: Sat Jun 11 13:13:08 2016 +0200
* *
*** ***
* *
@ -6639,8 +6639,8 @@ new function() {
} }
function addCurveIntersections(v1, v2, c1, c2, locations, param, tMin, tMax, function addCurveIntersections(v1, v2, c1, c2, locations, param, tMin, tMax,
uMin, uMax, reverse, calls) { uMin, uMax, flip, calls) {
if (++calls > 4000) if (++calls > 4096)
return calls; return calls;
var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7], var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7],
getSignedDistance = Line.getSignedDistance, getSignedDistance = Line.getSignedDistance,
@ -6663,7 +6663,7 @@ new function() {
|| (tMinClip = clipConvexHull(top, bottom, dMin, dMax)) == null || (tMinClip = clipConvexHull(top, bottom, dMin, dMax)) == null
|| (tMaxClip = clipConvexHull(top.reverse(), bottom.reverse(), || (tMaxClip = clipConvexHull(top.reverse(), bottom.reverse(),
dMin, dMax)) == null) dMin, dMax)) == null)
return; return calls;
var tMinNew = tMin + (tMax - tMin) * tMinClip, var tMinNew = tMin + (tMax - tMin) * tMinClip,
tMaxNew = tMin + (tMax - tMin) * tMaxClip; tMaxNew = tMin + (tMax - tMin) * tMaxClip;
if (Math.max(uMax - uMin, tMaxNew - tMinNew) if (Math.max(uMax - uMin, tMaxNew - tMinNew)
@ -6673,8 +6673,8 @@ new function() {
v1 = c1.getValues(); v1 = c1.getValues();
v2 = c2.getValues(); v2 = c2.getValues();
addLocation(locations, param, addLocation(locations, param,
reverse ? v2 : v1, reverse ? c2 : c1, reverse ? u : t, null, flip ? v2 : v1, flip ? c2 : c1, flip ? u : t, null,
reverse ? v1 : v2, reverse ? c1 : c2, reverse ? t : u, null); flip ? v1 : v2, flip ? c1 : c2, flip ? t : u, null);
} else { } else {
v1 = Curve.getPart(v1, tMinClip, tMaxClip); v1 = Curve.getPart(v1, tMinClip, tMaxClip);
if (tMaxClip - tMinClip > 0.8) { if (tMaxClip - tMinClip > 0.8) {
@ -6683,23 +6683,24 @@ new function() {
t = (tMinNew + tMaxNew) / 2; t = (tMinNew + tMaxNew) / 2;
calls = addCurveIntersections( calls = addCurveIntersections(
v2, parts[0], c2, c1, locations, param, v2, parts[0], c2, c1, locations, param,
uMin, uMax, tMinNew, t, !reverse, calls); uMin, uMax, tMinNew, t, !flip, calls);
calls = addCurveIntersections( calls = addCurveIntersections(
v2, parts[1], c2, c1, locations, param, v2, parts[1], c2, c1, locations, param,
uMin, uMax, t, tMaxNew, !reverse, calls); uMin, uMax, t, tMaxNew, !flip, calls);
} else { } else {
var parts = Curve.subdivide(v2, 0.5), var parts = Curve.subdivide(v2, 0.5),
u = (uMin + uMax) / 2; u = (uMin + uMax) / 2;
calls = addCurveIntersections( calls = addCurveIntersections(
parts[0], v1, c2, c1, locations, param, parts[0], v1, c2, c1, locations, param,
uMin, u, tMinNew, tMaxNew, !reverse, calls); uMin, u, tMinNew, tMaxNew, !flip, calls);
calls = addCurveIntersections( calls = addCurveIntersections(
parts[1], v1, c2, c1, locations, param, parts[1], v1, c2, c1, locations, param,
u, uMax, tMinNew, tMaxNew, !reverse, calls); u, uMax, tMinNew, tMaxNew, !flip, calls);
} }
} else { } else {
calls = addCurveIntersections(v2, v1, c2, c1, locations, param, calls = addCurveIntersections(
uMin, uMax, tMinNew, tMaxNew, !reverse, calls); v2, v1, c2, c1, locations, param,
uMin, uMax, tMinNew, tMaxNew, !flip, calls);
} }
} }
return calls; return calls;

6
dist/paper-full.min.js vendored
View file

File diff suppressed because one or more lines are too long