From e0f627a7db983bacfd76e7d9caa9f1ae2007f47a Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 22 Aug 2008 17:54:37 +0000 Subject: [PATCH] s/Affine/Linear, thanks to Thomas Vaughan --- Eigen/src/Geometry/Transform.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h index 4710cc4bc..573dcb2d1 100644 --- a/Eigen/src/Geometry/Transform.h +++ b/Eigen/src/Geometry/Transform.h @@ -66,9 +66,9 @@ public: /** type of the matrix used to represent the transformation */ typedef Matrix MatrixType; /** type of the matrix used to represent the linear part of the transformation */ - typedef Matrix AffineMatrixType; + typedef Matrix LinearMatrixType; /** type of read/write reference to the linear part of the transformation */ - typedef Block AffinePart; + typedef Block LinearPart; /** type of a vector */ typedef Matrix VectorType; /** type of a read/write reference to the translation part of the rotation */ @@ -111,9 +111,9 @@ public: inline MatrixType& matrix() { return m_matrix; } /** \returns a read-only expression of the linear (linear) part of the transformation */ - inline const AffinePart linear() const { return m_matrix.template block(0,0); } + inline const LinearPart linear() const { return m_matrix.template block(0,0); } /** \returns a writable expression of the linear (linear) part of the transformation */ - inline AffinePart linear() { return m_matrix.template block(0,0); } + inline LinearPart linear() { return m_matrix.template block(0,0); } /** \returns a read-only expression of the translation vector of the transformation */ inline const TranslationPart translation() const { return m_matrix.template block(0,Dim); } @@ -162,8 +162,8 @@ public: Transform& shear(Scalar sx, Scalar sy); Transform& preshear(Scalar sx, Scalar sy); - AffineMatrixType extractRotation() const; - AffineMatrixType extractRotationNoShear() const; + LinearMatrixType extractRotation() const; + LinearMatrixType extractRotationNoShear() const; template Transform& fromPositionOrientationScale(const MatrixBase &position, @@ -349,7 +349,7 @@ Transform& Transform::preshear(Scalar sx, Scalar sy) { EIGEN_STATIC_ASSERT(int(Dim)==2, you_did_a_programming_error); - m_matrix.template block(0,0) = AffineMatrixType(1, sx, sy, 1) * m_matrix.template block(0,0); + m_matrix.template block(0,0) = LinearMatrixType(1, sx, sy, 1) * m_matrix.template block(0,0); return *this; } @@ -357,7 +357,7 @@ Transform::preshear(Scalar sx, Scalar sy) * \sa extractRotationNoShear(), class QR */ template -typename Transform::AffineMatrixType +typename Transform::LinearMatrixType Transform::extractRotation() const { return linear().qr().matrixQ(); @@ -368,7 +368,7 @@ Transform::extractRotation() const * \sa extractRotation() */ template -typename Transform::AffineMatrixType +typename Transform::LinearMatrixType Transform::extractRotationNoShear() const { return linear().cwise().abs2() @@ -421,7 +421,7 @@ struct ei_transform_product_impl { typedef typename Other::Scalar Scalar; typedef Transform TransformType; - typedef typename TransformType::AffinePart MatrixType; + typedef typename TransformType::LinearPart MatrixType; typedef const CwiseUnaryOp< ei_scalar_multiple_op, NestByValue