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

Implement registration point for all items.

Browse source 
Allowing any item to use another point than the center as its anchor point for item.position.
This commit is contained in:
Jürg Lehni 2013-12-07 19:46:12 +01:00
parent 7800e5f84e
commit acc0e80d78
1 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/item/Item.js
View file

@ -52,6 +52,7 @@ var Item = Base.extend(Callback, /** @lends Item# */{
_serializeFields: {
name: null,
matrix: new Matrix(),
registration: null,
locked: false,
visible: true,
blendMode: 'normal',
@ -758,14 +759,21 @@ var Item = Base.extend(Callback, /** @lends Item# */{
getPosition: function(/* dontLink */) {
// Cache position value.
// Pass true for dontLink in getCenter(), so receive back a normal point
var pos = this._position
|| (this._position = this.getBounds().getCenter(true));
var position = this._position;
if (!position) {
// If a registration point is provided, use it to determine position
// base don the matrix. Otherwise use the center of the bounds.
var registration = this._registration;
position = this._position = registration
? this._matrix._transformPoint(registration)
: this.getBounds().getCenter(true);
}
// Do not cache LinkedPoints directly, since we would not be able to
// use them to calculate the difference in #setPosition, as when it is
// modified, it would hold new values already and only then cause the
// calling of #setPosition.
return new (arguments[0] ? Point : LinkedPoint)
(pos.x, pos.y, this, 'setPosition');
return new (arguments[0] ? Point : LinkedPoint)(
position.x, position.y, this, 'setPosition');
},
setPosition: function(/* point */) {
@ -773,6 +781,22 @@ var Item = Base.extend(Callback, /** @lends Item# */{
// translate the item. Pass true for dontLink, as we do not need a
// LinkedPoint to simply calculate this distance.
this.translate(Point.read(arguments).subtract(this.getPosition(true)));
},
_registration: null,
getRegistration: function(/* dontLink */) {
var registration = this._registration;
return registration
? new (arguments[0] ? Point : LinkedPoint)(
registration.x, registration.y, this, 'setRegistration')
: null;
},
setRegistration: function(/* point */) {
this._registration = Point.read(arguments);
// No need for _changed() since the only thing this affects is _position
delete this._position;
}
}, Base.each(['getBounds', 'getStrokeBounds', 'getHandleBounds', 'getRoughBounds'],
function(name) {
@ -2643,6 +2667,7 @@ var Item = Base.extend(Callback, /** @lends Item# */{
_applyMatrix: function(matrix, applyMatrix) {
var children = this._children;
if (children && children.length > 0) {
for (var i = 0, l = children.length; i < l; i++)
children[i].transform(matrix, applyMatrix);
@ -2660,12 +2685,15 @@ var Item = Base.extend(Callback, /** @lends Item# */{
var matrix = this._matrix;
if (this._applyMatrix(matrix, true)) {
// When the matrix could be applied, we also need to transform
// color styles with matrices (only gradients so far):
var style = this._style,
// color styles (only gradients so far) and registration point:
var registration = this._registration,
style = this._style,
// pass true for dontMerge so we don't recursively transform
// styles on groups' children.
fillColor = style.getFillColor(true),
strokeColor = style.getStrokeColor(true);
if (registration)
registration.transform(matrix);
if (fillColor)
fillColor.transform(matrix);
if (strokeColor)