From ccf61c0f7f372f4af3b500b2f2a20ce3e9ffea99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 22 Apr 2012 14:58:20 +0200 Subject: [PATCH] Fixed typo in method name. --- src/Camera.cpp | 2 +- src/Math/Matrix.h | 4 ++-- src/Math/Matrix3.h | 4 ++-- src/Math/Matrix4.h | 4 ++-- src/Math/Test/MatrixTest.cpp | 4 ++-- src/Math/Test/MatrixTest.h | 2 +- src/Test/LightTest.cpp | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Camera.cpp b/src/Camera.cpp index 486e29fe6..186556296 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().inversed(); + _cameraMatrix = absoluteTransformation().inverted(); Object::setClean(); } diff --git a/src/Math/Matrix.h b/src/Math/Matrix.h index d41c819ab..3e363c50a 100644 --- a/src/Math/Matrix.h +++ b/src/Math/Matrix.h @@ -216,9 +216,9 @@ template class Matrix { inline T determinant() const { return Implementation::MatrixDeterminant()(*this); } /** - * @brief Inverse matrix + * @brief Inverted matrix */ - Matrix inversed() const { + Matrix inverted() const { Matrix out(Zero); T _determinant = determinant(); diff --git a/src/Math/Matrix3.h b/src/Math/Matrix3.h index 874c40e89..e47b501ad 100644 --- a/src/Math/Matrix3.h +++ b/src/Math/Matrix3.h @@ -94,8 +94,8 @@ template class Matrix3: public Matrix { /** @copydoc Matrix::transposed() */ inline Matrix3 transposed() const { return Matrix::transposed(); } - /** @copydoc Matrix::inversed() */ - inline Matrix3 inversed() const { return Matrix::inversed(); } + /** @copydoc Matrix::inverted() */ + inline Matrix3 inverted() const { return Matrix::inverted(); } }; #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index 3ed0f3c55..08cde955b 100644 --- a/src/Math/Matrix4.h +++ b/src/Math/Matrix4.h @@ -166,8 +166,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::inversed() */ - inline Matrix4 inversed() const { return Matrix::inversed(); } + /** @copydoc Matrix::inverted() */ + inline Matrix4 inverted() const { return Matrix::inverted(); } /** @brief Rotation part of the matrix */ inline Matrix3 rotation() const { diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp index d1e3a7ea9..76ab3edcd 100644 --- a/src/Math/Test/MatrixTest.cpp +++ b/src/Math/Test/MatrixTest.cpp @@ -246,7 +246,7 @@ void MatrixTest::determinant() { QVERIFY(m.determinant() == -2); } -void MatrixTest::inversed() { +void MatrixTest::inverted() { Matrix4 m( 3.0f, 5.0f, 8.0f, 4.0f, 4.0f, 4.0f, 7.0f, 3.0f, @@ -261,7 +261,7 @@ void MatrixTest::inversed() { 259/412.0f, -185/206.0f, 31/412.0f, 27/206.0f ); - Matrix4 _inverse = m.inversed(); + Matrix4 _inverse = m.inverted(); QVERIFY(_inverse == inverse); QVERIFY(_inverse*m == Matrix4()); diff --git a/src/Math/Test/MatrixTest.h b/src/Math/Test/MatrixTest.h index 4fd5b4f76..325df2e94 100644 --- a/src/Math/Test/MatrixTest.h +++ b/src/Math/Test/MatrixTest.h @@ -35,7 +35,7 @@ class MatrixTest: public QObject { void transposed(); void ij(); void determinant(); - void inversed(); + void inverted(); void debug(); }; diff --git a/src/Test/LightTest.cpp b/src/Test/LightTest.cpp index 6c506908e..ac7dc3a1e 100644 --- a/src/Test/LightTest.cpp +++ b/src/Test/LightTest.cpp @@ -51,13 +51,13 @@ void LightTest::position() { Camera camera(&cameraParent); QVERIFY(light.position(&camera) == (Matrix4::translation(Vector3::zAxis(3))* - Matrix4::rotation(deg(90.0f), Vector3::xAxis()).inversed())[3].xyz()); + Matrix4::rotation(deg(90.0f), Vector3::xAxis()).inverted())[3].xyz()); /* Set another camera */ Camera another(&cameraParent); another.scale(Vector3(3.0f)); QVERIFY(light.position(&another) == (Matrix4::translation(Vector3::zAxis(3))* - (Matrix4::scaling(Vector3(3.0f))*Matrix4::rotation(deg(90.0f), Vector3::xAxis())).inversed())[3].xyz()); + (Matrix4::scaling(Vector3(3.0f))*Matrix4::rotation(deg(90.0f), Vector3::xAxis())).inverted())[3].xyz()); } }}