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

updated to the latest changed to the closest and grid changes

This commit is contained in:
Paolo Cignoni 2012-07-12 08:03:22 +00:00
parent d9132e6cbc
commit 5380a6f7f6
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/sample/trimesh_closest/trimesh_closest.cpp
View File

@ -143,7 +143,7 @@ bool UnitTest_Closest(const char *filename1, int sampleNum, float dispPerc, std:
if(useEdge && useWrap) if(useEdge && useWrap)
for(size_t i=0;i<MontecarloSamples.size();++i) for(size_t i=0;i<MontecarloSamples.size();++i)
{ {
resultVec[i]=tri::Index(mr,tri::GetClosestFaceRT(mr,TRGrid,MontecarloSamples[i], maxDist,dist,closest)); resultVec[i]=tri::Index(mr,tri::GetClosestFaceEP(mr,TRGrid,MontecarloSamples[i], maxDist,dist,closest));
if(resultVec[i]) avgDist += double(dist); if(resultVec[i]) avgDist += double(dist);
} }
if(!useEdge && useWrap) if(!useEdge && useWrap)
@ -157,7 +157,7 @@ bool UnitTest_Closest(const char *filename1, int sampleNum, float dispPerc, std:
typedef tri::FaceTmark<MeshType> MarkerFace; typedef tri::FaceTmark<MeshType> MarkerFace;
MarkerFace mf; MarkerFace mf;
mf.SetMesh(&mr); mf.SetMesh(&mr);
face::PointDistanceFunctor<ScalarType> PDistFunct; face::PointDistanceBaseFunctor<ScalarType> PDistFunct;
for(size_t i=0;i<MontecarloSamples.size();++i) for(size_t i=0;i<MontecarloSamples.size();++i)
{ {
resultVec[i]=tri::Index(mr,TRGrid.GetClosest(PDistFunct,mf,MontecarloSamples[i],maxDist,dist,closest)); resultVec[i]=tri::Index(mr,TRGrid.GetClosest(PDistFunct,mf,MontecarloSamples[i],maxDist,dist,closest));
@ -195,14 +195,19 @@ int main(int argc ,char**argv)
std::vector<int> resultVecRT10; std::vector<int> resultVecRT10;
std::vector<int> resultVecBS01; std::vector<int> resultVecBS01;
std::vector<int> resultVecBS00; std::vector<int> resultVecBS00;
UnitTest_Closest<RTMesh,true,true,true> (argv[1],sampleNum,dispPerc,resultVecRT11); UnitTest_Closest<RTMesh, true, true, true> (argv[1],sampleNum,dispPerc,resultVecRT11);
UnitTest_Closest<RTMesh,true,true,false> (argv[1],sampleNum,dispPerc,resultVecRT11); UnitTest_Closest<RTMesh, true, true, false> (argv[1],sampleNum,dispPerc,resultVecRT11);
UnitTest_Closest<RTMesh,false,true,true> (argv[1],sampleNum,dispPerc,resultVecRT01); UnitTest_Closest<RTMesh, true, false, true> (argv[1],sampleNum,dispPerc,resultVecRT01);
UnitTest_Closest<RTMesh,true,false,true> (argv[1],sampleNum,dispPerc,resultVecRT00); UnitTest_Closest<RTMesh, true, false, false> (argv[1],sampleNum,dispPerc,resultVecRT00);
UnitTest_Closest<RTMesh,false,false,true> (argv[1],sampleNum,dispPerc,resultVecRT10); UnitTest_Closest<RTMesh, false, true, true> (argv[1],sampleNum,dispPerc,resultVecRT10);
UnitTest_Closest<BaseMesh,false,true,true> (argv[1],sampleNum,dispPerc,resultVecBS01); UnitTest_Closest<RTMesh, false, true, false> (argv[1],sampleNum,dispPerc,resultVecRT10);
UnitTest_Closest<BaseMesh,false,false,true> (argv[1],sampleNum,dispPerc,resultVecBS01); UnitTest_Closest<RTMesh, false, false, true> (argv[1],sampleNum,dispPerc,resultVecRT10);
UnitTest_Closest<BaseMesh,false,false,false>(argv[1],sampleNum,dispPerc,resultVecBS01); UnitTest_Closest<RTMesh, false, false, false> (argv[1],sampleNum,dispPerc,resultVecRT10);
UnitTest_Closest<BaseMesh,false, true, true> (argv[1],sampleNum,dispPerc,resultVecBS01);
UnitTest_Closest<BaseMesh,false, true, false> (argv[1],sampleNum,dispPerc,resultVecBS01);
UnitTest_Closest<BaseMesh,false, false, true>(argv[1],sampleNum,dispPerc,resultVecBS01);
UnitTest_Closest<BaseMesh,false, false, false>(argv[1],sampleNum,dispPerc,resultVecBS01);
for(size_t i=0;i<resultVecRT11.size();++i) for(size_t i=0;i<resultVecRT11.size();++i)
{ {