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

Define getCurrentSegment() as private and make sure it's not used as a bean.

Browse source
This commit is contained in:
Jürg Lehni 2011-03-06 15:17:06 +00:00
parent 162dab66a7
commit dfb11610e7
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/path/Path.js
View file

@ -559,7 +559,7 @@ var Path = this.Path = PathItem.extend({
* Helper method that returns the current segment and checks if we need to * Helper method that returns the current segment and checks if we need to
* execute a moveTo() command first. * execute a moveTo() command first.
*/ */
getCurrentSegment: function() { _getCurrentSegment: function() {
if (this._segments.length == 0) if (this._segments.length == 0)
throw('Use a moveTo() command first'); throw('Use a moveTo() command first');
return this._segments[this._segments.length - 1]; return this._segments[this._segments.length - 1];
@ -583,7 +583,7 @@ var Path = this.Path = PathItem.extend({
*/ */
cubicCurveTo: function(handle1, handle2, to) { cubicCurveTo: function(handle1, handle2, to) {
// First modify the current segment: // First modify the current segment:
var current = this.currentSegment; var current = this._getCurrentSegment();
// Convert to relative values: // Convert to relative values:
current.setHandleOut(new Point( current.setHandleOut(new Point(
handle1.x - current._point.x, handle1.x - current._point.x,
@ -604,7 +604,7 @@ var Path = this.Path = PathItem.extend({
// and the cubic is A B C D, // and the cubic is A B C D,
// B = E + 1/3 (A - E) // B = E + 1/3 (A - E)
// C = E + 1/3 (D - E) // C = E + 1/3 (D - E)
var current = this.currentSegment, var current = this._getCurrentSegment(),
x1 = current._point.x, x1 = current._point.x,
y1 = current._point.y; y1 = current._point.y;
this.cubicCurveTo( this.cubicCurveTo(
@ -619,7 +619,7 @@ var Path = this.Path = PathItem.extend({
to = new Point(to); to = new Point(to);
if (parameter == null) if (parameter == null)
parameter = 0.5; parameter = 0.5;
var current = this.currentSegment._point; var current = this._getCurrentSegment()._point;
// handle = (through - (1 - t)^2 * current - t^2 * to) / // handle = (through - (1 - t)^2 * current - t^2 * to) /
// (2 * (1 - t) * t) // (2 * (1 - t) * t)
var t1 = 1 - parameter; var t1 = 1 - parameter;
@ -637,7 +637,7 @@ var Path = this.Path = PathItem.extend({
arcTo: function(to, clockwise) { arcTo: function(to, clockwise) {
var through, to; var through, to;
// Get the start point: // Get the start point:
var current = this.currentSegment; var current = this._getCurrentSegment();
if (arguments[1] && typeof arguments[1] != 'boolean') { if (arguments[1] && typeof arguments[1] != 'boolean') {
through = Point.read(arguments, 0, 1); through = Point.read(arguments, 0, 1);
to = Point.read(arguments, 1, 1); to = Point.read(arguments, 1, 1);
@ -728,7 +728,7 @@ var Path = this.Path = PathItem.extend({
lineBy: function() { lineBy: function() {
var vector = Point.read(arguments); var vector = Point.read(arguments);
if (vector) { if (vector) {
var current = this.currentSegment; var current = this._getCurrentSegment();
this.lineTo(current._point.add(vector)); this.lineTo(current._point.add(vector));
} }
}, },
@ -736,7 +736,7 @@ var Path = this.Path = PathItem.extend({
curveBy: function(throughVector, toVector, parameter) { curveBy: function(throughVector, toVector, parameter) {
throughVector = Point.read(throughVector); throughVector = Point.read(throughVector);
toVector = Point.read(toVector); toVector = Point.read(toVector);
var current = this.currentSegment._point; var current = this._getCurrentSegment()._point;
this.curveTo(current.add(throughVector), current.add(toVector), this.curveTo(current.add(throughVector), current.add(toVector),
parameter); parameter);
}, },
@ -744,7 +744,7 @@ var Path = this.Path = PathItem.extend({
arcBy: function(throughVector, toVector) { arcBy: function(throughVector, toVector) {
throughVector = Point.read(throughVector); throughVector = Point.read(throughVector);
toVector = Point.read(toVector); toVector = Point.read(toVector);
var current = this.currentSegment._point; var current = this._getCurrentSegment()._point;
this.arcBy(current.add(throughVector), current.add(toVector)); this.arcBy(current.add(throughVector), current.add(toVector));
}, },

9
test/tests/Path.js
View file

@ -1,10 +1 @@
module('Path'); module('Path');
test('path.currentSegment', function() {
var doc = new Document();
var path = new Path();
path.moveTo([50, 50]);
path.lineTo([100, 100]);
compareSegments(path.segments[1], path.currentSegment);
});