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 recursively parameter in Matrix#apply(), so matrices can be backed in recursively in children too.

Browse source
This commit is contained in:
Jürg Lehni 2014-12-28 18:29:04 +01:00
parent 80e64ad0a9
commit a307bc4d14
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/basic/Matrix.js
View file

@ -156,13 +156,16 @@ var Matrix = Base.extend(/** @lends Matrix# */{
}, },
/** /**
* Applies the matrix to the item that it belongs to, if possible. * Applies the matrix to the content of item that it belongs to, if
* possible, meaning it bakes it into the item's content or children.
* @param {Boolean} recursively controls whether to apply transformations
* recursively on children
* @return {Boolean} {@true if the matrix was applied} * @return {Boolean} {@true if the matrix was applied}
*/ */
apply: function() { apply: function(recursively) {
var owner = this._owner; var owner = this._owner;
if (owner) { if (owner) {
owner.transform(null, true); owner.transform(null, true, Base.pick(recursively, true));
// If the matrix was successfully applied, it will be reset now. // If the matrix was successfully applied, it will be reset now.
return this.isIdentity(); return this.isIdentity();
} }

18
src/item/Item.js
View file

@ -3020,16 +3020,19 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
// @param {String[]} flags Array of any of the following: 'objects', // @param {String[]} flags Array of any of the following: 'objects',
// 'children', 'fill-gradients', 'fill-patterns', 'stroke-patterns', // 'children', 'fill-gradients', 'fill-patterns', 'stroke-patterns',
// 'lines'. Default: ['objects', 'children'] // 'lines'. Default: ['objects', 'children']
transform: function(matrix, _applyMatrix) { transform: function(matrix, _applyMatrix, _applyRecursively) {
// If no matrix is provided, or the matrix is the identity, we might // If no matrix is provided, or the matrix is the identity, we might
// still have some work to do in case _applyMatrix is true // still have some work to do in case _applyMatrix is true
if (matrix && matrix.isIdentity()) if (matrix && matrix.isIdentity())
matrix = null; matrix = null;
var _matrix = this._matrix, var _matrix = this._matrix,
applyMatrix = (_applyMatrix || this._applyMatrix) applyMatrix = (_applyMatrix || this._applyMatrix)
// Don't apply _matrix if the result of concatenating with // Don't apply _matrix if the result of concatenating with
// matrix would be identity. // matrix would be identity.
&& (!_matrix.isIdentity() || matrix); && ((!_matrix.isIdentity() || matrix)
// Even if it's an identity matrix, we still need to
// recursively apply the matrix to children.
|| _applyMatrix && _applyRecursively && this._children);
// Bail out if there is nothing to do. // Bail out if there is nothing to do.
if (!matrix && !applyMatrix) if (!matrix && !applyMatrix)
return this; return this;
@ -3040,7 +3043,8 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
// internal _matrix transformations to the item's content. // internal _matrix transformations to the item's content.
// Application is not possible on Raster, PointText, PlacedSymbol, since // Application is not possible on Raster, PointText, PlacedSymbol, since
// the matrix is where the actual transformation state is stored. // the matrix is where the actual transformation state is stored.
if (applyMatrix = applyMatrix && this._transformContent(_matrix)) { if (applyMatrix = applyMatrix
&& this._transformContent(_matrix, _applyRecursively)) {
// When the _matrix could be applied, we also need to transform // When the _matrix could be applied, we also need to transform
// color styles (only gradients so far) and pivot point: // color styles (only gradients so far) and pivot point:
var pivot = this._pivot, var pivot = this._pivot,
@ -3096,11 +3100,11 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
return this; return this;
}, },
_transformContent: function(matrix) { _transformContent: function(matrix, applyRecursively) {
var children = this._children; var children = this._children;
if (children) { if (children) {
for (var i = 0, l = children.length; i < l; i++) for (var i = 0, l = children.length; i < l; i++)
children[i].transform(matrix, true); children[i].transform(matrix, true, applyRecursively);
return true; return true;
} }
}, },