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

Removed other dependencies from the meshlab basecode...

This commit is contained in:
Paolo Cignoni 2011-06-06 00:13:10 +00:00
parent 8f17d6b9bd
commit bd8f86bff5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vcg/math/quadric5.h
View File

@ -164,7 +164,7 @@ class Quadric5
{ {
public: public:
typedef Scalar ScalarType; typedef Scalar ScalarType;
typedef CMeshO::VertexType::FaceType FaceType; // typedef CMeshO::VertexType::FaceType FaceType;
// the real quadric // the real quadric
ScalarType a[15]; ScalarType a[15];
@ -241,7 +241,8 @@ public:
// computes the real quadric and the geometric quadric using the face // computes the real quadric and the geometric quadric using the face
// The geometric quadric is added to the parameter qgeo // The geometric quadric is added to the parameter qgeo
void byFace(FaceType &f, math::Quadric<double> &q1, math::Quadric<double> &q2, math::Quadric<double> &q3,bool QualityQuadric) template <class FaceType>
void byFace(FaceType &f, math::Quadric<double> &q1, math::Quadric<double> &q2, math::Quadric<double> &q3,bool QualityQuadric)
{ {
double q = QualityFace(f); double q = QualityFace(f);
@ -295,7 +296,8 @@ public:
// Computes the geometrical quadric if onlygeo == true and the real quadric if onlygeo == false // Computes the geometrical quadric if onlygeo == true and the real quadric if onlygeo == false
void byFace(FaceType &fi, bool onlygeo) template<class FaceType>
void byFace(FaceType &fi, bool onlygeo)
{ {
//assert(onlygeo==false); //assert(onlygeo==false);
ScalarType p[5]; ScalarType p[5];
@ -335,7 +337,7 @@ public:
ComputeQuadricFromE1E2(e1,e2,p); ComputeQuadricFromE1E2(e1,e2,p);
if(IsValid()) return; if(IsValid()) return;
qDebug("Warning: failed to find a good 5D quadric try to permute stuff."); // qDebug("Warning: failed to find a good 5D quadric try to permute stuff.");
/* /*
When c is very close to 0, loss of precision causes it to be computed as a negative number, When c is very close to 0, loss of precision causes it to be computed as a negative number,