Browse Source

Fixed typo in method name.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
ccf61c0f7f
  1. 2
      src/Camera.cpp
  2. 4
      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
  7. 4
      src/Test/LightTest.cpp

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().inversed(); _cameraMatrix = absoluteTransformation().inverted();
Object::setClean(); Object::setClean();
} }

4
src/Math/Matrix.h

@ -216,9 +216,9 @@ template<class T, size_t size> class Matrix {
inline T determinant() const { return Implementation::MatrixDeterminant<T, size>()(*this); } inline T determinant() const { return Implementation::MatrixDeterminant<T, size>()(*this); }
/** /**
* @brief Inverse matrix * @brief Inverted matrix
*/ */
Matrix<T, size> inversed() const { Matrix<T, size> inverted() const {
Matrix<T, size> out(Zero); Matrix<T, size> out(Zero);
T _determinant = determinant(); T _determinant = determinant();

4
src/Math/Matrix3.h

@ -94,8 +94,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::inversed() */ /** @copydoc Matrix::inverted() */
inline Matrix3<T> inversed() const { return Matrix<T, 3>::inversed(); } inline Matrix3<T> inverted() const { return Matrix<T, 3>::inverted(); }
}; };
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT

4
src/Math/Matrix4.h

@ -166,8 +166,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::inversed() */ /** @copydoc Matrix::inverted() */
inline Matrix4<T> inversed() const { return Matrix<T, 4>::inversed(); } inline Matrix4<T> inverted() const { return Matrix<T, 4>::inverted(); }
/** @brief Rotation part of the matrix */ /** @brief Rotation part of the matrix */
inline Matrix3<T> rotation() const { inline Matrix3<T> rotation() const {

4
src/Math/Test/MatrixTest.cpp

@ -246,7 +246,7 @@ void MatrixTest::determinant() {
QVERIFY(m.determinant() == -2); QVERIFY(m.determinant() == -2);
} }
void MatrixTest::inversed() { void MatrixTest::inverted() {
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,
@ -261,7 +261,7 @@ void MatrixTest::inversed() {
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.inversed(); Matrix4 _inverse = m.inverted();
QVERIFY(_inverse == inverse); QVERIFY(_inverse == inverse);
QVERIFY(_inverse*m == Matrix4()); QVERIFY(_inverse*m == Matrix4());

2
src/Math/Test/MatrixTest.h

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

4
src/Test/LightTest.cpp

@ -51,13 +51,13 @@ void LightTest::position() {
Camera camera(&cameraParent); Camera camera(&cameraParent);
QVERIFY(light.position(&camera) == (Matrix4::translation(Vector3::zAxis(3))* 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 */ /* Set another camera */
Camera another(&cameraParent); Camera another(&cameraParent);
another.scale(Vector3(3.0f)); another.scale(Vector3(3.0f));
QVERIFY(light.position(&another) == (Matrix4::translation(Vector3::zAxis(3))* 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());
} }
}} }}

Loading…
Cancel
Save