Merge pull request #3218 from jschaf/easeljs2

easeljs: fix decompose return type
This commit is contained in:
Masahiro Wakame
2014-11-26 19:47:57 +09:00
2 changed files with 9 additions and 2 deletions
+8 -1
View File
@@ -77,5 +77,12 @@ function matrixDecompose() {
var matrix = new createjs.Matrix2D();
var shape = new createjs.Shape();
var transform = matrix.decompose(shape);
var transform2 = matrix.decompose();
var transformData = matrix.decompose();
shape.x = transformData.x;
shape.y = transformData.y;
shape.scaleX = transformData.scaleX;
shape.scaleY = transformData.scaleY;
shape.skewX = transformData.skewX;
shape.skewY = transformData.skewY;
shape.rotation = transformData.rotation;
}
+1 -1
View File
@@ -383,7 +383,7 @@ declare module createjs {
appendTransform(x: number, y: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number, regX?: number, regY?: number): Matrix2D;
clone(): Matrix2D;
copy(matrix: Matrix2D): Matrix2D;
decompose(): Matrix2D;
decompose(): {x: number; y: number; scaleX: number; scaleY: number; rotation: number; skewX: number; skewY: number};
decompose(target: Object): Matrix2D;
identity(): Matrix2D;
initialize(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number): Matrix2D;