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

Clean up smooth() code.

Browse source
This commit is contained in:
Jürg Lehni 2013-11-26 17:32:52 +01:00
parent 78e4f3e1b2
commit 8e44049f42
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/path/Path.js
View file

@ -2112,25 +2112,22 @@ var Path = PathItem.extend(/** @lends Path# */{
// well, so it is preferred. // well, so it is preferred.
var segments = this._segments, var segments = this._segments,
size = segments.length, size = segments.length,
closed = this._closed,
n = size, n = size,
// Add overlapping ends for averaging handles in closed paths // Add overlapping ends for averaging handles in closed paths
overlap; overlap = 0;
if (size <= 2) if (size <= 2)
return; return;
if (closed) {
if (this._closed) {
// Overlap up to 4 points since averaging beziers affect the 4 // Overlap up to 4 points since averaging beziers affect the 4
// neighboring points // neighboring points
overlap = Math.min(size, 4); overlap = Math.min(size, 4);
n += Math.min(size, overlap) * 2; n += Math.min(size, overlap) * 2;
} else {
overlap = 0;
} }
var knots = []; var knots = [];
for (var i = 0; i < size; i++) for (var i = 0; i < size; i++)
knots[i + overlap] = segments[i]._point; knots[i + overlap] = segments[i]._point;
if (this._closed) { if (closed) {
// If we're averaging, add the 4 last points again at the // If we're averaging, add the 4 last points again at the
// beginning, and the 4 first ones at the end. // beginning, and the 4 first ones at the end.
for (var i = 0; i < overlap; i++) { for (var i = 0; i < overlap; i++) {
@ -2160,7 +2157,7 @@ var Path = PathItem.extend(/** @lends Path# */{
// Get first control points Y-values // Get first control points Y-values
var y = getFirstControlPoints(rhs); var y = getFirstControlPoints(rhs);
if (this._closed) { if (closed) {
// Do the actual averaging simply by linearly fading between the // Do the actual averaging simply by linearly fading between the
// overlapping values. // overlapping values.
for (var i = 0, j = size; i < overlap; i++, j++) { for (var i = 0, j = size; i < overlap; i++, j++) {
@ -2186,17 +2183,16 @@ var Path = PathItem.extend(/** @lends Path# */{
if (i < n) { if (i < n) {
segment.setHandleOut( segment.setHandleOut(
new Point(x[i], y[i]).subtract(segment._point)); new Point(x[i], y[i]).subtract(segment._point));
if (i < n - 1) handleIn = i < n - 1
handleIn = new Point( ? new Point(
2 * knots[i + 1]._x - x[i + 1], 2 * knots[i + 1]._x - x[i + 1],
2 * knots[i + 1]._y - y[i + 1]); 2 * knots[i + 1]._y - y[i + 1])
else : new Point(
handleIn = new Point(
(knots[n]._x + x[n - 1]) / 2, (knots[n]._x + x[n - 1]) / 2,
(knots[n]._y + y[n - 1]) / 2); (knots[n]._y + y[n - 1]) / 2);
} }
} }
if (this._closed && handleIn) { if (closed && handleIn) {
var segment = this._segments[0]; var segment = this._segments[0];
segment.setHandleIn(handleIn.subtract(segment._point)); segment.setHandleIn(handleIn.subtract(segment._point));
} }