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

Remove sameDir parameter from isCollinear() agian.

Browse source 
It's not in use anywhere now.
This commit is contained in:
Jürg Lehni 2016-01-06 11:08:17 +01:00
parent 5b98fea3fc
commit df580425f4
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/basic/Line.js
View file

@ -113,9 +113,8 @@ var Line = Base.extend(/** @lends Line# */{
point.x, point.y, true)); point.x, point.y, true));
}, },
isCollinear: function(line, sameDir) { isCollinear: function(line) {
return Point.isCollinear(this._vx, this._vy, line._vx, line._vy, return Point.isCollinear(this._vx, this._vy, line._vx, line._vy);
sameDir);
}, },
isOrthogonal: function(line) { isOrthogonal: function(line) {

13
src/basic/Point.js
View file

@ -704,9 +704,8 @@ var Point = Base.extend(/** @lends Point# */{
* @return {Boolean} {@true it is collinear} * @return {Boolean} {@true it is collinear}
*/ */
isCollinear: function(/* point */) { isCollinear: function(/* point */) {
var point = Point.read(arguments), var point = Point.read(arguments);
sameDir = Base.read(arguments); return Point.isCollinear(this.x, this.y, point.x, point.y);
return Point.isCollinear(this.x, this.y, point.x, point.y, sameDir);
}, },
// TODO: Remove version with typo after a while (deprecated June 2015) // TODO: Remove version with typo after a while (deprecated June 2015)
@ -918,16 +917,14 @@ var Point = Base.extend(/** @lends Point# */{
return new Point(Math.random(), Math.random()); return new Point(Math.random(), Math.random());
}, },
isCollinear: function(x1, y1, x2, y2, sameDir) { isCollinear: function(x1, y1, x2, y2) {
// NOTE: We use normalized vectors so that the epsilon comparison is // NOTE: We use normalized vectors so that the epsilon comparison is
// reliable. We could instead scale the epsilon based on the vector // reliable. We could instead scale the epsilon based on the vector
// length. But instead of normalizing the vectors before calculating // length. But instead of normalizing the vectors before calculating
// the cross product, we can scale the epsilon accordingly. // the cross product, we can scale the epsilon accordingly.
var d2 = x2 * x2 + y2 * y2;
return Math.abs(x1 * y2 - y1 * x2) return Math.abs(x1 * y2 - y1 * x2)
<= Math.sqrt((x1 * x1 + y1 * y1) * d2) <= Math.sqrt((x1 * x1 + y1 * y1) * (x2 * x2 + y2 * y2))
* /*#=*/Numerical.TRIGONOMETRIC_EPSILON * /*#=*/Numerical.TRIGONOMETRIC_EPSILON;
&& (!sameDir || (x1 * x2 + y1 * y2) / d2 >= 0);
}, },
isOrthogonal: function(x1, y1, x2, y2) { isOrthogonal: function(x1, y1, x2, y2) {

4
src/path/Curve.js
View file

@ -949,9 +949,9 @@ statics: {
* @param {Curve} curve the other curve to check against * @param {Curve} curve the other curve to check against
* @return {Boolean} {@true if the two lines are collinear} * @return {Boolean} {@true if the two lines are collinear}
*/ */
isCollinear: function(curve, sameDir) { isCollinear: function(curve) {
return curve && this.isStraight() && curve.isStraight() return curve && this.isStraight() && curve.isStraight()
&& this.getLine().isCollinear(curve.getLine(), sameDir); && this.getLine().isCollinear(curve.getLine());
}, },
/** /**