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 CurveLocation related functions to *At(offset), and add optional isParameter argument that defines whether offset is a length or a description of curve index / curve parameter.

Browse source
This commit is contained in:
Jürg Lehni 2011-04-27 21:40:52 +01:00
parent ea6cf24aae
commit 6a483fa8be
3 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/Animated/Extruded.html
View file

@ -61,8 +61,8 @@
var path = lineGroup.children[i],
l1 = (length1 / lineCount * (i + count / 10)) % length1,
l2 = (length2 / lineCount * (i + count / 10)) % length2;
path.segments[0].point = path1.getLocation(l1).point,
path.segments[1].point = path2.getLocation(l2).point;
path.segments[0].point = path1.getPointAt(l1),
path.segments[1].point = path2.getPointAt(l2);
}
count++;
}

2
examples/Animated/Flock.html
View file

@ -251,7 +251,7 @@
count++;
for(var i = 0, l = boids.length; i < l; i++) {
if (groupTogether) {
var point = heartPath.getLocation(((i + count / 30) % l) / l * pathLength).point;
var point = heartPath.getPointAt(((i + count / 30) % l) / l * pathLength);
boids[i].arrive(point);
}
boids[i].run(boids);

64
src/path/Path.js
View file

@ -210,30 +210,6 @@ var Path = this.Path = PathItem.extend({
return false;
},
// TODO: getLocation(point, precision)
getLocation: function(offset) {
var curves = this.getCurves(),
currentLength = 0;
for (var i = 0, l = curves.length; i < l; i++) {
var startLength = currentLength,
curve = curves[i];
currentLength += curve.getLength();
if (currentLength >= length) {
// found the segment within which the length lies
var t = curve.getParameter(length - startLength);
return new CurveLocation(curve, t);
}
}
// TODO: is this the case for paper.js too?
// it may be that through impreciseness of getLength, that the end
// of the curves was missed:
if (length <= this.getLength()) {
var curve = curves[curves.length - 1];
return new CurveLocation(curve, 1);
}
return null;
},
getLength: function() {
var curves = this.getCurves();
var length = 0;
@ -255,11 +231,39 @@ var Path = this.Path = PathItem.extend({
return null;
},
// TODO: getLocationAt(point, precision)
// TODO: Port back renaming and new isParameter argument to Scriptographer
getLocationAt: function(offset, isParameter) {
var curves = this.getCurves(),
length = 0;
if (isParameter) {
// offset consists of curve index and curve parameter, before and
// after the fractional digit.
var index = ~~offset; // = Math.floor()
return new CurveLocation(curves[index], offset - index);
}
for (var i = 0, l = curves.length; i < l; i++) {
var start = length,
curve = curves[i];
length += curve.getLength();
if (length >= offset) {
// Found the segment within which the length lies
return new CurveLocation(curve,
curve.getParameter(offset - start));
}
}
// It may be that through impreciseness of getLength, that the end
// of the curves was missed:
if (offset <= this.getLength())
return new CurveLocation(curves[curves.length - 1], 1);
return null;
},
/**
* Returns the point of the path at the given offset.
*/
getPoint: function(offset) {
var loc = this.getLocation(offset);
getPointAt: function(offset, isParameter) {
var loc = this.getLocationAt(offset, isParameter);
return loc && loc.getPoint();
},
@ -267,16 +271,16 @@ var Path = this.Path = PathItem.extend({
* Returns the tangent to the path at the given offset as a vector
* point.
*/
getTangent: function(offset) {
var loc = this.getLocation(offset);
getTangentAt: function(offset, isParameter) {
var loc = this.getLocationAt(offset, isParameter);
return loc && loc.getTangent();
},
/**
* Returns the normal to the path at the given offset as a vector point.
*/
getNormal: function(offset) {
var loc = this.getLocation(offset);
getNormalAt: function(offset, isParameter) {
var loc = this.getLocationAt(offset, isParameter);
return loc && loc.getNormal();
}
}, new function() { // Scope for drawing