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

gcc compiling issues

This commit is contained in:
Paolo Cignoni 2006-11-07 11:47:14 +00:00
parent 865bb26e54
commit 06047a697d
2 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
vcg/complex/trimesh/hole.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.12 2006/11/07 07:56:43 cignoni
Added missing std::
Revision 1.11 2006/11/06 16:12:29 giec Revision 1.11 2006/11/06 16:12:29 giec
Leipa ear now compute max dihedral angle. Leipa ear now compute max dihedral angle.
@ -90,9 +93,9 @@ namespace vcg {
else {v[0]=v0; v[1]=v1;} else {v[0]=v0; v[1]=v1;}
} }
SimpleEdge(face::Pos<typename MESH::FaceType> &ep) { SimpleEdge(typename face::Pos<typename MESH::FaceType> &ep) {
//*this=SimpleEdge(*ep.VFlip(), *ep.v); //*this=SimpleEdge(*ep.VFlip(), *ep.v);
MESH::VertexType v0 ,v1; typename MESH::VertexType v0 ,v1;
v0 = *ep.VFlip(); v0 = *ep.VFlip();
v1 = *ep.v; v1 = *ep.v;
if(v0.P().X() != v1.P().X() && if(v0.P().X() != v1.P().X() &&
@ -104,7 +107,8 @@ namespace vcg {
bool operator < (const SimpleEdge & e) const bool operator < (const SimpleEdge & e) const
{ v[0] = e.v[0]; v[1]=e.v[1]; {
v[0] = e.v[0]; v[1]=e.v[1];
} }
bool operator != (const SimpleEdge & e) bool operator != (const SimpleEdge & e)
@ -158,7 +162,7 @@ namespace vcg {
typename MESH::ScalarType Perimeter() typename MESH::ScalarType Perimeter()
{ {
MESH::ScalarType sum=0; typename MESH::ScalarType sum=0;
face::Pos<typename MESH::FaceType> ip = p; face::Pos<typename MESH::FaceType> ip = p;
do do
{ {
@ -211,7 +215,7 @@ namespace vcg {
int holesize = 0; int holesize = 0;
Box3<MESH::ScalarType> hbox; Box3<typename MESH::ScalarType> hbox;
if(ep.v->IsR()) hbox.Add(ep.v->cP()); if(ep.v->IsR()) hbox.Add(ep.v->cP());
face::Pos<typename MESH::FaceType> init; face::Pos<typename MESH::FaceType> init;
init = ep; init = ep;
@ -229,7 +233,7 @@ namespace vcg {
template<class MESH,class STL_CONTAINER_HOLES> template<class MESH,class STL_CONTAINER_HOLES>
void FindHole(MESH &m, STL_CONTAINER_HOLES & H) void FindHole(MESH &m, STL_CONTAINER_HOLES & H)
{ {
MESH::FaceIterator pf; typename MESH::FaceIterator pf;
int holesize; int holesize;
for (pf=m.face.begin(); pf!=m.face.end(); ++pf) for (pf=m.face.begin(); pf!=m.face.end(); ++pf)
if( !(*pf).IsD() && (*pf).IsW() ) if( !(*pf).IsD() && (*pf).IsW() )
@ -247,7 +251,7 @@ namespace vcg {
ep.Set(&*pf, j, (*pf).V(j)); ep.Set(&*pf, j, (*pf).V(j));
holesize = 0; holesize = 0;
Box3<MESH::ScalarType> hbox; Box3<typename MESH::ScalarType> hbox;
if(ep.v->IsR()) hbox.Add(ep.v->cP()); if(ep.v->IsR()) hbox.Add(ep.v->cP());
face::Pos<typename MESH::FaceType> init; face::Pos<typename MESH::FaceType> init;
init = ep; init = ep;
@ -318,7 +322,7 @@ namespace vcg {
ScalarType w = p2.Norm()*p1.Norm(); ScalarType w = p2.Norm()*p1.Norm();
if(w==0) angle =90; if(w==0) angle =90;
MSH_TYPE::ScalarType p = (p2*p1); ScalarType p = (p2*p1);
p= p/w; p= p/w;
p = acos(p); p = acos(p);
if(p < -1) p = -1; if(p < -1) p = -1;
@ -508,12 +512,9 @@ namespace vcg {
tmp = e0; tmp = e0;
tmp.FlipE(); tmp.FlipV(); tmp.FlipE(); tmp.FlipV();
Point3f n3=(e0.VFlip()->N() + e0.v->N() + tmp.v->N() ) / 3; Point3f n3=(e0.VFlip()->N() + e0.v->N() + tmp.v->N() ) / 3;
MSH_TYPE::ScalarType qt,qp; dihedral = std::max(Angle(n1,n2),Angle(n1,n3));
qt = Angle(n1,n2);
qp = Angle(n1,n3);
dihedral = std::max(qt,qp);
MSH_TYPE::ScalarType ar; ScalarType ar;
ar = ( (e0.VFlip()->P() - e0.v->P()) ^ ( e1.v->P() - e0.v->P()) ).Norm() ; ar = ( (e0.VFlip()->P() - e0.v->P()) ^ ( e1.v->P() - e0.v->P()) ).Norm() ;
/*ScalarType l1 = Distance( e0.v->P(),e1.v->P()); /*ScalarType l1 = Distance( e0.v->P(),e1.v->P());
@ -649,7 +650,7 @@ namespace vcg {
ScalarType w = p2.Norm()*p1.Norm(); ScalarType w = p2.Norm()*p1.Norm();
if(w==0) angle =90; if(w==0) angle =90;
MSH_TYPE::ScalarType p = (p2*p1); ScalarType p = (p2*p1);
p= p/w; p= p/w;
p = acos(p); p = acos(p);
if(p < -1) p = -1; if(p < -1) p = -1;
@ -726,7 +727,7 @@ namespace vcg {
e1.f->FFp(e1.z)=f; e1.f->FFp(e1.z)=f;
e1.f->FFi(e1.z)=1; e1.f->FFi(e1.z)=1;
std::vector< MSH_TYPE::FaceType>::iterator it; typename std::vector<typename MSH_TYPE::FaceType>::iterator it;
for(it = vf.begin();it!= vf.end();++it) for(it = vf.begin();it!= vf.end();++it)
{ {
if(!it->IsD()) if(!it->IsD())
@ -804,7 +805,7 @@ namespace vcg {
{ {
int holesize=0; int holesize=0;
Box3<MESH::ScalarType> hbox; Box3<typename MESH::ScalarType> hbox;
hbox.Add(sp.v->cP()); hbox.Add(sp.v->cP());
do do
@ -837,9 +838,9 @@ namespace vcg {
void fillHoleEar(MESH &m, tri::HoleInfo<MESH> &h ,int UBIT) void fillHoleEar(MESH &m, tri::HoleInfo<MESH> &h ,int UBIT)
{ {
//Aggiungo le facce e aggiorno il puntatore alla faccia! //Aggiungo le facce e aggiorno il puntatore alla faccia!
std::vector<MESH::FacePointer *> app; std::vector<typename MESH::FacePointer *> app;
app.push_back( &h.p.f ); app.push_back( &h.p.f );
MESH::FaceIterator f = tri::Allocator<MESH>::AddFaces(m, h.size-2, app); typename MESH::FaceIterator f = tri::Allocator<MESH>::AddFaces(m, h.size-2, app);
h.Refresh(m); h.Refresh(m);
assert(h.p.IsBorder());//test fondamentale altrimenti qualcosa s'e' rotto! assert(h.p.IsBorder());//test fondamentale altrimenti qualcosa s'e' rotto!
@ -852,7 +853,7 @@ namespace vcg {
bool fitted = false; bool fitted = false;
int cnt=h.size; int cnt=h.size;
MESH::FaceIterator tmp; typename MESH::FaceIterator tmp;
make_heap(H.begin(), H.end()); make_heap(H.begin(), H.end());
@ -863,7 +864,7 @@ namespace vcg {
EAR en0,en1; EAR en0,en1;
MESH::FaceIterator Fadd = f; typename MESH::FaceIterator Fadd = f;
if(H.back().IsUpToDate() && !H.back().IsConvex()) if(H.back().IsUpToDate() && !H.back().IsConvex())
{ {
@ -919,7 +920,7 @@ namespace vcg {
template<class MESH, class EAR> template<class MESH, class EAR>
void holeFillingEar(MESH &m, int sizeHole,bool Selected = false) void holeFillingEar(MESH &m, int sizeHole,bool Selected = false)
{ {
MESH::FaceIterator fi; typename MESH::FaceIterator fi;
std::vector<tri::HoleInfo<MESH> > vinfo; std::vector<tri::HoleInfo<MESH> > vinfo;
int UBIT = MESH::FaceType::LastBitFlag(); int UBIT = MESH::FaceType::LastBitFlag();
@ -955,8 +956,8 @@ namespace vcg {
}//!IsD() }//!IsD()
}//for principale!!! }//for principale!!!
std::vector<tri::HoleInfo<MESH> >::iterator ith; typename std::vector<typename tri::HoleInfo<MESH> >::iterator ith;
tri::HoleInfo<MESH> app; typename tri::HoleInfo<MESH> app;
for(ith = vinfo.begin(); ith!= vinfo.end(); ++ith) for(ith = vinfo.begin(); ith!= vinfo.end(); ++ith)
{ {
app=(tri::HoleInfo<MESH>)*ith; app=(tri::HoleInfo<MESH>)*ith;
@ -979,9 +980,9 @@ namespace vcg {
void fillHoleInt(MESH &m, tri::HoleInfo<MESH> &h ,int UBIT, std::vector<typename MESH::FaceType > vf) void fillHoleInt(MESH &m, tri::HoleInfo<MESH> &h ,int UBIT, std::vector<typename MESH::FaceType > vf)
{ {
//Aggiungo le facce e aggiorno il puntatore alla faccia! //Aggiungo le facce e aggiorno il puntatore alla faccia!
std::vector<MESH::FacePointer *> app; std::vector<typename MESH::FacePointer *> app;
app.push_back( &h.p.f ); app.push_back( &h.p.f );
MESH::FaceIterator f = tri::Allocator<MESH>::AddFaces(m, h.size-2, app); typename MESH::FaceIterator f = tri::Allocator<MESH>::AddFaces(m, h.size-2, app);
h.Refresh(m); h.Refresh(m);
assert(h.p.IsBorder());//test fondamentale altrimenti qualcosa s'e' rotto! assert(h.p.IsBorder());//test fondamentale altrimenti qualcosa s'e' rotto!
std::vector<EAR > H; //vettore di orecchie std::vector<EAR > H; //vettore di orecchie
@ -992,7 +993,7 @@ namespace vcg {
bool fitted = false; bool fitted = false;
int cnt=h.size; int cnt=h.size;
MESH::FaceIterator tmp; typename MESH::FaceIterator tmp;
make_heap(H.begin(), H.end()); make_heap(H.begin(), H.end());
//finche' il buco non e' chiuso o non ci sono piu' orecchie da analizzare. //finche' il buco non e' chiuso o non ci sono piu' orecchie da analizzare.
@ -1000,7 +1001,7 @@ namespace vcg {
{ {
pop_heap(H.begin(), H.end()); pop_heap(H.begin(), H.end());
EAR en0,en1; EAR en0,en1;
MESH::FaceIterator Fadd = f; typename MESH::FaceIterator Fadd = f;
if(H.back().IsUpToDate() && !H.back().IsConvex()) if(H.back().IsUpToDate() && !H.back().IsConvex())
{ {
if(H.back().Degen()){ if(H.back().Degen()){
@ -1056,8 +1057,8 @@ namespace vcg {
template<class MESH, class EAR> template<class MESH, class EAR>
void holeFillingIntersection(MESH &m, int sizeHole,bool Selected = false) void holeFillingIntersection(MESH &m, int sizeHole,bool Selected = false)
{ {
MESH::FaceIterator fi; typename MESH::FaceIterator fi;
std::vector<tri::HoleInfo<MESH> > vinfo; std::vector<typename tri::HoleInfo<MESH> > vinfo;
int UBIT = fi->LastBitFlag(); int UBIT = fi->LastBitFlag();
for(fi = m.face.begin(); fi!=m.face.end(); ++fi) for(fi = m.face.begin(); fi!=m.face.end(); ++fi)
@ -1092,10 +1093,10 @@ namespace vcg {
}//!IsD() }//!IsD()
}//for principale!!! }//for principale!!!
std::vector<MESH::FaceType > vf; std::vector<typename MESH::FaceType > vf;
face::Pos<typename MESH::FaceType>sp; face::Pos<typename MESH::FaceType>sp;
face::Pos<typename MESH::FaceType>ap; face::Pos<typename MESH::FaceType>ap;
std::vector<tri::HoleInfo<MESH> >::iterator ith; typename std::vector<tri::HoleInfo<MESH> >::iterator ith;
tri::HoleInfo<MESH> app; tri::HoleInfo<MESH> app;
for(ith = vinfo.begin(); ith!= vinfo.end(); ++ith) for(ith = vinfo.begin(); ith!= vinfo.end(); ++ith)
{ {
@ -1138,25 +1139,25 @@ namespace vcg {
TrivialEarN(){} TrivialEarN(){}
TrivialEarN(const face::Pos<typename MSH_TYPE::FaceType> & ep) TrivialEarN(const face::Pos<typename MSH_TYPE::FaceType> & ep)
{ {
e0=ep; this->e0=ep;
assert(e0.IsBorder()); assert(this->e0.IsBorder());
e1=e0; this->e1=this->e0;
e1.NextB(); this->e1.NextB();
ComputeQuality(); ComputeQuality();
} }
static typename MSH_TYPE::VertexType &PreferredNormal() static typename MSH_TYPE::VertexType &PreferredNormal()
{ {
static MSH_TYPE::VertexType nn; static typename MSH_TYPE::VertexType nn;
return nn; return nn;
} }
void ComputeQuality(){ void ComputeQuality(){
Point3d nn= -Normal( e0.VFlip()->P(), e0.v->P(), e1.v->P()); Point3d nn= -Normal( this->e0.VFlip()->P(), this->e0.v->P(), this->e1.v->P());
quality = Distance(e0.VFlip()->P(),e1.v->P()); this->quality = Distance(this->e0.VFlip()->P(),this->e1.v->P());
if(nn*PreferredNormal() < -0.1) if(nn*PreferredNormal() < -0.1)
quality*=1000000; this->quality*=1000000;
}; };

21
vcg/math/disjoint_set.h
View File

@ -24,7 +24,24 @@
#ifndef VCG_MATH_UNIONSET_H #ifndef VCG_MATH_UNIONSET_H
#define VCG_MATH_UNIONSET_H #define VCG_MATH_UNIONSET_H
// some stuff for portable hashes...
#ifdef WIN32
#ifndef __MINGW32__
#include <hash_map> #include <hash_map>
#include <hash_set>
#define STDEXT stdext
#else
#include <ext/hash_map>
#include <ext/hash_set>
#define STDEXT __gnu_cxx
#endif
#else
#include <ext/hash_map>
#include <ext/hash_set>
#define STDEXT __gnu_cxx
#endif
#include <vector> #include <vector>
#include <assert.h> #include <assert.h>
@ -51,7 +68,7 @@ namespace vcg
typedef OBJECT_TYPE* ObjectPointer; typedef OBJECT_TYPE* ObjectPointer;
typedef std::pair< ObjectPointer, int > hPair; typedef std::pair< ObjectPointer, int > hPair;
typedef typename stdext::hash_map< ObjectPointer, int >::iterator hIterator; typedef typename STDEXT::hash_map< ObjectPointer, int >::iterator hIterator;
typedef std::pair< hIterator, bool > hInsertResult; typedef std::pair< hIterator, bool > hInsertResult;
public: public:
@ -115,7 +132,7 @@ namespace vcg
} }
protected: protected:
stdext::hash_map< OBJECT_TYPE*, int > inserted_objects; STDEXT::hash_map< OBJECT_TYPE*, int > inserted_objects;
std::vector< DisjointSetNode > nodes; std::vector< DisjointSetNode > nodes;
}; };
};// end of namespace vcg };// end of namespace vcg