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

We need to process _bounds and _position outside of _transform() handling, since items without _transform() can still have cached values, e.g. Group.

Browse source
This commit is contained in:
Jürg Lehni 2011-06-20 19:33:34 +01:00
parent 22736dc72d
commit 5e524a478e
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/item/Item.js
View file

@ -1448,32 +1448,28 @@ var Item = this.Item = Base.extend({
// TODO: Handle flags, add TransformFlag class and convert to bit mask // TODO: Handle flags, add TransformFlag class and convert to bit mask
// for quicker checking. // for quicker checking.
// TODO: Call transform on chidren only if 'children' flag is provided. // TODO: Call transform on chidren only if 'children' flag is provided.
// Calling _changed will clear _bounds and _position, but depending
// on matrix we can calculate and set them again.
var bounds = this._bounds,
position = this._position;
if (this._transform) { if (this._transform) {
// Detect matrices that contain only translations and scaling
// and transform the cached _bounds and _position without having to
// fully recalculate each time.
var bounds = this._bounds,
position = this._position;
this._transform(matrix, flags); this._transform(matrix, flags);
// Calling _changed will clear _bounds and _position, but depending
// on matrix we can calculate and set them again.
this._changed(Change.GEOMETRY); this._changed(Change.GEOMETRY);
if (bounds && matrix.getRotation() === 0) {
this._bounds = this._createBounds(
matrix._transformBounds(bounds));
this._position = this._bounds.getCenter();
} else if (position) {
// Transform position as well. Do not modify _position directly,
// since it's a LinkedPoint and would cause recursion!
this._position = matrix._transformPoint(position, position, true);
}
} }
if (this._children) { // Detect matrices that contain only translations and scaling
for (var i = 0, l = this._children.length; i < l; i++) { // and transform the cached _bounds and _position without having to
var child = this._children[i]; // fully recalculate each time.
child.transform(matrix, flags); if (bounds && matrix.getRotation() === 0) {
} this._bounds = this._createBounds(
matrix._transformBounds(bounds));
this._position = this._bounds.getCenter();
} else if (position) {
// Transform position as well. Do not notify _position of
// changes, since it's a LinkedPoint and would cause recursion!
this._position = matrix._transformPoint(position, position, true);
} }
for (var i = 0, l = this._children && this._children.length; i < l; i++)
this._children[i].transform(matrix, flags);
// PORT: Return 'this' in all chainable commands // PORT: Return 'this' in all chainable commands
return this; return this;
}, },