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

Rename Curve#isLinear() to #isStraight()

Browse source 
Relates to #652
This commit is contained in:
Jürg Lehni 2015-09-06 17:35:27 +02:00
parent 9dab662a1f
commit 9d12a0a82c
3 changed files with 40 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/path/Curve.js
View file

@ -358,12 +358,8 @@ var Curve = Base.extend(/** @lends Curve# */{
* @bean * @bean
*/ */
getLength: function() { getLength: function() {
if (this._length == null) { if (this._length == null)
// Use simple point distance for straight curves this._length = Curve.getLength(this.getValues(), 0, 1);
this._length = this.isLinear()
? this.getVector().getLength()
: Curve.getLength(this.getValues(), 0, 1);
}
return this._length; return this._length;
}, },
@ -802,7 +798,7 @@ statics: {
* @ignore * @ignore
*/ */
}), new function() { // Injection scope for tests }), new function() { // Injection scope for tests
function isLinear(l, h1, h2) { function isStraight(l, h1, h2) {
if (h1.isZero() && h2.isZero()) { if (h1.isZero() && h2.isZero()) {
// No handles. // No handles.
return true; return true;
@ -843,12 +839,12 @@ statics: {
* line that connects the curve's start and end point, not falling * line that connects the curve's start and end point, not falling
* outside of the line. * outside of the line.
* *
* @return {Boolean} {@true if the curve is linear} * @return {Boolean} {@true if the curve is straight}
*/ */
isLinear: function() { isStraight: function() {
var seg1 = this._segment1, var seg1 = this._segment1,
seg2 = this._segment2; seg2 = this._segment2;
return isLinear(seg2._point.subtract(seg1._point), return isStraight(seg2._point.subtract(seg1._point),
seg1._handleOut, seg2._handleIn); seg1._handleOut, seg2._handleIn);
}, },
@ -860,15 +856,15 @@ statics: {
* @return {Boolean} {@true if the two lines are collinear} * @return {Boolean} {@true if the two lines are collinear}
*/ */
isCollinear: function(curve) { isCollinear: function(curve) {
return this.isLinear() && curve.isLinear() return this.isStraight() && curve.isStraight()
&& this.getVector().isCollinear(curve.getVector()); && this.getVector().isCollinear(curve.getVector());
}, },
statics: { statics: {
isLinear: function(v) { isStraight: function(v) {
var p1x = v[0], p1y = v[1], var p1x = v[0], p1y = v[1],
p2x = v[6], p2y = v[7]; p2x = v[6], p2y = v[7];
return isLinear(new Point(p2x - p1x, p2y - p1y), return isStraight(new Point(p2x - p1x, p2y - p1y),
new Point(v[2] - p1x, v[3] - p1y), new Point(v[2] - p1x, v[3] - p1y),
new Point(v[4] - p2x, v[5] - p2y)); new Point(v[4] - p2x, v[5] - p2y));
} }
@ -1220,12 +1216,8 @@ new function() { // Scope for methods that require private functions
a = 0; a = 0;
if (b === undefined) if (b === undefined)
b = 1; b = 1;
var isZero = Numerical.isZero; if (a === 0 && b === 1 && Curve.isStraight(v)) {
// See if the curve is linear by checking p1 == c1 and p2 == c2 // The length of straight curves can be calculated more easily.
if (a === 0 && b === 1
&& isZero(v[0] - v[2]) && isZero(v[1] - v[3])
&& isZero(v[6] - v[4]) && isZero(v[7] - v[5])) {
// Straight line
var dx = v[6] - v[0], // p2x - p1x var dx = v[6] - v[0], // p2x - p1x
dy = v[7] - v[1]; // p2y - p1y dy = v[7] - v[1]; // p2y - p1y
return Math.sqrt(dx * dx + dy * dy); return Math.sqrt(dx * dx + dy * dy);
@ -1525,7 +1517,7 @@ new function() { // Scope for intersection using bezier fat-line clipping
*/ */
function addCurveLineIntersections(v1, v2, curve1, curve2, locations, function addCurveLineIntersections(v1, v2, curve1, curve2, locations,
include) { include) {
var flip = Curve.isLinear(v1), var flip = Curve.isStraight(v1),
vc = flip ? v2 : v1, vc = flip ? v2 : v1,
vl = flip ? v1 : v2, vl = flip ? v1 : v2,
lx1 = vl[0], ly1 = vl[1], lx1 = vl[0], ly1 = vl[1],
@ -1594,10 +1586,10 @@ new function() { // Scope for intersection using bezier fat-line clipping
var abs = Math.abs, var abs = Math.abs,
tolerance = /*#=*/Numerical.TOLERANCE, tolerance = /*#=*/Numerical.TOLERANCE,
epsilon = /*#=*/Numerical.EPSILON, epsilon = /*#=*/Numerical.EPSILON,
linear1 = Curve.isLinear(v1), straight1 = Curve.isStraight(v1),
linear2 = Curve.isLinear(v2), straight2 = Curve.isStraight(v2),
linear = linear1 && linear2; straight = straight1 && straight2;
if (linear) { if (straight) {
// Linear curves can only overlap if they are collinear, which means // Linear curves can only overlap if they are collinear, which means
// they must be are collinear and any point of curve 1 must be on // they must be are collinear and any point of curve 1 must be on
// curve 2 // curve 2
@ -1606,8 +1598,8 @@ new function() { // Scope for intersection using bezier fat-line clipping
if (!line1.isCollinear(line2) || if (!line1.isCollinear(line2) ||
line1.getDistance(line2.getPoint()) > epsilon) line1.getDistance(line2.getPoint()) > epsilon)
return false; return false;
} else if (linear1 ^ linear2) { } else if (straight1 ^ straight2) {
// If one curve is linear, the other curve must be linear, too, // If one curve is straight, the other curve must be straight, too,
// otherwise they cannot overlap. // otherwise they cannot overlap.
return false; return false;
} }
@ -1650,7 +1642,7 @@ new function() { // Scope for intersection using bezier fat-line clipping
// Check if handles of overlapping paths are similar enough. // Check if handles of overlapping paths are similar enough.
// We could do another check for curve identity here if we find a // We could do another check for curve identity here if we find a
// better criteria. // better criteria.
if (linear || if (straight ||
abs(c2[0] - c1[0]) < epsilon && abs(c2[0] - c1[0]) < epsilon &&
abs(c2[1] - c1[1]) < epsilon && abs(c2[1] - c1[1]) < epsilon &&
abs(c2[1] - c1[1]) < epsilon && abs(c2[1] - c1[1]) < epsilon &&
@ -1687,8 +1679,8 @@ new function() { // Scope for intersection using bezier fat-line clipping
getIntersections: function(v1, v2, c1, c2, locations, include) { getIntersections: function(v1, v2, c1, c2, locations, include) {
if (addOverlap(v1, v2, c1, c2, locations, include)) if (addOverlap(v1, v2, c1, c2, locations, include))
return locations; return locations;
var linear1 = Curve.isLinear(v1), var straight1 = Curve.isStraight(v1),
linear2 = Curve.isLinear(v2), straight2 = Curve.isStraight(v2),
c1p1 = c1.getPoint1(), c1p1 = c1.getPoint1(),
c1p2 = c1.getPoint2(), c1p2 = c1.getPoint2(),
c2p1 = c2.getPoint1(), c2p1 = c2.getPoint1(),
@ -1702,10 +1694,10 @@ new function() { // Scope for intersection using bezier fat-line clipping
if (c1p1.isClose(c2p2, tolerance)) if (c1p1.isClose(c2p2, tolerance))
addLocation(locations, include, c1, 0, c1p1, c2, 1, c1p1); addLocation(locations, include, c1, 0, c1p1, c2, 1, c1p1);
// Determine the correct intersection method based on values of // Determine the correct intersection method based on values of
// linear1 & 2: // straight1 & 2:
(linear1 && linear2 (straight1 && straight2
? addLineIntersection ? addLineIntersection
: linear1 || linear2 : straight1 || straight2
? addCurveLineIntersections ? addCurveLineIntersections
: addCurveIntersections)( : addCurveIntersections)(
v1, v2, c1, c2, locations, include, v1, v2, c1, c2, locations, include,

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

@ -291,9 +291,9 @@ PathItem.inject(new function() {
} }
function isHorizontal(curve) { function isHorizontal(curve) {
// Determine if the curve is a horizontal linear curve by checking the // Determine if the curve is a horizontal straight curve by checking the
// slope of it's tangent. // slope of it's tangent.
return curve.isLinear() && Math.abs(curve.getTangentAt(0.5, true).y) return curve.isStraight() && Math.abs(curve.getTangentAt(0.5, true).y)
< /*#=*/Numerical.TOLERANCE; < /*#=*/Numerical.TOLERANCE;
} }
@ -386,7 +386,7 @@ PathItem.inject(new function() {
// curve merely touches the ray towards +-x direction, // curve merely touches the ray towards +-x direction,
// but proceeds to the same side of the ray. // but proceeds to the same side of the ray.
// This essentially is not a crossing. // This essentially is not a crossing.
if (Numerical.isZero(slope) && !Curve.isLinear(values) if (Numerical.isZero(slope) && !Curve.isStraight(values)
// Does the slope over curve beginning change? // Does the slope over curve beginning change?
|| t < tMin && slope * Curve.getTangent( || t < tMin && slope * Curve.getTangent(
curve.previous.values, 1).y < 0 curve.previous.values, 1).y < 0
@ -785,8 +785,8 @@ Path.inject(/** @lends Path# */{
y1 = v[3], y1 = v[3],
y2 = v[5], y2 = v[5],
y3 = v[7]; y3 = v[7];
if (Curve.isLinear(v)) { if (Curve.isStraight(v)) {
// Handling linear curves is easy. // Handling straight curves is easy.
insertCurve(v); insertCurve(v);
} else { } else {
// Split the curve at y extrema, to get bezier curves with clear // Split the curve at y extrema, to get bezier curves with clear

22
test/tests/Curve.js
View file

@ -179,35 +179,35 @@ test('Curve#getLocationAt()', function() {
// 'Should return null when point is not on the curve.'); // 'Should return null when point is not on the curve.');
}); });
test('Curve#isLinear()', function() { test('Curve#isStraight()', function() {
equals(function() { equals(function() {
return new Curve([100, 100], null, null, [200, 200]).isLinear(); return new Curve([100, 100], null, null, [200, 200]).isStraight();
}, true); }, true);
equals(function() { equals(function() {
return new Curve([100, 100], [-50, -50], null, [200, 200]).isLinear(); return new Curve([100, 100], [-50, -50], null, [200, 200]).isStraight();
}, false); }, false);
equals(function() { equals(function() {
return new Curve([100, 100], [50, 50], null, [200, 200]).isLinear(); return new Curve([100, 100], [50, 50], null, [200, 200]).isStraight();
}, true); }, true);
equals(function() { equals(function() {
return new Curve([100, 100], [50, 50], [-50, -50], [200, 200]).isLinear(); return new Curve([100, 100], [50, 50], [-50, -50], [200, 200]).isStraight();
}, true); }, true);
equals(function() { equals(function() {
return new Curve([100, 100], [50, 50], [50, 50], [200, 200]).isLinear(); return new Curve([100, 100], [50, 50], [50, 50], [200, 200]).isStraight();
}, false); }, false);
equals(function() { equals(function() {
return new Curve([100, 100], null, [-50, -50], [200, 200]).isLinear(); return new Curve([100, 100], null, [-50, -50], [200, 200]).isStraight();
}, true); }, true);
equals(function() { equals(function() {
return new Curve([100, 100], null, [50, 50], [200, 200]).isLinear(); return new Curve([100, 100], null, [50, 50], [200, 200]).isStraight();
}, false); }, false);
equals(function() { equals(function() {
return new Curve([100, 100], null, null, [100, 100]).isLinear(); return new Curve([100, 100], null, null, [100, 100]).isStraight();
}, true); }, true);
equals(function() { equals(function() {
return new Curve([100, 100], [50, 50], null, [100, 100]).isLinear(); return new Curve([100, 100], [50, 50], null, [100, 100]).isStraight();
}, false); }, false);
equals(function() { equals(function() {
return new Curve([100, 100], null, [-50, -50], [100, 100]).isLinear(); return new Curve([100, 100], null, [-50, -50], [100, 100]).isStraight();
}, false); }, false);
}); });