Browse Source

Using noun instead of verb for inverse matrix function.

Mainly to be consistent with Matrix::transposed() function name,
furthermore calling

    Matrix::inverse()

could look like the original matrix is being inversed, while calling

    Matrix::inversed()

implies that the function doesn't change the original matrix, but
returns the result instead.
pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
83150f003e
  1. 2
      src/Camera.cpp
  2. 2
      src/Math/Matrix.h
  3. 4
      src/Math/Matrix3.h
  4. 4
      src/Math/Matrix4.h
  5. 4
      src/Math/Test/MatrixTest.cpp
  6. 2
      src/Math/Test/MatrixTest.h

2
src/Camera.cpp

@ -71,7 +71,7 @@ void Camera::setViewport(const Math::Vector2<GLsizei>& size) {
void Camera::setClean() { void Camera::setClean() {
if(!isDirty()) return; if(!isDirty()) return;
_cameraMatrix = absoluteTransformation().inverse(); _cameraMatrix = absoluteTransformation().inversed();
Object::setClean(); Object::setClean();
} }

2
src/Math/Matrix.h

@ -197,7 +197,7 @@ template<class T, size_t size> class Matrix {
/** /**
* @brief Inverse matrix * @brief Inverse matrix
*/ */
Matrix<T, size> inverse() const { Matrix<T, size> inversed() const {
Matrix<T, size> out(false); Matrix<T, size> out(false);
T _determinant = determinant(); T _determinant = determinant();

4
src/Math/Matrix3.h

@ -64,8 +64,8 @@ template<class T> class Matrix3: public Matrix<T, 3> {
/** @copydoc Matrix::transposed() */ /** @copydoc Matrix::transposed() */
inline Matrix3<T> transposed() const { return Matrix<T, 3>::transposed(); } inline Matrix3<T> transposed() const { return Matrix<T, 3>::transposed(); }
/** @copydoc Matrix::inverse() */ /** @copydoc Matrix::inversed() */
inline Matrix3<T> inverse() const { return Matrix<T, 3>::inverse(); } inline Matrix3<T> inversed() const { return Matrix<T, 3>::inversed(); }
}; };
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

4
src/Math/Matrix4.h

@ -133,8 +133,8 @@ template<class T> class Matrix4: public Matrix<T, 4> {
/** @copydoc Matrix::ij() */ /** @copydoc Matrix::ij() */
inline Matrix3<T> ij(size_t skipRow, size_t skipCol) const { return Matrix<T, 4>::ij(skipRow, skipCol); } inline Matrix3<T> ij(size_t skipRow, size_t skipCol) const { return Matrix<T, 4>::ij(skipRow, skipCol); }
/** @copydoc Matrix::inverse() */ /** @copydoc Matrix::inversed() */
inline Matrix4<T> inverse() const { return Matrix<T, 4>::inverse(); } inline Matrix4<T> inversed() const { return Matrix<T, 4>::inversed(); }
}; };
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

4
src/Math/Test/MatrixTest.cpp

@ -222,7 +222,7 @@ void MatrixTest::determinant() {
QVERIFY(m.determinant() == -2); QVERIFY(m.determinant() == -2);
} }
void MatrixTest::inverse() { void MatrixTest::inversed() {
Matrix4 m( Matrix4 m(
3.0f, 5.0f, 8.0f, 4.0f, 3.0f, 5.0f, 8.0f, 4.0f,
4.0f, 4.0f, 7.0f, 3.0f, 4.0f, 4.0f, 7.0f, 3.0f,
@ -237,7 +237,7 @@ void MatrixTest::inverse() {
259/412.0f, -185/206.0f, 31/412.0f, 27/206.0f 259/412.0f, -185/206.0f, 31/412.0f, 27/206.0f
); );
Matrix4 _inverse = m.inverse(); Matrix4 _inverse = m.inversed();
QVERIFY(_inverse == inverse); QVERIFY(_inverse == inverse);
QVERIFY(_inverse*m == Matrix4()); QVERIFY(_inverse*m == Matrix4());

2
src/Math/Test/MatrixTest.h

@ -34,7 +34,7 @@ class MatrixTest: public QObject {
void transposed(); void transposed();
void ij(); void ij();
void determinant(); void determinant();
void inverse(); void inversed();
void debug(); void debug();
}; };

Loading…
Cancel
Save