diff --git a/vcg/math/eigen_matrix_addons.h b/vcg/math/eigen_matrix_addons.h index c04e5215..b42412b5 100644 --- a/vcg/math/eigen_matrix_addons.h +++ b/vcg/math/eigen_matrix_addons.h @@ -27,7 +27,7 @@ enum {Dimension = SizeAtCompileTime}; typedef typename ei_to_vcgtype::type EquivVcgType; typedef vcg::VoidType ParamType; typedef Matrix PointType; -// using Base::V; +using Base::V; // automatic conversion to similar vcg types // the otherway round is implicit because they inherits this Matrix tyoe @@ -78,9 +78,6 @@ inline Scalar& W() { return data()[SizeAtCompileTime-1]; } /** note, W always returns the last entry */ inline const Scalar& W() const { return data()[SizeAtCompileTime-1]; } -EIGEN_DEPRECATED inline Scalar V(int i) const { return (*this)[i]; }; -EIGEN_DEPRECATED inline Scalar& V(int i) { return (*this)[i]; }; - /** \deprecated use .data() */ EIGEN_DEPRECATED Scalar* V() { return data(); } /** \deprecated use .data() */ @@ -93,6 +90,8 @@ EIGEN_DEPRECATED inline const Scalar& V( const int i ) const assert(i>=0 && i _Base; +public: using _Base::coeff; using _Base::coeffRef; using _Base::setZero; using _Base::data; using _Base::V; -public: - _EIGEN_GENERIC_PUBLIC_INTERFACE(Point2,_Base); VCG_EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Point2) diff --git a/vcg/space/point3.h b/vcg/space/point3.h index f1b81077..9c23bdd1 100644 --- a/vcg/space/point3.h +++ b/vcg/space/point3.h @@ -77,8 +77,9 @@ public: //---------------------------------------- private: typedef Eigen::Matrix<_Scalar,3,1> _Base; - using _Base::Construct; public: + + using _Base::Construct; _EIGEN_GENERIC_PUBLIC_INTERFACE(Point3,_Base); VCG_EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Point3) diff --git a/vcg/space/point4.h b/vcg/space/point4.h index 3c753811..66660325 100644 --- a/vcg/space/point4.h +++ b/vcg/space/point4.h @@ -63,13 +63,11 @@ public: //---------------------------------------- private: typedef Eigen::Matrix _Base; +public: using _Base::coeff; using _Base::coeffRef; using _Base::setZero; using _Base::data; - using _Base::V; - -public: _EIGEN_GENERIC_PUBLIC_INTERFACE(Point4,_Base); typedef Scalar ScalarType;