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

Fix: Update the getIntersections method signature in recursive calls

Browse source
This commit is contained in:
hkrish 2013-05-01 13:29:02 +02:00
parent 88b720be76
commit f239a3980d
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/path/Curve.js
View file

@ -379,7 +379,7 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
* modified and becomes the first part, the second part is returned as a new * modified and becomes the first part, the second part is returned as a new
* curve. If the modified curve belongs to a path item, the second part is * curve. If the modified curve belongs to a path item, the second part is
* added to it. * added to it.
* *
* @param parameter the position at which to split the curve as a value * @param parameter the position at which to split the curve as a value
* between 0 and 1 {@default 0.5} * between 0 and 1 {@default 0.5}
* @return {Curve} the second part of the divided curve * @return {Curve} the second part of the divided curve
@ -396,7 +396,7 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
right = parts[1], right = parts[1],
point1 = this._segment1._point, point1 = this._segment1._point,
point2 = this._segment2._point; point2 = this._segment2._point;
// Write back the results: // Write back the results:
if (!isLinear) { if (!isLinear) {
this._segment1._handleOut.set(left[2] - point1._x, this._segment1._handleOut.set(left[2] - point1._x,
@ -413,7 +413,7 @@ var Curve = this.Curve = Base.extend(/** @lends Curve# */{
segment = new Segment(Point.create(x, y), segment = new Segment(Point.create(x, y),
isLinear ? null : Point.create(left[4] - x, left[5] - y), isLinear ? null : Point.create(left[4] - x, left[5] - y),
isLinear ? null : Point.create(right[2] - x, right[3] - y)); isLinear ? null : Point.create(right[2] - x, right[3] - y));
// Insert it in the segments list, if needed: // Insert it in the segments list, if needed:
if (this._path) { if (this._path) {
// Insert at the end if this curve is a closing curve of a // Insert at the end if this curve is a closing curve of a
@ -670,7 +670,7 @@ statics: {
/** /**
* Private helper for both Curve.getBounds() and Path.getBounds(), which * Private helper for both Curve.getBounds() and Path.getBounds(), which
* finds the 0-crossings of the derivative of a bezier curve polynomial, to * finds the 0-crossings of the derivative of a bezier curve polynomial, to
* determine potential extremas when finding the bounds of a curve. * determine potential extremas when finding the bounds of a curve.
* Note: padding is only used for Path.getBounds(). * Note: padding is only used for Path.getBounds().
*/ */
_addBounds: function(v0, v1, v2, v3, coord, padding, min, max, roots) { _addBounds: function(v0, v1, v2, v3, coord, padding, min, max, roots) {
@ -757,7 +757,7 @@ statics: {
.intersect(new Line(v2[0], v2[1], v2[6], v2[7], false)); .intersect(new Line(v2[0], v2[1], v2[6], v2[7], false));
if (point) { if (point) {
// Avoid duplicates when hitting segments (closed paths too) // Avoid duplicates when hitting segments (closed paths too)
var first = locations[0], var first = locations[0],
last = locations[locations.length - 1]; last = locations[locations.length - 1];
if ((!first || !point.equals(first._point)) if ((!first || !point.equals(first._point))
&& (!last || !point.equals(last._point))) && (!last || !point.equals(last._point)))
@ -773,7 +773,7 @@ statics: {
v2s = this.subdivide(v2); v2s = this.subdivide(v2);
for (var i = 0; i < 2; i++) for (var i = 0; i < 2; i++)
for (var j = 0; j < 2; j++) for (var j = 0; j < 2; j++)
this.getIntersections(v1s[i], v2s[j], curve1, locations); this.getIntersections(v1s[i], v2s[j], curve1, curve2, locations);
} }
} }
return locations; return locations;
@ -852,7 +852,7 @@ statics: {
/** /**
* Calculates the curve time parameter of the specified offset on the path, * Calculates the curve time parameter of the specified offset on the path,
* relative to the provided start parameter. If offset is a negative value, * relative to the provided start parameter. If offset is a negative value,
* the parameter is searched to the left of the start parameter. If no start * the parameter is searched to the left of the start parameter. If no start
* parameter is provided, a default of {@code 0} for positive values of * parameter is provided, a default of {@code 0} for positive values of
* {@code offset} and {@code 1} for negative values of {@code offset}. * {@code offset} and {@code 1} for negative values of {@code offset}.
* @param {Number} offset * @param {Number} offset
@ -880,7 +880,7 @@ statics: {
* parameter. * parameter.
* @param {Number} offset the offset on the curve, or the curve time * @param {Number} offset the offset on the curve, or the curve time
* parameter if {@code isParameter} is {@code true} * parameter if {@code isParameter} is {@code true}
* @param {Boolean} [isParameter=false] pass {@code true} if {@code offset} * @param {Boolean} [isParameter=false] pass {@code true} if {@code offset}
* is a curve time parameter. * is a curve time parameter.
* @return {CurveLocation} the curve location at the specified the offset. * @return {CurveLocation} the curve location at the specified the offset.
*/ */
@ -908,7 +908,7 @@ statics: {
* @function * @function
* @param {Number} offset the offset on the curve, or the curve time * @param {Number} offset the offset on the curve, or the curve time
* parameter if {@code isParameter} is {@code true} * parameter if {@code isParameter} is {@code true}
* @param {Boolean} [isParameter=false] pass {@code true} if {@code offset} * @param {Boolean} [isParameter=false] pass {@code true} if {@code offset}
* is a curve time parameter. * is a curve time parameter.
* @return {Point} the point on the curve at the specified offset. * @return {Point} the point on the curve at the specified offset.
*/ */
@ -920,7 +920,7 @@ statics: {
* @function * @function
* @param {Number} offset the offset on the curve, or the curve time * @param {Number} offset the offset on the curve, or the curve time
* parameter if {@code isParameter} is {@code true} * parameter if {@code isParameter} is {@code true}
* @param {Boolean} [isParameter=false] pass {@code true} if {@code offset} * @param {Boolean} [isParameter=false] pass {@code true} if {@code offset}
* is a curve time parameter. * is a curve time parameter.
* @return {Point} the tangent of the curve at the specified offset. * @return {Point} the tangent of the curve at the specified offset.
*/ */
@ -932,7 +932,7 @@ statics: {
* @function * @function
* @param {Number} offset the offset on the curve, or the curve time * @param {Number} offset the offset on the curve, or the curve time
* parameter if {@code isParameter} is {@code true} * parameter if {@code isParameter} is {@code true}
* @param {Boolean} [isParameter=false] pass {@code true} if {@code offset} * @param {Boolean} [isParameter=false] pass {@code true} if {@code offset}
* is a curve time parameter. * is a curve time parameter.
* @return {Point} the normal of the curve at the specified offset. * @return {Point} the normal of the curve at the specified offset.
*/ */
@ -944,7 +944,7 @@ statics: {
* @function * @function
* @param {Number} offset the offset on the curve, or the curve time * @param {Number} offset the offset on the curve, or the curve time
* parameter if {@code isParameter} is {@code true} * parameter if {@code isParameter} is {@code true}
* @param {Boolean} [isParameter=false] pass {@code true} if {@code offset} * @param {Boolean} [isParameter=false] pass {@code true} if {@code offset}
* is a curve time parameter. * is a curve time parameter.
* @return {Point} the curvature of the curve at the specified offset. * @return {Point} the curvature of the curve at the specified offset.
*/ */