diff --git a/src/Camera.cpp b/src/Camera.cpp index 0c9aa0dc1..00f04b0bb 100644 --- a/src/Camera.cpp +++ b/src/Camera.cpp @@ -71,7 +71,7 @@ void Camera::setViewport(const Math::Vector2& size) { void Camera::setClean() { if(!isDirty()) return; - _cameraMatrix = absoluteTransformation().inverse(); + _cameraMatrix = absoluteTransformation().inversed(); Object::setClean(); } diff --git a/src/Math/Matrix.h b/src/Math/Matrix.h index b0e2063ee..d762287c3 100644 --- a/src/Math/Matrix.h +++ b/src/Math/Matrix.h @@ -197,7 +197,7 @@ template class Matrix { /** * @brief Inverse matrix */ - Matrix inverse() const { + Matrix inversed() const { Matrix out(false); T _determinant = determinant(); diff --git a/src/Math/Matrix3.h b/src/Math/Matrix3.h index 879d87b85..65808314b 100644 --- a/src/Math/Matrix3.h +++ b/src/Math/Matrix3.h @@ -64,8 +64,8 @@ template class Matrix3: public Matrix { /** @copydoc Matrix::transposed() */ inline Matrix3 transposed() const { return Matrix::transposed(); } - /** @copydoc Matrix::inverse() */ - inline Matrix3 inverse() const { return Matrix::inverse(); } + /** @copydoc Matrix::inversed() */ + inline Matrix3 inversed() const { return Matrix::inversed(); } }; #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index 920b24d82..1c6c8e7af 100644 --- a/src/Math/Matrix4.h +++ b/src/Math/Matrix4.h @@ -133,8 +133,8 @@ template class Matrix4: public Matrix { /** @copydoc Matrix::ij() */ inline Matrix3 ij(size_t skipRow, size_t skipCol) const { return Matrix::ij(skipRow, skipCol); } - /** @copydoc Matrix::inverse() */ - inline Matrix4 inverse() const { return Matrix::inverse(); } + /** @copydoc Matrix::inversed() */ + inline Matrix4 inversed() const { return Matrix::inversed(); } }; #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp index 06ec1be4b..928fc058a 100644 --- a/src/Math/Test/MatrixTest.cpp +++ b/src/Math/Test/MatrixTest.cpp @@ -222,7 +222,7 @@ void MatrixTest::determinant() { QVERIFY(m.determinant() == -2); } -void MatrixTest::inverse() { +void MatrixTest::inversed() { Matrix4 m( 3.0f, 5.0f, 8.0f, 4.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 ); - Matrix4 _inverse = m.inverse(); + Matrix4 _inverse = m.inversed(); QVERIFY(_inverse == inverse); QVERIFY(_inverse*m == Matrix4()); diff --git a/src/Math/Test/MatrixTest.h b/src/Math/Test/MatrixTest.h index 899681d0d..ab51838e9 100644 --- a/src/Math/Test/MatrixTest.h +++ b/src/Math/Test/MatrixTest.h @@ -34,7 +34,7 @@ class MatrixTest: public QObject { void transposed(); void ij(); void determinant(); - void inverse(); + void inversed(); void debug(); };