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

Improve Matrix constructor to read from arrays too.

Browse source
This commit is contained in:
Jürg Lehni 2011-02-15 23:15:28 +00:00
parent 9d1458e6ae
commit 99bde74a10
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/basic/Matrix.js
View file

@ -35,18 +35,26 @@ var Matrix = Base.extend({
* @constructor * @constructor
*/ */
initialize: function(m00, m10, m01, m11, m02, m12) { initialize: function(m00, m10, m01, m11, m02, m12) {
var ok = true;
if (arguments.length == 6) { if (arguments.length == 6) {
this.set(m00, m10, m01, m11, m02, m12); this.set(m00, m10, m01, m11, m02, m12);
} else if (arguments == 1) { } else if (arguments == 1) {
var mx = arguments[0]; var mx = arguments[0];
// TODO: Check for array! if (mx instanceof Matrix) {
this.set(mx._m00, mx._m10, mx._m01, mx._m11, mx._m02, mx._m12); this.set(mx._m00, mx._m10, mx._m01, mx._m11, mx._m02, mx._m12);
} else if (Array.isArray(mx)) {
this.set.apply(this, mx);
} else {
ok = false;
}
} else if (arguments.length) { } else if (arguments.length) {
throw Error('Insufficient matrix parameters'); ok = false;
} else { } else {
this._m00 = this._m11 = 1; this._m00 = this._m11 = 1;
this._m10 = this._m01 = this._m02 = this._m12 = 0; this._m10 = this._m01 = this._m02 = this._m12 = 0;
} }
if (!ok)
throw Error('Unsupported matrix parameters');
}, },
/** /**