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

Calculate _globalMatrix for all drawn items and use it for the drawing of selections.

Browse source
This commit is contained in:
Jürg Lehni 2013-04-09 18:52:47 -07:00
parent e9aad895ae
commit 90cc10cc4b
2 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/item/Item.js
View file

@ -2827,10 +2827,19 @@ var Item = this.Item = Base.extend(Callback, {
// on the temporary canvas. // on the temporary canvas.
if (parentCtx) if (parentCtx)
ctx.translate(-itemOffset.x, -itemOffset.y); ctx.translate(-itemOffset.x, -itemOffset.y);
// Keep calculating the current global matrix, by keeping a history
// and pushing / popping as we go along.
var transforms = param.transforms,
global = transforms[transforms.length - 1].clone().concatenate(
item._matrix);
param.transforms.push(item._globalMatrix = global);
item._matrix.applyToContext(ctx); item._matrix.applyToContext(ctx);
item.draw(ctx, param); item.draw(ctx, param);
if (!param.clipping) if (!param.clipping) {
param.transforms.pop();
ctx.restore(); ctx.restore();
}
// If a temporary canvas was created before, composite it onto the // If a temporary canvas was created before, composite it onto the
// parent canvas: // parent canvas:
if (parentCtx) { if (parentCtx) {

38
src/project/Project.js
View file

@ -291,39 +291,13 @@ var Project = this.Project = PaperScopeItem.extend(/** @lends Project# */{
*/ */
draw: function(ctx, matrix) { draw: function(ctx, matrix) {
// Create a local lookup table for hierarchically concatenated matrices
// by item id, to speed up drawing by eliminating repeated concatenation
// of parent's matrices through caching.
var matrices = {};
// Description of the paramters to getGlobalMatrix():
// mx is the container for the final concatenated matrix, passed to
// getGlobalMatrix() on the initial call.
// cached defines wether the result of the concatenation should be
// cached, only used for parents of items that this is called for.
function getGlobalMatrix(item, mx, cached) {
var cache = cached && matrices[item._id];
// Found a cached version? Return a clone of it.
if (cache)
return cache.clone();
// Get concatenated matrix from all the parents, using
// local caching (passing true for cached):
if (item._parent)
mx = getGlobalMatrix(item._parent, mx, true);
// No need to concatenate if it's the identity matrix
if (!item._matrix.isIdentity())
mx.concatenate(item._matrix);
// If the result needs to be cached, create a copy since matrix
// might be further modified through recursive calls
if (cached)
matrices[item._id] = mx.clone();
return mx;
}
this._drawCount++; this._drawCount++;
ctx.save(); ctx.save();
if (!matrix.isIdentity()) matrix.applyToContext(ctx);
matrix.applyToContext(ctx); var param = {
var param = { offset: new Point(0, 0) }; offset: new Point(0, 0),
transforms: [matrix]
};
for (var i = 0, l = this.layers.length; i < l; i++) for (var i = 0, l = this.layers.length; i < l; i++)
Item.draw(this.layers[i], ctx, param); Item.draw(this.layers[i], ctx, param);
ctx.restore(); ctx.restore();
@ -338,7 +312,7 @@ var Project = this.Project = PaperScopeItem.extend(/** @lends Project# */{
var item = this._selectedItems[id]; var item = this._selectedItems[id];
if (item._drawCount === this._drawCount if (item._drawCount === this._drawCount
&& (item.drawSelected || item._boundsSelected)) { && (item.drawSelected || item._boundsSelected)) {
var mx = getGlobalMatrix(item, matrix.clone()); var mx = item._globalMatrix;
if (item.drawSelected) if (item.drawSelected)
item.drawSelected(ctx, mx); item.drawSelected(ctx, mx);
if (item._boundsSelected) if (item._boundsSelected)