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

Remove Matrix#determinant and convert getter to private method that only returns determinant if matrix is reversible, simplifying the various places where _getDeterminant is in use.

Browse source
This commit is contained in:
Jürg Lehni 2011-09-22 21:19:41 +02:00
parent 3397931bb2
commit f8dac43107
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/basic/Matrix.js
View file

@ -422,13 +422,14 @@ var Matrix = this.Matrix = Base.extend(/** @lends Matrix# */{
},
/**
* The determinant of this transform.
*
* @type Number
* @bean
* Returns the determinant of this transform, but only if the matrix is
* reversible, null otherwise.
*/
getDeterminant: function() {
return this._a * this._d - this._b * this._c;
_getDeterminant: function() {
var det = this._a * this._d - this._b * this._c;
return isFinite(det) && Math.abs(det) > Numerical.EPSILON
&& isFinite(this._tx) && isFinite(this._ty)
? det : null;
},
getTranslation: function() {
@ -471,9 +472,7 @@ var Matrix = this.Matrix = Base.extend(/** @lends Matrix# */{
* @return {Boolean} Whether the transform is invertible
*/
isInvertible: function() {
var det = this.getDeterminant();
return isFinite(det) && det != 0 && isFinite(this._tx)
&& isFinite(this._ty);
return !!this._getDeterminant();
},
/**
@ -483,7 +482,7 @@ var Matrix = this.Matrix = Base.extend(/** @lends Matrix# */{
* @return {Boolean} Whether the matrix is singular
*/
isSingular: function() {
return !this.isInvertible();
return !this._getDeterminant();
},
/**
@ -495,18 +494,14 @@ var Matrix = this.Matrix = Base.extend(/** @lends Matrix# */{
* singular
*/
createInverse: function() {
var det = this.getDeterminant();
if (isFinite(det) && det != 0 && isFinite(this._tx)
&& isFinite(this._ty)) {
return Matrix.create(
var det = this._getDeterminant();
return det && Matrix.create(
this._d / det,
-this._c / det,
-this._b / det,
this._a / det,
(this._b * this._ty - this._d * this._tx) / det,
(this._c * this._tx - this._a * this._ty) / det);
}
return null;
},
createShiftless: function() {