Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-18 21:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed nestTransformMatrices to mutilplyTransformMatrices

Browse source
This commit is contained in:
Tim Andres 2013-04-17 13:54:11 -04:00
parent bd058e6a94
commit 3950298c75
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/parser.js
View file

@ -11,7 +11,7 @@
extend = fabric.util.object.extend,
capitalize = fabric.util.string.capitalize,
clone = fabric.util.object.clone,
nestTransformMatrices = fabric.util.nestTransformMatrices;
multiplyTransformMatrices = fabric.util.multiplyTransformMatrices;
var attributesMap = {
'cx': 'left',
@ -76,7 +76,7 @@
}
if (attr === 'transform') {
if (parentAttributes.transformMatrix) {
value = nestTransformMatrices(parentAttributes.transformMatrix, fabric.parseTransformAttribute(value));
value = multiplyTransformMatrices(parentAttributes.transformMatrix, fabric.parseTransformAttribute(value));
}
else {
value = fabric.parseTransformAttribute(value);

6
src/util/misc.js
View file

@ -400,12 +400,12 @@
* Multiply matrix A by matrix B to nest transformations
* @static
* @memberOf fabric.util
* @method nestTransformMatrices
* @method multiplyTransformMatrices
* @param {Array} matrixA First transformMatrix
* @param {Array} matrixB Second transformMatrix
* @return {Array} The product of the two transform matrices
*/
function nestTransformMatrices(matrixA, matrixB) {
function multiplyTransformMatrices(matrixA, matrixB) {
// Matrix multiply matrixA * matrixB
var a = [
[matrixA[0], matrixA[2], matrixA[4]],
@ -459,6 +459,6 @@
fabric.util.createCanvasElement = createCanvasElement;
fabric.util.createAccessors = createAccessors;
fabric.util.clipContext = clipContext;
fabric.util.nestTransformMatrices = nestTransformMatrices;
fabric.util.multiplyTransformMatrices = multiplyTransformMatrices;
})();