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

Streamline handling of abscissa and ordinate flipping.

Browse source
This commit is contained in:
Jürg Lehni 2017-02-05 21:59:29 +01:00
parent 1f768c69d2
commit 8c3c771891
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/path/Curve.js
View file

@ -656,7 +656,7 @@ statics: /** @lends Curve */{
var curves = [], var curves = [],
// Determine the ordinate index in the curve values array. // Determine the ordinate index in the curve values array.
io = dir ? 0 : 1, io = dir ? 0 : 1,
o0 = v[io], o0 = v[io + 0],
o1 = v[io + 2], o1 = v[io + 2],
o2 = v[io + 4], o2 = v[io + 4],
o3 = v[io + 6]; o3 = v[io + 6];

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

@ -465,7 +465,7 @@ PathItem.inject(new function() {
// Determine the index of the abscissa and ordinate values in the curve // Determine the index of the abscissa and ordinate values in the curve
// values arrays, based on the direction: // values arrays, based on the direction:
var ia = dir ? 1 : 0, // the abscissa index var ia = dir ? 1 : 0, // the abscissa index
io = dir ? 0 : 1, // the ordinate index io = ia ^ 1, // the ordinate index
pv = [point.x, point.y], pv = [point.x, point.y],
pa = pv[ia], // the point's abscissa pa = pv[ia], // the point's abscissa
po = pv[io], // the point's ordinate po = pv[io], // the point's ordinate
@ -483,14 +483,14 @@ PathItem.inject(new function() {
vClose; vClose;
function addWinding(v) { function addWinding(v) {
var o0 = v[io], var o0 = v[io + 0],
o3 = v[io + 6]; o3 = v[io + 6];
if (po < min(o0, o3) || po > max(o0, o3)) { if (po < min(o0, o3) || po > max(o0, o3)) {
// If the curve is outside the ordinates' range, no intersection // If the curve is outside the ordinates' range, no intersection
// with the ray is possible. // with the ray is possible.
return; return;
} }
var a0 = v[ia], var a0 = v[ia + 0],
a1 = v[ia + 2], a1 = v[ia + 2],
a2 = v[ia + 4], a2 = v[ia + 4],
a3 = v[ia + 6]; a3 = v[ia + 6];
@ -574,14 +574,14 @@ PathItem.inject(new function() {
function handleCurve(v) { function handleCurve(v) {
// Get the ordinates: // Get the ordinates:
var o0 = v[io], var o0 = v[io + 0],
o1 = v[io + 2], o1 = v[io + 2],
o2 = v[io + 4], o2 = v[io + 4],
o3 = v[io + 6]; o3 = v[io + 6];
// Only handle curves that can cross the point's ordinate. // Only handle curves that can cross the point's ordinate.
if (po <= max(o0, o1, o2, o3) && po >= min(o0, o1, o2, o3)) { if (po <= max(o0, o1, o2, o3) && po >= min(o0, o1, o2, o3)) {
// Get the abscissas: // Get the abscissas:
var a0 = v[ia], var a0 = v[ia + 0],
a1 = v[ia + 2], a1 = v[ia + 2],
a2 = v[ia + 4], a2 = v[ia + 4],
a3 = v[ia + 6], a3 = v[ia + 6],