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

Bring back caching of Item#rotation and #scaling

Browse source 
But only allow matrix decomposition based properties on items with #applyMatrix = false

Closes #1177, relates to #1004
This commit is contained in:
Jürg Lehni 2017-01-03 13:23:44 +01:00
parent ede9ef2623
commit aa75374406
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/item/Item.js
View file

@ -1055,12 +1055,19 @@ new function() { // Injection scope for various item event handlers
beans: true, beans: true,
_decompose: function() { _decompose: function() {
return this._decomposed || (this._decomposed = this._matrix.decompose()); // Only decompose if the item isn't directly baking transformations into
// its content.
return this._applyMatrix
? null
: this._decomposed || (this._decomposed = this._matrix.decompose());
}, },
/** /**
* The current rotation angle of the item, as described by its * The current rotation angle of the item, as described by its
* {@link #matrix}. * {@link #matrix}.
* Please note that this only works for items with {@link #applyMatrix} set
* to `false`, meaning they do not directly bake transformations into their
* content.
* *
* @bean * @bean
* @type Number * @type Number
@ -1073,13 +1080,21 @@ new function() { // Injection scope for various item event handlers
setRotation: function(rotation) { setRotation: function(rotation) {
var current = this.getRotation(); var current = this.getRotation();
if (current != null && rotation != null) { if (current != null && rotation != null) {
// Preserve the cached _decomposed values over rotation, and only
// update the rotation property on it.
var decomposed = this._decomposed;
this.rotate(rotation - current); this.rotate(rotation - current);
decomposed.rotation = rotation;
this._decomposed = decomposed;
} }
}, },
/** /**
* The current scale factor of the item, as described by its * The current scale factor of the item, as described by its
* {@link #matrix}. * {@link #matrix}.
* Please note that this only works for items with {@link #applyMatrix} set
* to `false`, meaning they do not directly bake transformations into their
* content.
* *
* @bean * @bean
* @type Point * @type Point
@ -1096,8 +1111,12 @@ new function() { // Injection scope for various item event handlers
var current = this.getScaling(), var current = this.getScaling(),
// Clone existing points since we're caching internally. // Clone existing points since we're caching internally.
scaling = Point.read(arguments, 0, { clone: true, readNull: true }); scaling = Point.read(arguments, 0, { clone: true, readNull: true });
if (current && scaling) { if (current && scaling && !current.equals(scaling)) {
// See #setRotation() for preservation of _decomposed.
var decomposed = this._decomposed;
this.scale(scaling.x / current.x, scaling.y / current.y); this.scale(scaling.x / current.x, scaling.y / current.y);
decomposed.scaling = scaling;
this._decomposed = decomposed;
} }
}, },