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

Change and optimise the way SegmentPoints are created, so that selected state is actually copied over properly (Part one of fixing selection cloning).

Browse source
This commit is contained in:
Jürg Lehni 2011-05-26 10:58:16 +01:00
parent 7026ea24aa
commit 2d218dbb19
2 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/path/Segment.js
View file

@ -50,38 +50,38 @@ var Segment = this.Segment = Base.extend({
* that are visible when the path is selected).
*/
initialize: function(arg0, arg1, arg2, arg3, arg4, arg5) {
var createSegmentPoint = SegmentPoint.create;
var createPoint = SegmentPoint.create,
point, handleIn, handleOut;
if (arguments.length == 0) {
this._point = createSegmentPoint(this, 0, 0);
// Nothing
} else if (arguments.length == 1) {
// TODO: If beans are not activated, this won't copy from n existing
// segment. OK?
// TODO: If beans are not activated, this won't copy from existing
// segments. OK?
if (arg0.point) {
this._point = createSegmentPoint(this, arg0.point);
this._handleIn = createSegmentPoint(this, arg0.handleIn);
this._handleOut = createSegmentPoint(this, arg0.handleOut);
point = arg0.point;
handleIn = arg0.handleIn;
handleOut = arg0.handleOut;
} else {
this._point = createSegmentPoint(this, arg0);
point = arg0;
}
} else if (arguments.length < 6) {
if (arguments.length == 2 && !arg1.x) {
this._point = createSegmentPoint(this, arg0, arg1);
point = [ arg0, arg1 ];
} else {
this._point = createSegmentPoint(this, arg0);
// Doesn't matter if these arguments exist, it creates 0, 0
// points otherwise
this._handleIn = createSegmentPoint(this, arg1);
this._handleOut = createSegmentPoint(this, arg2);
point = arg0;
// Doesn't matter if these arguments exist, SegmentPointcreate
// produces creates points with (0, 0) otherwise
handleIn = arg1;
handleOut = arg2;
}
} else if (arguments.length == 6) {
this._point = createSegmentPoint(this, arg0, arg1);
this._handleIn = createSegmentPoint(this, arg2, arg3);
this._handleOut = createSegmentPoint(this, arg4, arg5);
point = [ arg0, arg1 ];
handleIn = [ arg2, arg3 ];
handleOut = [ arg4, arg5 ];
}
if (!this._handleIn)
this._handleIn = createSegmentPoint(this, 0, 0);
if (!this._handleOut)
this._handleOut = createSegmentPoint(this, 0, 0);
createPoint(this, '_point', point);
createPoint(this, '_handleIn', handleIn);
createPoint(this, '_handleOut', handleOut);
},
_changed: function(point) {

17
src/path/SegmentPoint.js
View file

@ -57,18 +57,25 @@ var SegmentPoint = Point.extend({
},
statics: {
create: function(segment, x, y, selected) {
if (y === undefined) {
// Use the normal point constructor to read in point values
var pt = x instanceof Point ? x : new Point(x);
create: function(segment, key, pt) {
var point = new SegmentPoint(SegmentPoint.dont),
x, y, selected;
if (!pt) {
x = y = 0;
} else if (pt.x !== undefined) {
x = pt.x;
y = pt.y;
selected = pt.selected;
} else {
x = pt[0];
y = pt[1];
}
var point = new SegmentPoint(SegmentPoint.dont);
point._x = x;
point._y = y;
point._owner = segment;
// We need to set the point on the segment before copying over the
// selected state, as otherwise this won't actually select it.
segment[key] = point;
if (selected)
point.setSelected(true);
return point;