manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up various type name clashes. There were some components that wrongly re-defined <ScalarType> covering the real <ScalarType> of the simplex. Renamed to something less ambiguous (like CurScalarType for denoting the scalar type used inside curvature types).

This commit is contained in:
Paolo Cignoni 2014-06-19 08:31:51 +00:00
parent 4fbbfe4f86
commit 4198a3bd7c
4 changed files with 189 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcg/complex/base.h
View File

@ -217,7 +217,7 @@ class TriMesh
inline int HN() const { return hn; } inline int HN() const { return hn; }
/// Bounding box of the mesh /// Bounding box of the mesh
Box3<ScalarType> bbox; Box3<typename TriMesh::VertexType::CoordType::ScalarType> bbox;
/// Nomi di textures /// Nomi di textures
// //

24
vcg/simplex/face/component.h
View File

@ -483,8 +483,8 @@ private:
/*-------------------------- Curvature Direction ----------------------------------*/ /*-------------------------- Curvature Direction ----------------------------------*/
template <class S> template <class S>
struct CurvatureDirBaseType{ struct CurvatureDirBaseType{
typedef Point3<S> VecType; typedef Point3<S> CurVecType;
typedef S ScalarType; typedef S CurScalarType;
CurvatureDirBaseType () {} CurvatureDirBaseType () {}
Point3<S>max_dir,min_dir; // max and min curvature direction Point3<S>max_dir,min_dir; // max and min curvature direction
S k1,k2;// max and min curvature values S k1,k2;// max and min curvature values
@ -493,18 +493,18 @@ struct CurvatureDirBaseType{
template <class A, class TT> class CurvatureDir: public TT { template <class A, class TT> class CurvatureDir: public TT {
public: public:
typedef A CurvatureDirType; typedef A CurvatureDirType;
typedef typename CurvatureDirType::VecType VecType; typedef typename CurvatureDirType::VecType CurVecType;
typedef typename CurvatureDirType::ScalarType ScalarType; typedef typename CurvatureDirType::ScalarType CurScalarType;
VecType &PD1() { return _curv.max_dir;} CurVecType &PD1() { return _curv.max_dir;}
VecType &PD2() { return _curv.min_dir;} CurVecType &PD2() { return _curv.min_dir;}
VecType cPD1() const { return _curv.max_dir;} CurVecType cPD1() const { return _curv.max_dir;}
VecType cPD2() const { return _curv.min_dir;} CurVecType cPD2() const { return _curv.min_dir;}
ScalarType &K1() { return _curv.k1;} CurScalarType &K1() { return _curv.k1;}
ScalarType &K2() { return _curv.k2;} CurScalarType &K2() { return _curv.k2;}
ScalarType cK1() const {return _curv.k1;} CurScalarType cK1() const {return _curv.k1;}
ScalarType cK2() const {return _curv.k2;} CurScalarType cK2() const {return _curv.k2;}
template < class RightValueType> template < class RightValueType>
void ImportData(const RightValueType & rightF ) { void ImportData(const RightValueType & rightF ) {
if(rightF.IsCurvatureDirEnabled()) { if(rightF.IsCurvatureDirEnabled()) {

28
vcg/simplex/face/component_ocf.h
View File

@ -494,59 +494,59 @@ template <class T> class Normal3dOcf: public NormalOcf<vcg::Point3d, T> {};
/*------------------------- CurvatureDir -----------------------------------------*/ /*------------------------- CurvatureDir -----------------------------------------*/
template <class S> template <class S>
struct CurvatureDirOcfBaseType{ struct CurvatureDirOcfBaseType{
typedef Point3<S> VecType; typedef Point3<S> CurVecType;
typedef S ScalarType; typedef S CurScalarType;
CurvatureDirOcfBaseType () {} CurvatureDirOcfBaseType () {}
Point3<S>max_dir,min_dir; // max and min curvature direction CurVecType max_dir,min_dir; // max and min curvature direction
S k1,k2;// max and min curvature values CurScalarType k1,k2;// max and min curvature values
}; };
template <class A, class T> class CurvatureDirOcf: public T { template <class A, class T> class CurvatureDirOcf: public T {
public: public:
typedef A CurvatureDirType; typedef A CurvatureDirType;
typedef typename CurvatureDirType::VecType VecType; typedef typename CurvatureDirType::VecType CurVecType;
typedef typename CurvatureDirType::ScalarType ScalarType; typedef typename CurvatureDirType::ScalarType CurScalarType;
inline bool IsCurvatureDirEnabled( ) const { return this->Base().IsCurvatureDirEnabled(); } inline bool IsCurvatureDirEnabled( ) const { return this->Base().IsCurvatureDirEnabled(); }
static bool HasCurvatureDir() { return true; } static bool HasCurvatureDir() { return true; }
static bool HasCurvatureDirOcf() { return true; } static bool HasCurvatureDirOcf() { return true; }
VecType &PD1() { CurVecType &PD1() {
assert((*this).Base().CurvatureDirEnabled); assert((*this).Base().CurvatureDirEnabled);
return (*this).Base().CDV[(*this).Index()].max_dir; return (*this).Base().CDV[(*this).Index()].max_dir;
} }
VecType &PD2() { CurVecType &PD2() {
assert((*this).Base().CurvatureDirEnabled); assert((*this).Base().CurvatureDirEnabled);
return (*this).Base().CDV[(*this).Index()].min_dir; return (*this).Base().CDV[(*this).Index()].min_dir;
} }
VecType cPD1() const { CurVecType cPD1() const {
assert((*this).Base().CurvatureDirEnabled); assert((*this).Base().CurvatureDirEnabled);
return (*this).Base().CDV[(*this).Index()].max_dir; return (*this).Base().CDV[(*this).Index()].max_dir;
} }
VecType cPD2() const { CurVecType cPD2() const {
assert((*this).Base().CurvatureDirEnabled); assert((*this).Base().CurvatureDirEnabled);
return (*this).Base().CDV[(*this).Index()].min_dir; return (*this).Base().CDV[(*this).Index()].min_dir;
} }
ScalarType &K1() { CurScalarType &K1() {
// you cannot use Normals before enabling them with: yourmesh.face.EnableNormal() // you cannot use Normals before enabling them with: yourmesh.face.EnableNormal()
assert((*this).Base().NormalEnabled); assert((*this).Base().NormalEnabled);
return (*this).Base().CDV[(*this).Index()].k1; return (*this).Base().CDV[(*this).Index()].k1;
} }
ScalarType &K2() { CurScalarType &K2() {
// you cannot use Normals before enabling them with: yourmesh.face.EnableNormal() // you cannot use Normals before enabling them with: yourmesh.face.EnableNormal()
assert((*this).Base().NormalEnabled); assert((*this).Base().NormalEnabled);
return (*this).Base().CDV[(*this).Index()].k2; return (*this).Base().CDV[(*this).Index()].k2;
} }
ScalarType cK1() const { CurScalarType cK1() const {
// you cannot use Normals before enabling them with: yourmesh.face.EnableNormal() // you cannot use Normals before enabling them with: yourmesh.face.EnableNormal()
assert((*this).Base().NormalEnabled); assert((*this).Base().NormalEnabled);
return (*this).Base().CDV[(*this).Index()].k1; return (*this).Base().CDV[(*this).Index()].k1;
} }
ScalarType cK2() const { CurScalarType cK2() const {
// you cannot use Normals before enabling them with: yourmesh.face.EnableNormal() // you cannot use Normals before enabling them with: yourmesh.face.EnableNormal()
assert((*this).Base().NormalEnabled); assert((*this).Base().NormalEnabled);
return (*this).Base().CDV[(*this).Index()].k2; return (*this).Base().CDV[(*this).Index()].k2;

39
vcg/simplex/vertex/component_ocf.h
View File

@ -428,12 +428,12 @@ public:
template <class A, class TT> class CurvatureOcf: public TT { template <class A, class TT> class CurvatureOcf: public TT {
public: public:
typedef Point2<A> CurvatureType; typedef Point2<A> CurvatureType;
typedef typename CurvatureType::ScalarType ScalarType; typedef typename CurvatureType::ScalarType CurScalarType;
ScalarType &Kh(){ assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][0];} CurScalarType &Kh(){ assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][0];}
ScalarType &Kg(){ assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][1];} CurScalarType &Kg(){ assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][1];}
ScalarType cKh() const { assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][0];} CurScalarType cKh() const { assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][0];}
ScalarType cKg() const { assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][1];} CurScalarType cKg() const { assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][1];}
template <class RightVertexType> template <class RightVertexType>
void ImportData(const RightVertexType & rightV){ void ImportData(const RightVertexType & rightV){
@ -458,29 +458,29 @@ template <class T> class CurvaturedOcf: public CurvatureOcf<double, T> {public:
template <class S> template <class S>
struct CurvatureDirTypeOcf{ struct CurvatureDirTypeOcf{
typedef Point3<S> VecType; typedef Point3<S> CurVecType;
typedef S ScalarType; typedef S CurScalarType;
CurvatureDirTypeOcf () {} CurvatureDirTypeOcf () {}
Point3<S>max_dir,min_dir; CurVecType max_dir,min_dir;
S k1,k2; CurScalarType k1,k2;
}; };
template <class A, class TT> class CurvatureDirOcf: public TT { template <class A, class TT> class CurvatureDirOcf: public TT {
public: public:
typedef A CurvatureDirType; typedef A CurvatureDirType;
typedef typename CurvatureDirType::VecType VecType; typedef typename CurvatureDirType::CurVecType CurVecType;
typedef typename CurvatureDirType::ScalarType ScalarType; typedef typename CurvatureDirType::CurScalarType CurScalarType;
VecType &PD1() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].max_dir;} CurVecType &PD1() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].max_dir;}
VecType &PD2() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].min_dir;} CurVecType &PD2() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].min_dir;}
VecType cPD1() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].max_dir;} CurVecType cPD1() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].max_dir;}
VecType cPD2() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].min_dir;} CurVecType cPD2() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].min_dir;}
ScalarType &K1() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k1;} CurScalarType &K1() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k1;}
ScalarType &K2() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k2;} CurScalarType &K2() { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k2;}
ScalarType cK1() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k1;} CurScalarType cK1() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k1;}
ScalarType cK2() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k2;} CurScalarType cK2() const { assert((*this).Base().CurvatureDirEnabled); return (*this).Base().CuDV[(*this).Index()].k2;}
template <class RightVertexType> template <class RightVertexType>
void ImportData(const RightVertexType & rightV){ void ImportData(const RightVertexType & rightV){
@ -513,7 +513,6 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::st
template <class A, class TT> class RadiusOcf: public TT { template <class A, class TT> class RadiusOcf: public TT {
public: public:
typedef A RadiusType; typedef A RadiusType;
typedef RadiusType ScalarType;
const RadiusType &R() const { assert((*this).Base().RadiusEnabled); return (*this).Base().RadiusV[(*this).Index()];} const RadiusType &R() const { assert((*this).Base().RadiusEnabled); return (*this).Base().RadiusV[(*this).Index()];}
RadiusType &R() { assert((*this).Base().RadiusEnabled); return (*this).Base().RadiusV[(*this).Index()];} RadiusType &R() { assert((*this).Base().RadiusEnabled); return (*this).Base().RadiusV[(*this).Index()];}