scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-03-14 00:39:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Take view#matrix into account when calculating and handling global matrices.

Browse source 
But make sure Item#globalMatrix returns a transformation without View#matrix factored in. Closes .
This commit is contained in:
Jürg Lehni 2014-03-31 19:28:00 +02:00
parent 17fb1fb862
commit 0dca10d192
2 changed files with 20 additions and 12 deletions
src
item
Item.js
project
Project.js

24
src/item/Item.js
View file

@ -1142,24 +1142,33 @@ var Item = Base.extend(Callback, /** @lends Item# */{
/**
* The item's global transformation matrix in relation to the global project
* coordinate space.
* coordinate space. Note that the view's transformations resulting from
* zooming and panning are not factored in.
*
* @type Matrix
* @bean
*/
getGlobalMatrix: function() {
var matrix = this._globalMatrix,
updateVersion = this._project._updateVersion;
// If _globalMatrix is out of sync, recalculate it now
updateVersion = this._project._updateVersion,
viewMatrix = this.getView()._matrix;
// Internally we actually do factor in the view's transformations as
// well, but these are removed again in the return statement below.
// This way it is easier to draw selections and handle non-direct
// blitting, see Item#draw().
// If #_globalMatrix is out of sync, recalculate it now.
if (matrix && matrix._updateVersion !== updateVersion)
matrix = null;
if (!matrix) {
matrix = this._globalMatrix = this._matrix.clone();
if (this._parent)
matrix.preConcatenate(this._parent.getGlobalMatrix());
matrix.preConcatenate(this._parent
? this._parent.getGlobalMatrix(true)
: viewMatrix);
matrix._updateVersion = updateVersion;
}
return matrix;
// TODO: Fix Straps.js so we can pass this on as _internal argument and
// still have a bean created.
return arguments[0] ? matrix : viewMatrix.inverted().concatenate(matrix);
},
/**
@ -3509,8 +3518,7 @@ var Item = Base.extend(Callback, /** @lends Item# */{
// Keep calculating the current global matrix, by keeping a history
// and pushing / popping as we go along.
var trackTransforms = param.trackTransforms,
// If transforms does not exist, set it up with the identity matrix
transforms = param.transforms = param.transforms || [new Matrix()],
transforms = param.transforms,
matrix = this._matrix,
parentMatrix = transforms[transforms.length - 1],
globalMatrix = parentMatrix.clone().concatenate(matrix);

8
src/project/Project.js
View file

@ -430,7 +430,8 @@ var Project = PaperScopeItem.extend(/** @lends Project# */{
// in param.transforms, and that we want it to set _globalMatrix
// as used below. Item#rasterize() and Raster#getAverageColor() do
// not need to set this.
trackTransforms: true
trackTransforms: true,
transforms: [matrix]
});
for (var i = 0, l = this.layers.length; i < l; i++)
this.layers[i].draw(ctx, param);
@ -454,11 +455,10 @@ var Project = PaperScopeItem.extend(/** @lends Project# */{
|| item.getLayer().getSelectedColor();
ctx.strokeStyle = ctx.fillStyle = color
? color.toCanvasStyle(ctx) : '#009dec';
var mx = matrix.clone().concatenate(globalMatrix);
if (item._drawSelected)
item._drawSelected(ctx, mx);
item._drawSelected(ctx, globalMatrix);
if (item._boundsSelected) {
var coords = mx._transformCorners(
var coords = globalMatrix._transformCorners(
item.getInternalBounds());
// Now draw a rectangle that connects the transformed
// bounds corners, and draw the corners.