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

added Target Faces to possibly stop the PerFaceDijsktraCompute 

added selected vertex to avoid passing trought in PerVertexDijsktraCompute
This commit is contained in:
Nico Pietroni 2012-12-26 18:47:55 +00:00
parent 0e61819cb7
commit ec693dd06a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/complex/algorithms/geodesic.h
View File

@ -387,7 +387,8 @@ It is just a simple wrapper of the basic Compute()
static void PerFaceDijsktraCompute(MeshType &m, const std::vector<FacePointer> &seedVec, static void PerFaceDijsktraCompute(MeshType &m, const std::vector<FacePointer> &seedVec,
ScalarType maxDistanceThr = std::numeric_limits<ScalarType>::max(), ScalarType maxDistanceThr = std::numeric_limits<ScalarType>::max(),
std::vector<FacePointer> *InInterval=NULL std::vector<FacePointer> *InInterval=NULL,
FacePointer FaceTarget=NULL
) )
{ {
tri::RequireFFAdjacency(m); tri::RequireFFAdjacency(m);
@ -421,6 +422,7 @@ It is just a simple wrapper of the basic Compute()
{ {
pop_heap(Heap.begin(),Heap.end()); pop_heap(Heap.begin(),Heap.end());
FacePointer curr = (Heap.back()).f; FacePointer curr = (Heap.back()).f;
if ((FaceTarget!=NULL)&&(curr==FaceTarget))return;
Heap.pop_back(); Heap.pop_back();
for(int i=0;i<3;++i) for(int i=0;i<3;++i)
@ -451,7 +453,7 @@ It is just a simple wrapper of the basic Compute()
static void PerVertexDijsktraCompute(MeshType &m, const std::vector<VertexPointer> &seedVec, static void PerVertexDijsktraCompute(MeshType &m, const std::vector<VertexPointer> &seedVec,
ScalarType maxDistanceThr = std::numeric_limits<ScalarType>::max(), ScalarType maxDistanceThr = std::numeric_limits<ScalarType>::max(),
std::vector<VertexPointer> *InInterval=NULL std::vector<VertexPointer> *InInterval=NULL,bool avoid_selected=false
) )
{ {
tri::RequireVFAdjacency(m); tri::RequireVFAdjacency(m);
@ -493,6 +495,7 @@ It is just a simple wrapper of the basic Compute()
for(size_t i=0;i<vertVec.size();++i) for(size_t i=0;i<vertVec.size();++i)
{ {
VertexPointer nextV = vertVec[i]; VertexPointer nextV = vertVec[i];
if ((avoid_selected)&&(nextV->IsS()))continue;
ScalarType nextDist = curr->Q() + DistanceFunctor()(curr,nextV); ScalarType nextDist = curr->Q() + DistanceFunctor()(curr,nextV);
if( (nextDist < maxDistanceThr) && if( (nextDist < maxDistanceThr) &&
(!tri::IsMarked(m,nextV) || nextDist < nextV->Q()) ) (!tri::IsMarked(m,nextV) || nextDist < nextV->Q()) )