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

Change the way the optional matrix argument is handled in bounds getters.

Browse source 
Before it was treated as the paren't matrix and the child's was concatenated to it, but it's more logical and useful to just use it as the full replacement matrix instead.
This commit is contained in:
Jürg Lehni 2014-10-20 16:50:33 +02:00
parent 62e5f3b3ac
commit ad50e9f604
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/item/Item.js
View file

@ -902,7 +902,8 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
for (var i = 0, l = children.length; i < l; i++) {
var child = children[i];
if (child._visible && !child.isEmpty()) {
var rect = child._getCachedBounds(getter, matrix, cacheItem);
var rect = child._getCachedBounds(getter,
matrix && matrix.chain(child._matrix), cacheItem);
x1 = Math.min(rect.x, x1);
y1 = Math.min(rect.y, y1);
x2 = Math.max(rect.x + rect.width, x2);
@ -975,21 +976,13 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
}
if (cache && this._bounds && this._bounds[cache])
return this._bounds[cache].clone();
// If the result of concatenating the passed matrix with our internal
// one is an identity transformation, set it to null for faster
// processing
matrix = !matrix
? _matrix
: _matrix
? matrix.chain(_matrix)
: matrix;
// If we're caching bounds on this item, pass it on as cacheItem, so the
// children can setup the _boundsCache structures for it.
// getInternalBounds is getBounds untransformed. Do not replace earlier,
// so we can cache both separately, since they're not in the same
// transformation space!
var bounds = this._getBounds(internalGetter || getter, matrix,
cacheItem);
var bounds = this._getBounds(internalGetter || getter,
matrix || _matrix, cacheItem);
// If we can cache the result, update the _bounds cache structure
// before returning
if (cache) {
@ -3649,10 +3642,9 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
// Keep calculating the current global matrix, by keeping a history
// and pushing / popping as we go along.
var matrices = param.matrices,
parentMatrix = matrices[matrices.length - 1],
viewMatrix = param.viewMatrix,
matrix = this._matrix,
globalMatrix = parentMatrix.chain(matrix);
globalMatrix = matrices[matrices.length - 1].chain(matrix);
// If this item is not invertible, do not draw it, since it would cause
// empty ctx.currentPath and mess up caching. It appears to also be a
// good idea generally to not draw in such circumstances, e.g. SVG
@ -3701,7 +3693,7 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
if (!direct) {
// Apply the parent's global matrix to the calculation of correct
// bounds.
var bounds = this.getStrokeBounds(getViewMatrix(parentMatrix));
var bounds = this.getStrokeBounds(getViewMatrix(globalMatrix));
if (!bounds.width || !bounds.height)
return;
// Store previous offset and save the main context, so we can

5
src/item/PlacedSymbol.js
View file

@ -110,9 +110,10 @@ var PlacedSymbol = Item.extend(/** @lends PlacedSymbol# */{
},
_getBounds: function(getter, matrix, cacheItem) {
var definition = this.symbol._definition;
// Redirect the call to the symbol definition to calculate the bounds
return this.symbol._definition._getCachedBounds(getter, matrix,
cacheItem);
return definition._getCachedBounds(getter,
matrix && matrix.chain(definition._matrix), cacheItem);
},
_hitTestSelf: function(point, options) {