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

- added optional parameter to return the closest vertex as a vertex attribute 

- added a tolerance to check triangle inequality
This commit is contained in:
ganovelli 2009-01-07 14:25:46 +00:00
parent 6f533063ae
commit 8ae63ef1c3
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
vcg/complex/trimesh/geodesic.h
View File

@ -161,7 +161,8 @@ class Geo{
MeshType & m, MeshType & m,
std::vector<VertDist> & _inputfrontier, std::vector<VertDist> & _inputfrontier,
ScalarType & max_distance, ScalarType & max_distance,
bool farthestOnBorder = false bool farthestOnBorder = false,
typename MeshType::PerVertexAttributeHandle<VertexPointer> * sources = NULL
) )
{ {
bool isLeaf; bool isLeaf;
@ -205,6 +206,8 @@ class Geo{
pop_heap(frontier.begin(),frontier.end(),pred()); pop_heap(frontier.begin(),frontier.end(),pred());
curr = (frontier.back()).v; curr = (frontier.back()).v;
curr_s = (*TD)[curr].source; curr_s = (*TD)[curr].source;
if(sources!=NULL)
(*sources)[curr] = curr_s;
d_heap = (frontier.back()).d; d_heap = (frontier.back()).d;
frontier.pop_back(); frontier.pop_back();
@ -235,12 +238,13 @@ class Geo{
const ScalarType & d_pw1 = (*TD)[pw1].d; const ScalarType & d_pw1 = (*TD)[pw1].d;
{ {
ScalarType inter = (curr->P() - pw1->P()).Norm(); const ScalarType inter = (curr->P() - pw1->P()).Norm();
const ScalarType tol = (inter + d_curr + d_pw1)*.0001f;
if ( ((*TD)[pw1].source != (*TD)[curr].source)||// not the same source if ( ((*TD)[pw1].source != (*TD)[curr].source)||// not the same source
(inter + d_curr < d_pw1 ) || (inter + d_curr < d_pw1 +tol ) ||
(inter + d_pw1 < d_curr ) || (inter + d_pw1 < d_curr +tol ) ||
(d_curr + d_pw1 < inter ) // triangular inequality (d_curr + d_pw1 < inter +tol ) // triangular inequality
) )
curr_d = d_curr + (pw->P()-curr->P()).Norm(); curr_d = d_curr + (pw->P()-curr->P()).Norm();
else else
@ -283,14 +287,15 @@ public:
static void FarthestVertex( MeshType & m, static void FarthestVertex( MeshType & m,
std::vector<VertexPointer> & fro, std::vector<VertexPointer> & fro,
VertexPointer & farthest, VertexPointer & farthest,
ScalarType & distance){ ScalarType & distance,
typename MeshType::PerVertexAttributeHandle<VertexPointer> * sources = NULL){
typename std::vector<VertexPointer>::iterator fi; typename std::vector<VertexPointer>::iterator fi;
std::vector<VertDist>fr; std::vector<VertDist>fr;
for( fi = fro.begin(); fi != fro.end() ; ++fi) for( fi = fro.begin(); fi != fro.end() ; ++fi)
fr.push_back(VertDist(*fi,-1)); fr.push_back(VertDist(*fi,0.0));
farthest = Visit(m,fr,distance,false); farthest = Visit(m,fr,distance,false,sources);
} }
/* /*
Given a mesh and a pointers to a vertex-source (source), assigns the approximated geodesic Given a mesh and a pointers to a vertex-source (source), assigns the approximated geodesic
@ -315,27 +320,30 @@ public:
static void FarthestBVertex(MeshType & m, static void FarthestBVertex(MeshType & m,
std::vector<VertexPointer> & fro, std::vector<VertexPointer> & fro,
VertexPointer & farthest, VertexPointer & farthest,
ScalarType & distance){ ScalarType & distance,
typename MeshType::PerVertexAttributeHandle<VertexPointer> * sources = NULL
){
typename std::vector<VertexPointer>::iterator fi; typename std::vector<VertexPointer>::iterator fi;
std::vector<VertDist>fr; std::vector<VertDist>fr;
for( fi = fro.begin(); fi != fro.end() ; ++fi) for( fi = fro.begin(); fi != fro.end() ; ++fi)
fr.push_back(VertDist(*fi,-1)); fr.push_back(VertDist(*fi,-1));
farthest = Visit(m,fr,distance,true); farthest = Visit(m,fr,distance,true,sources);
} }
/* /*
Same as FarthestPoint but the returned pointer is to a border vertex Same as FarthestPoint but the returned pointer is to a border vertex
Note: update the field Q() of the vertices Note: update the field Q() of the vertices
*/ */
static void FarthestBVertex( MeshType & m, static void FarthestBVertex( MeshType & m,
VertexPointer seed, VertexPointer seed,
VertexPointer & farthest, VertexPointer & farthest,
ScalarType & distance){ ScalarType & distance,
typename MeshType::PerVertexAttributeHandle<VertexPointer> * sources = NULL){
std::vector<VertexPointer> fro; std::vector<VertexPointer> fro;
fro.push_back( seed ); fro.push_back( seed );
VertexPointer v0; VertexPointer v0;
FarthestBVertex(m,fro,v0,distance); FarthestBVertex(m,fro,v0,distance,sources);
farthest = v0; farthest = v0;
} }
@ -344,7 +352,8 @@ public:
Note: update the field Q() of the vertices Note: update the field Q() of the vertices
*/ */
static void DistanceFromBorder( MeshType & m, static void DistanceFromBorder( MeshType & m,
ScalarType & distance ScalarType & distance,
typename MeshType::PerVertexAttributeHandle<VertexPointer> * sources = NULL
){ ){
std::vector<VertexPointer> fro; std::vector<VertexPointer> fro;
VertexIterator vi; VertexIterator vi;
@ -352,7 +361,7 @@ public:
for(vi = m.vert.begin(); vi != m.vert.end(); ++vi) for(vi = m.vert.begin(); vi != m.vert.end(); ++vi)
if( (*vi).IsB()) if( (*vi).IsB())
fro.push_back(&(*vi)); fro.push_back(&(*vi));
FarthestVertex(m,fro,farthest,distance); FarthestVertex(m,fro,farthest,distance,sources);
} }
}; };