fix typename errors

This commit is contained in:
T.Alderighi 2018-05-11 11:42:45 +02:00
parent f8ff736074
commit 02bfeb2f67
2 changed files with 358 additions and 345 deletions

View File

@ -178,11 +178,11 @@ public:
inline typename T::VertexType * & V( const int j ) { assert(j>=0 && j<4); return v[j]; }
inline typename T::VertexType * const cV( const int j ) const { assert(j>=0 && j<4); return v[j]; }
inline typename size_t const cFtoVi (const int f, const int j) const { assert(f >= 0 && f < 4); assert(j >= 0 && j < 3); return findices[f][j]; }
inline size_t const cFtoVi (const int f, const int j) const { assert(f >= 0 && f < 4); assert(j >= 0 && j < 3); return findices[f][j]; }
// Shortcut for tetra points
inline typename CoordType & P( const int j ) { assert(j>=0 && j<4); return v[j]->P(); }
inline const typename CoordType &cP( const int j ) const { assert(j>=0 && j<4); return v[j]->P(); }
inline CoordType & P( const int j ) { assert(j>=0 && j<4); return v[j]->P(); }
inline const CoordType &cP( const int j ) const { assert(j>=0 && j<4); return v[j]->P(); }
/** Return the pointer to the ((j+1)%4)-th vertex of the tetra.
@param j Index of the face vertex.
@ -201,18 +201,18 @@ public:
inline const typename T::VertexType * const & cV3( const int j ) const { return cV((j+3)%4);}
/// Shortcut to get vertex values
inline typename CoordType &P0 (const int j) { return V(j)->P(); }
inline typename CoordType &P2 (const int j) { return V((j + 2) % 4)->P(); }
inline typename CoordType &P3 (const int j) { return V((j + 3) % 4)->P(); }
inline typename CoordType &P1 (const int j) { return V((j + 1) % 4)->P(); }
inline const typename CoordType &P0 (const int j) const { return V(j)->P(); }
inline const typename CoordType &P1 (const int j) const { return V((j + 1) % 4)->P(); }
inline const typename CoordType &P2 (const int j) const { return V((j + 2) % 4)->P(); }
inline const typename CoordType &P3 (const int j) const { return V((j + 3) % 4)->P(); }
inline const typename CoordType &cP0(const int j) const { return cV(j)->P(); }
inline const typename CoordType &cP1(const int j) const { return cV((j + 1) % 4)->P(); }
inline const typename CoordType &cP2(const int j) const { return cV((j + 2) % 4)->P(); }
inline const typename CoordType &cP3(const int j) const { return cV((j + 3) % 4)->P(); }
inline CoordType &P0 (const int j) { return V(j)->P(); }
inline CoordType &P2 (const int j) { return V((j + 2) % 4)->P(); }
inline CoordType &P3 (const int j) { return V((j + 3) % 4)->P(); }
inline CoordType &P1 (const int j) { return V((j + 1) % 4)->P(); }
inline const CoordType &P0 (const int j) const { return V(j)->P(); }
inline const CoordType &P1 (const int j) const { return V((j + 1) % 4)->P(); }
inline const CoordType &P2 (const int j) const { return V((j + 2) % 4)->P(); }
inline const CoordType &P3 (const int j) const { return V((j + 3) % 4)->P(); }
inline const CoordType &cP0(const int j) const { return cV(j)->P(); }
inline const CoordType &cP1(const int j) const { return cV((j + 1) % 4)->P(); }
inline const CoordType &cP2(const int j) const { return cV((j + 2) % 4)->P(); }
inline const CoordType &cP3(const int j) const { return cV((j + 3) % 4)->P(); }
static bool HasVertexRef() { return true; }
static bool HasTVAdjacency() { return true; }

View File

@ -127,7 +127,8 @@ Initial commit
#include <algorithm>
namespace vcg {
namespace vcg
{
/** \addtogroup space */
/*@{*/
/**
@ -137,316 +138,332 @@ namespace vcg {
*/
class Tetra
{
public:
public:
//Tatrahedron Functions to retrieve information about relation between faces of tetrahedron(faces,adges,vertices).
//Tatrahedron Functions to retrieve information about relation between faces of tetrahedron(faces,adges,vertices).
static int VofE(const int &indexE, const int &indexV)
{
assert((indexE < 6) && (indexV < 2));
static int edgevert[6][2] = {{0, 1},
{0, 2},
{0, 3},
{1, 2},
{1, 3},
{2, 3}};
return (edgevert[indexE][indexV]);
}
static int VofE(const int &indexE,const int &indexV)
{ assert ((indexE<6)&&(indexV<2));
static int edgevert[6][2] ={{0,1},
{0,2},
{0,3},
{1,2},
{1,3},
{2,3}};
return (edgevert[indexE][indexV]);
}
static int VofF(const int &indexF,const int &indexV)
{ assert ((indexF<4)&&(indexV<3));
static int facevert[4][3]={{0,1,2},
{0,3,1},
{0,2,3},
{1,3,2}};
static int VofF(const int &indexF, const int &indexV)
{
assert((indexF < 4) && (indexV < 3));
static int facevert[4][3] = {{0, 1, 2},
{0, 3, 1},
{0, 2, 3},
{1, 3, 2}};
return (facevert[indexF][indexV]);
}
static int EofV(const int &indexV,const int &indexE)
{
assert ((indexE<3)&&(indexV<4));
static int vertedge[4][3]={{0,1,2},
{0,3,4},
{5,1,3},
{4,5,2}};
static int EofV(const int &indexV, const int &indexE)
{
assert((indexE < 3) && (indexV < 4));
static int vertedge[4][3] = {{0, 1, 2},
{0, 3, 4},
{5, 1, 3},
{4, 5, 2}};
return vertedge[indexV][indexE];
}
static int EofF(const int &indexF,const int &indexE)
{ assert ((indexF<4)&&(indexE<3));
static int faceedge[4][3]={{0,3,1},
{2,4,0},
{1,5,2},
{4,5,3}
};
return faceedge [indexF][indexE];
static int EofF(const int &indexF, const int &indexE)
{
assert((indexF < 4) && (indexE < 3));
static int faceedge[4][3] = {{0, 3, 1},
{2, 4, 0},
{1, 5, 2},
{4, 5, 3}};
return faceedge[indexF][indexE];
}
static int FofV(const int &indexV,const int &indexF)
{
assert ((indexV<4)&&(indexF<3));
static int vertface[4][3]={{0,1,2},
{0,3,1},
{0,2,3},
{1,3,2}};
static int FofV(const int &indexV, const int &indexF)
{
assert((indexV < 4) && (indexF < 3));
static int vertface[4][3] = {{0, 1, 2},
{0, 3, 1},
{0, 2, 3},
{1, 3, 2}};
return vertface[indexV][indexF];
}
static int FofE(const int &indexE,const int &indexSide)
{ assert ((indexE<6)&&(indexSide<2));
static int edgeface[6][2]={{0,1},
{0,2},
{1,2},
{0,3},
{1,3},
{2,3}};
return edgeface [indexE][indexSide];
static int FofE(const int &indexE, const int &indexSide)
{
assert((indexE < 6) && (indexSide < 2));
static int edgeface[6][2] = {{0, 1},
{0, 2},
{1, 2},
{0, 3},
{1, 3},
{2, 3}};
return edgeface[indexE][indexSide];
}
static int VofEE(const int &indexE0,const int &indexE1)
{
assert ((indexE0<6)&&(indexE0>=0));
assert ((indexE1<6)&&(indexE1>=0));
static int edgesvert[6][6]={{-1,0,0,1,1,-1},
{0,-1,0,2,-1,2},
{0,0,-1,-1,3,3},
{1,2,-1,-1,1,2},
{1,-1,3,1,-1,3},
{-1,2,3,2,3,-1}};
return (edgesvert[indexE0][indexE1]);
}
static int VofEE(const int &indexE0, const int &indexE1)
{
assert((indexE0 < 6) && (indexE0 >= 0));
assert((indexE1 < 6) && (indexE1 >= 0));
static int edgesvert[6][6] = {{-1, 0, 0, 1, 1, -1},
{0, -1, 0, 2, -1, 2},
{0, 0, -1, -1, 3, 3},
{1, 2, -1, -1, 1, 2},
{1, -1, 3, 1, -1, 3},
{-1, 2, 3, 2, 3, -1}};
return (edgesvert[indexE0][indexE1]);
}
static int VofFFF(const int &indexF0,const int &indexF1,const int &indexF2)
{
assert ((indexF0<4)&&(indexF0>=0));
assert ((indexF1<4)&&(indexF1>=0));
assert ((indexF2<4)&&(indexF2>=0));
static int facesvert[4][4][4]={
{//0
{-1,-1,-1,-1},{-1,-1,0,1},{-1,0,-1,2},{-1,1,2,-1}
},
{//1
{-1,-1,0,1},{-1,-1,-1,-1},{0,-1,-1,3},{1,-1,3,-1}
},
{//2
{-1,0,-1,2},{0,-1,-1,3},{-1,-1,-1,-1},{2,3,-1,-1}
},
{//3
{-1,1,2,-1},{1,-1,3,-1},{2,3,-1,-1},{-1,-1,-1,-1}
}
static int VofFFF(const int &indexF0, const int &indexF1, const int &indexF2)
{
assert((indexF0 < 4) && (indexF0 >= 0));
assert((indexF1 < 4) && (indexF1 >= 0));
assert((indexF2 < 4) && (indexF2 >= 0));
static int facesvert[4][4][4] = {
{//0
{-1, -1, -1, -1},
{-1, -1, 0, 1},
{-1, 0, -1, 2},
{-1, 1, 2, -1}},
{//1
{-1, -1, 0, 1},
{-1, -1, -1, -1},
{0, -1, -1, 3},
{1, -1, 3, -1}},
{//2
{-1, 0, -1, 2},
{0, -1, -1, 3},
{-1, -1, -1, -1},
{2, 3, -1, -1}},
{//3
{-1, 1, 2, -1},
{1, -1, 3, -1},
{2, 3, -1, -1},
{-1, -1, -1, -1}}};
return facesvert[indexF0][indexF1][indexF2];
}
static int EofFF(const int &indexF0, const int &indexF1)
{
assert((indexF0 < 4) && (indexF0 >= 0));
assert((indexF1 < 4) && (indexF1 >= 0));
static int facesedge[4][4] = {{-1, 0, 1, 3},
{0, -1, 2, 4},
{1, 2, -1, 5},
{3, 4, 5, -1}};
return (facesedge[indexF0][indexF1]);
}
static int EofVV(const int &indexV0, const int &indexV1)
{
assert((indexV0 < 4) && (indexV0 >= 0));
assert((indexV1 < 4) && (indexV1 >= 0));
static int verticesedge[4][4] = {{-1, 0, 1, 2},
{0, -1, 3, 4},
{1, 3, -1, 5},
{2, 4, 5, -1}};
return verticesedge[indexV0][indexV1];
}
static int FofVVV(const int &indexV0, const int &indexV1, const int &indexV2)
{
assert((indexV0 < 4) && (indexV0 >= 0));
assert((indexV1 < 4) && (indexV1 >= 0));
assert((indexV2 < 4) && (indexV2 >= 0));
static int verticesface[4][4][4] = {
{//0
{-1, -1, -1, -1},
{-1, -1, 0, 1},
{-1, 0, -1, 2},
{-1, 1, 2, -1}},
{//1
{-1, -1, 0, 1},
{-1, -1, -1, -1},
{0, -1, -1, 3},
{1, -1, 3, -1}},
{//2
{-1, 0, -1, 2},
{0, -1, -1, 3},
{-1, -1, -1, -1},
{2, 3, -1, -1}},
{//3
{-1, 1, 2, -1},
{1, -1, 3, -1},
{2, 3, -1, -1},
{-1, -1, -1, -1}}};
return verticesface[indexV0][indexV1][indexV2];
}
static int FofEE(const int &indexE0, const int &indexE1)
{
assert((indexE0 < 6) && (indexE0 >= 0));
assert((indexE1 < 6) && (indexE1 >= 0));
static int edgesface[6][6] = {{-1, 0, 1, 0, 1, -1},
{0, -1, 2, 0, -1, 2},
{1, 2, -1, -1, 1, 2},
{0, 0, -1, -1, 3, 3},
{1, -1, 1, 3, -1, 3},
{-1, 2, 2, 3, 3, -1}};
return edgesface[indexE0][indexE1];
}
// compute the barycenter
template <class TetraType>
static Point3<typename TetraType::ScalarType> Barycenter(const TetraType &t)
{
return ((t.cP(0) + t.cP(1) + t.cP(2) + t.cP(3)) / (typename TetraType::ScalarType)4.0);
}
// compute and return the volume of a tetrahedron
template <class TetraType>
static typename TetraType::ScalarType ComputeVolume(const TetraType &t)
{
return (typename TetraType::ScalarType)(((t.cP(2) - t.cP(0)) ^ (t.cP(1) - t.cP(0))) * (t.cP(3) - t.cP(0)) / 6.0);
}
/// Returns the normal to the face face of the tetrahedron t
template <class TetraType>
static Point3<typename TetraType::ScalarType> Normal(const TetraType &t, const int &face)
{
return (((t.cP(Tetra::VofF(face, 1)) - t.cP(Tetra::VofF(face, 0))) ^ (t.cP(Tetra::VofF(face, 2)) - t.cP(Tetra::VofF(face, 0)))).Normalize());
}
template <class TetraType>
static typename TetraType::ScalarType DihedralAngle(const TetraType &t, const size_t eidx)
{
typedef typename TetraType::CoordType CoordType;
//get two faces incident on eidx
int f0 = Tetra::FofE(eidx, 0);
int f1 = Tetra::FofE(eidx, 1);
CoordType p0 = t.cP(Tetra::VofF(f0, 0));
CoordType p1 = t.cP(Tetra::VofF(f0, 1));
CoordType p2 = t.cP(Tetra::VofF(f0, 2));
CoordType n0 = ((p2 - p0) ^ (p1 - p0)).normalized();
p0 = t.cP(Tetra::VofF(f1, 0));
p1 = t.cP(Tetra::VofF(f1, 1));
p2 = t.cP(Tetra::VofF(f1, 2));
CoordType n1 = ((p2 - p0) ^ (p1 - p0)).normalized();
return M_PI - double(acos(n0 * n1));
};
return facesvert[indexF0][indexF1][indexF2];
}
static int EofFF(const int &indexF0,const int &indexF1)
{
assert ((indexF0<4)&&(indexF0>=0));
assert ((indexF1<4)&&(indexF1>=0));
static int facesedge[4][4]={{-1, 0, 1, 3},
{ 0, -1, 2, 4},
{ 1, 2, -1, 5},
{ 3, 4, 5, -1}};
return (facesedge[indexF0][indexF1]);
}
template <class TetraType>
static typename TetraType::ScalarType SolidAngle(const TetraType &t, const size_t vidx)
{
typedef typename TetraType::ScalarType ScalarType;
ScalarType a0 = DihedralAngle(t, Tetra::EofV(vidx, 0));
ScalarType a1 = DihedralAngle(t, Tetra::EofV(vidx, 1));
ScalarType a2 = DihedralAngle(t, Tetra::EofV(vidx, 2));
static int EofVV(const int &indexV0,const int &indexV1)
{
assert ((indexV0<4)&&(indexV0>=0));
assert ((indexV1<4)&&(indexV1>=0));
static int verticesedge[4][4]={{-1, 0, 1, 2},
{ 0, -1, 3, 4},
{ 1, 3, -1, 5},
{ 2, 4, 5, -1}};
return verticesedge[indexV0][indexV1];
}
static int FofVVV(const int &indexV0,const int &indexV1,const int &indexV2)
{
assert ((indexV0<4)&&(indexV0>=0));
assert ((indexV1<4)&&(indexV1>=0));
assert ((indexV2<4)&&(indexV2>=0));
static int verticesface[4][4][4]={
{//0
{-1,-1,-1,-1},{-1,-1,0,1},{-1,0,-1,2},{-1,1,2,-1}
},
{//1
{-1,-1,0,1},{-1,-1,-1,-1},{0,-1,-1,3},{1,-1,3,-1}
},
{//2
{-1,0,-1,2},{0,-1,-1,3},{-1,-1,-1,-1},{2,3,-1,-1}
},
{//3
{-1,1,2,-1},{1,-1,3,-1},{2,3,-1,-1},{-1,-1,-1,-1}
}
return (a0 + a1 + a2) - M_PI;
};
return verticesface[indexV0][indexV1][indexV2];
}
static int FofEE(const int &indexE0,const int &indexE1)
{
assert ((indexE0<6)&&(indexE0>=0));
assert ((indexE1<6)&&(indexE1>=0));
static int edgesface[6][6]={{-1,0,1,0,1,-1},
{0,-1,2,0,-1,2},
{1,2,-1,-1,1,2},
{0,0,-1,-1,3,3},
{1,-1,1,3,-1,3},
{-1,2,2,3,3,-1}};
return edgesface[indexE0][indexE1];
}
template <class TetraType>
static typename TetraType::ScalarType AspectRatio(const TetraType &t)
{
typedef typename TetraType::ScalarType ScalarType;
ScalarType a0 = SolidAngle(t, 0);
ScalarType a1 = SolidAngle(t, 1);
ScalarType a2 = SolidAngle(t, 2);
ScalarType a3 = SolidAngle(t, 3);
// compute the barycenter
template<class TetraType>
static Point3<typename TetraType::ScalarType> Barycenter(const TetraType & t)
{
return ((t.cP(0)+t.cP(1)+t.cP(2)+t.cP(3))/(TetraType::ScalarType) 4.0);
}
// compute and return the volume of a tetrahedron
template<class TetraType>
static typename TetraType::ScalarType ComputeVolume( const TetraType & t){
return (typename TetraType::ScalarType)((( t.cP(2)-t.cP(0))^(t.cP(1)-t.cP(0) ))*(t.cP(3)-t.cP(0))/6.0);
}
/// Returns the normal to the face face of the tetrahedron t
template<class TetraType>
static Point3<typename TetraType::ScalarType> Normal( const TetraType &t,const int & face)
{
return(((t.cP(Tetra::VofF(face,1))-t.cP(Tetra::VofF(face,0)))^(t.cP(Tetra::VofF(face,2))-t.cP(Tetra::VofF(face,0)))).Normalize());
}
template < class TetraType >
static typename TetraType::ScalarType DihedralAngle (const TetraType & t, const size_t eidx)
{
typedef typename TetraType::CoordType CoordType;
//get two faces incident on eidx
int f0 = Tetra::FofE(eidx, 0);
int f1 = Tetra::FofE(eidx, 1);
CoordType p0 = t.cP(Tetra::VofF(f0, 0));
CoordType p1 = t.cP(Tetra::VofF(f0, 1));
CoordType p2 = t.cP(Tetra::VofF(f0, 2));
CoordType n0 = ((p2 - p0) ^ (p1 - p0)).normalized();
p0 = t.cP(Tetra::VofF(f1, 0));
p1 = t.cP(Tetra::VofF(f1, 1));
p2 = t.cP(Tetra::VofF(f1, 2));
CoordType n1 = ((p2 - p0) ^ (p1 - p0)).normalized();
return M_PI - double(acos(n0 * n1));
};
template < class TetraType >
static typename TetraType::ScalarType SolidAngle (const TetraType & t, const size_t vidx)
{
TetraType::ScalarType a0 = DihedralAngle(t, Tetra::EofV(vidx, 0));
TetraType::ScalarType a1 = DihedralAngle(t, Tetra::EofV(vidx, 1));
TetraType::ScalarType a2 = DihedralAngle(t, Tetra::EofV(vidx, 2));
return (a0 + a1 + a2) - M_PI;
};
template < class TetraType >
static typename TetraType::ScalarType AspectRatio (const TetraType & t)
{
TetraType::ScalarType a0 = SolidAngle(t, 0);
TetraType::ScalarType a1 = SolidAngle(t, 1);
TetraType::ScalarType a2 = SolidAngle(t, 2);
TetraType::ScalarType a3 = SolidAngle(t, 3);
return std::min(a0, std::min(a1, std::min(a2, a3)));
}
return std::min(a0, std::min(a1, std::min(a2, a3)));
}
};
/**
Templated class for storing a generic tetrahedron in a 3D space.
Note the relation with the Face class of TetraMesh complex, both classes provide the P(i) access functions to their points and therefore they share the algorithms on it (e.g. area, normal etc...)
*/
template <class ScalarType>
class Tetra3:public Tetra
template <class ScalarType>
class Tetra3 : public Tetra
{
public:
typedef Point3< ScalarType > CoordType;
//typedef typename ScalarType ScalarType;
public:
typedef Point3<ScalarType> CoordType;
//typedef typename ScalarType ScalarType;
/*********************************************
/*********************************************
**/
private:
private:
/// Vector of the 4 points that defines the tetrahedron
CoordType _v[4];
public:
public:
/// Shortcut per accedere ai punti delle facce
inline CoordType &P(const int j) { return _v[j]; }
inline CoordType const &cP(const int j) const { return _v[j]; }
/// Shortcut per accedere ai punti delle facce
inline CoordType & P( const int j ) { return _v[j];}
inline CoordType const & cP( const int j )const { return _v[j];}
inline CoordType &P0(const int j) { return _v[j]; }
inline CoordType &P1(const int j) { return _v[(j + 1) % 4]; }
inline CoordType &P2(const int j) { return _v[(j + 2) % 4]; }
inline CoordType &P3(const int j) { return _v[(j + 3) % 4]; }
inline CoordType & P0( const int j ) { return _v[j];}
inline CoordType & P1( const int j ) { return _v[(j+1)%4];}
inline CoordType & P2( const int j ) { return _v[(j+2)%4];}
inline CoordType & P3( const int j ) { return _v[(j+3)%4];}
inline const CoordType &P0(const int j) const { return _v[j]; }
inline const CoordType &P1(const int j) const { return _v[(j + 1) % 4]; }
inline const CoordType &P2(const int j) const { return _v[(j + 2) % 4]; }
inline const CoordType &P3(const int j) const { return _v[(j + 3) % 4]; }
inline const CoordType & P0( const int j ) const { return _v[j];}
inline const CoordType & P1( const int j ) const { return _v[(j+1)%4];}
inline const CoordType & P2( const int j ) const { return _v[(j+2)%4];}
inline const CoordType & P3( const int j ) const { return _v[(j+3)%4];}
inline const CoordType &cP0(const int j) const { return _v[j]; }
inline const CoordType &cP1(const int j) const { return _v[(j + 1) % 4]; }
inline const CoordType &cP2(const int j) const { return _v[(j + 2) % 4]; }
inline const CoordType &cP3(const int j) const { return _v[(j + 3) % 4]; }
inline const CoordType & cP0( const int j ) const { return _v[j];}
inline const CoordType & cP1( const int j ) const { return _v[(j+1)%4];}
inline const CoordType & cP2( const int j ) const { return _v[(j+2)%4];}
inline const CoordType & cP3( const int j ) const { return _v[(j+3)%4];}
/// compute and return the barycenter of a tetrahedron
CoordType ComputeBarycenter()
{
return((_v[0] + _v[1] + _v[2]+ _v[3])/4);
/// compute and return the barycenter of a tetrahedron
CoordType ComputeBarycenter()
{
return ((_v[0] + _v[1] + _v[2] + _v[3]) / 4);
}
/// compute and return the solid angle on a vertex
double SolidAngle(int vind)
{
double da0=DiedralAngle(EofV(vind,0));
double da1=DiedralAngle(EofV(vind,1));
double da2=DiedralAngle(EofV(vind,2));
/// compute and return the solid angle on a vertex
double SolidAngle(int vind)
{
double da0 = DiedralAngle(EofV(vind, 0));
double da1 = DiedralAngle(EofV(vind, 1));
double da2 = DiedralAngle(EofV(vind, 2));
return((da0 + da1 + da2)- M_PI);
return ((da0 + da1 + da2) - M_PI);
}
/// compute and return the diadedral angle on an edge
/// compute and return the diadedral angle on an edge
double DiedralAngle(int edgeind)
{
int f1=FofE(edgeind,0);
int f2=FofE(edgeind,1);
CoordType p0=_v[FofV(f1,0)];
CoordType p1=_v[FofV(f1,1)];
CoordType p2=_v[FofV(f1,2)];
CoordType norm1=((p1-p0)^(p2-p0));
p0=_v[FofV(f2,0)];
p1=_v[FofV(f2,1)];
p2=_v[FofV(f2,2)];
CoordType norm2=((p1-p0)^(p2-p0));
{
int f1 = FofE(edgeind, 0);
int f2 = FofE(edgeind, 1);
CoordType p0 = _v[FofV(f1, 0)];
CoordType p1 = _v[FofV(f1, 1)];
CoordType p2 = _v[FofV(f1, 2)];
CoordType norm1 = ((p1 - p0) ^ (p2 - p0));
p0 = _v[FofV(f2, 0)];
p1 = _v[FofV(f2, 1)];
p2 = _v[FofV(f2, 2)];
CoordType norm2 = ((p1 - p0) ^ (p2 - p0));
norm1.Normalize();
norm2.Normalize();
return (M_PI-acos(double(norm1*norm2)));
return (M_PI - acos(double(norm1 * norm2)));
}
/// compute and return the aspect ratio of the tetrahedron
ScalarType ComputeAspectRatio()
{
double a0=SolidAngle(0);
double a1=SolidAngle(1);
double a2=SolidAngle(2);
double a3=SolidAngle(3);
return (ScalarType)std::min(a0,std::min(a1,std::min(a2,a3)));
/// compute and return the aspect ratio of the tetrahedron
ScalarType ComputeAspectRatio()
{
double a0 = SolidAngle(0);
double a1 = SolidAngle(1);
double a2 = SolidAngle(2);
double a3 = SolidAngle(3);
return (ScalarType)std::min(a0, std::min(a1, std::min(a2, a3)));
}
///return true of p is inside tetrahedron's volume
@ -454,7 +471,7 @@ ScalarType ComputeAspectRatio()
{
//bb control
vcg::Box3<typename CoordType::ScalarType> bb;
for (int i=0;i<4;i++)
for (int i = 0; i < 4; i++)
bb.Add(_v[i]);
if (!bb.IsIn(p))
@ -466,97 +483,93 @@ ScalarType ComputeAspectRatio()
vcg::Matrix44<ScalarType> M3;
vcg::Matrix44<ScalarType> M4;
CoordType p1=_v[0];
CoordType p2=_v[1];
CoordType p3=_v[2];
CoordType p4=_v[3];
CoordType p1 = _v[0];
CoordType p2 = _v[1];
CoordType p3 = _v[2];
CoordType p4 = _v[3];
M0[0][0]=p1.V(0);
M0[0][1]=p1.V(1);
M0[0][2]=p1.V(2);
M0[1][0]=p2.V(0);
M0[1][1]=p2.V(1);
M0[1][2]=p2.V(2);
M0[2][0]=p3.V(0);
M0[2][1]=p3.V(1);
M0[2][2]=p3.V(2);
M0[3][0]=p4.V(0);
M0[3][1]=p4.V(1);
M0[3][2]=p4.V(2);
M0[0][3]=1;
M0[1][3]=1;
M0[2][3]=1;
M0[3][3]=1;
M0[0][0] = p1.V(0);
M0[0][1] = p1.V(1);
M0[0][2] = p1.V(2);
M0[1][0] = p2.V(0);
M0[1][1] = p2.V(1);
M0[1][2] = p2.V(2);
M0[2][0] = p3.V(0);
M0[2][1] = p3.V(1);
M0[2][2] = p3.V(2);
M0[3][0] = p4.V(0);
M0[3][1] = p4.V(1);
M0[3][2] = p4.V(2);
M0[0][3] = 1;
M0[1][3] = 1;
M0[2][3] = 1;
M0[3][3] = 1;
M1=M0;
M1[0][0]=p.V(0);
M1[0][1]=p.V(1);
M1[0][2]=p.V(2);
M1 = M0;
M1[0][0] = p.V(0);
M1[0][1] = p.V(1);
M1[0][2] = p.V(2);
M2=M0;
M2[1][0]=p.V(0);
M2[1][1]=p.V(1);
M2[1][2]=p.V(2);
M2 = M0;
M2[1][0] = p.V(0);
M2[1][1] = p.V(1);
M2[1][2] = p.V(2);
M3=M0;
M3[2][0]=p.V(0);
M3[2][1]=p.V(1);
M3[2][2]=p.V(2);
M3 = M0;
M3[2][0] = p.V(0);
M3[2][1] = p.V(1);
M3[2][2] = p.V(2);
M4=M0;
M4[3][0]=p.V(0);
M4[3][1]=p.V(1);
M4[3][2]=p.V(2);
M4 = M0;
M4[3][0] = p.V(0);
M4[3][1] = p.V(1);
M4[3][2] = p.V(2);
ScalarType d0=M0.Determinant();
ScalarType d1=M1.Determinant();
ScalarType d2=M2.Determinant();
ScalarType d3=M3.Determinant();
ScalarType d4=M4.Determinant();
ScalarType d0 = M0.Determinant();
ScalarType d1 = M1.Determinant();
ScalarType d2 = M2.Determinant();
ScalarType d3 = M3.Determinant();
ScalarType d4 = M4.Determinant();
// all determinant must have same sign
return (((d0>0)&&(d1>0)&&(d2>0)&&(d3>0)&&(d4>0))||((d0<0)&&(d1<0)&&(d2<0)&&(d3<0)&&(d4<0)));
return (((d0 > 0) && (d1 > 0) && (d2 > 0) && (d3 > 0) && (d4 > 0)) || ((d0 < 0) && (d1 < 0) && (d2 < 0) && (d3 < 0) && (d4 < 0)));
}
void InterpolationParameters(const CoordType & bq, ScalarType &a, ScalarType &b, ScalarType &c ,ScalarType &d)
void InterpolationParameters(const CoordType &bq, ScalarType &a, ScalarType &b, ScalarType &c, ScalarType &d)
{
const ScalarType EPSILON = ScalarType(0.000001);
Matrix33<ScalarType> M;
CoordType v0=P(0)-P(2);
CoordType v1=P(1)-P(2);
CoordType v2=P(3)-P(2);
CoordType v3=bq-P(2);
M[0][0]=v0.X();
M[1][0]=v0.Y();
M[2][0]=v0.Z();
CoordType v0 = P(0) - P(2);
CoordType v1 = P(1) - P(2);
CoordType v2 = P(3) - P(2);
CoordType v3 = bq - P(2);
M[0][1]=v1.X();
M[1][1]=v1.Y();
M[2][1]=v1.Z();
M[0][0] = v0.X();
M[1][0] = v0.Y();
M[2][0] = v0.Z();
M[0][2]=v2.X();
M[1][2]=v2.Y();
M[2][2]=v2.Z();
M[0][1] = v1.X();
M[1][1] = v1.Y();
M[2][1] = v1.Z();
Matrix33<ScalarType> inv_M =vcg::Inverse<ScalarType>(M);
M[0][2] = v2.X();
M[1][2] = v2.Y();
M[2][2] = v2.Z();
CoordType Barycentric=inv_M*v3;
Matrix33<ScalarType> inv_M = vcg::Inverse<ScalarType>(M);
a=Barycentric.V(0);
b=Barycentric.V(1);
d=Barycentric.V(2);
c=1-(a+b+d);
CoordType Barycentric = inv_M * v3;
a = Barycentric.V(0);
b = Barycentric.V(1);
d = Barycentric.V(2);
c = 1 - (a + b + d);
}
}; //end Class
/*@}*/
} // end namespace
} // namespace vcg
#endif