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

updated the voronoisampling sample to show the new features of the recent changes to the voronoi relaxation framework.

This commit is contained in:
Paolo Cignoni 2013-12-20 11:47:58 +00:00
parent e4311e9d5a
commit c0b621c810
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp
View File

@ -63,17 +63,18 @@ class EmMesh : public tri::TriMesh< vector<EmVertex>, vector<EmEdge>, vector<
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
MyMesh baseMesh, outMesh, polyMesh; MyMesh baseMesh;
if(argc < 4 ) if(argc < 4 )
{ {
printf("Usage trimesh_voronoisampling mesh sampleNum iterNum edgeCollapsePerc \n"); printf("Usage trimesh_voronoisampling mesh sampleNum iterNum\n");
return -1; return -1;
} }
int sampleNum = atoi(argv[2]); int sampleNum = atoi(argv[2]);
int iterNum = atoi(argv[3]); int iterNum = atoi(argv[3]);
float collapseShortEdgePerc = atof(argv[4]);
printf("Reading %s and sampling %i points with %i iteration and using %f variance\n",argv[1],sampleNum,iterNum,collapseShortEdgePerc); bool fixCornerFlag=true;
printf("Reading %s and sampling %i points with %i iteration",argv[1],sampleNum,iterNum);
int ret= tri::io::ImporterPLY<MyMesh>::Open(baseMesh,argv[1]); int ret= tri::io::ImporterPLY<MyMesh>::Open(baseMesh,argv[1]);
if(ret!=0) if(ret!=0)
{ {
@ -81,6 +82,8 @@ int main( int argc, char **argv )
return -1; return -1;
} }
tri::VoronoiProcessingParameter vpp;
tri::Clean<MyMesh>::RemoveUnreferencedVertex(baseMesh); tri::Clean<MyMesh>::RemoveUnreferencedVertex(baseMesh);
tri::Allocator<MyMesh>::CompactEveryVector(baseMesh); tri::Allocator<MyMesh>::CompactEveryVector(baseMesh);
tri::UpdateTopology<MyMesh>::VertexFace(baseMesh); tri::UpdateTopology<MyMesh>::VertexFace(baseMesh);
@ -95,18 +98,21 @@ int main( int argc, char **argv )
MyMesh poissonCornerMesh; MyMesh poissonCornerMesh;
std::vector<Point3f> sampleVec; std::vector<Point3f> sampleVec;
tri::TrivialSampler<MyMesh> mps(sampleVec); tri::TrivialSampler<MyMesh> mps(sampleVec);
tri::SurfaceSampling<MyMesh,tri::TrivialSampler<MyMesh> >::VertexBorderCorner(baseMesh,mps,math::ToRad(150.f)); if(fixCornerFlag)
tri::Build(poissonCornerMesh,sampleVec); {
tri::io::ExporterPLY<MyMesh>::Save(poissonCornerMesh,"cornerMesh.ply"); tri::SurfaceSampling<MyMesh,tri::TrivialSampler<MyMesh> >::VertexBorderCorner(baseMesh,mps,math::ToRad(150.f));
sampleVec.clear(); tri::Build(poissonCornerMesh,sampleVec);
tri::SurfaceSampling<MyMesh,tri::TrivialSampler<MyMesh> >::PoissonDiskPruning(mps, poissonCornerMesh, radius, pp); tri::io::ExporterPLY<MyMesh>::Save(poissonCornerMesh,"cornerMesh.ply");
tri::Build(poissonCornerMesh,sampleVec); sampleVec.clear();
tri::io::ExporterPLY<MyMesh>::Save(poissonCornerMesh,"poissonCornerMesh.ply"); tri::SurfaceSampling<MyMesh,tri::TrivialSampler<MyMesh> >::PoissonDiskPruning(mps, poissonCornerMesh, radius, pp);
tri::Build(poissonCornerMesh,sampleVec);
// Now save the corner as Fixed Seeds for later... tri::io::ExporterPLY<MyMesh>::Save(poissonCornerMesh,"poissonCornerMesh.ply");
std::vector<MyVertex *> fixedSeedVec; // Now save the corner as Fixed Seeds for later...
tri::VoronoiProcessing<MyMesh>::SeedToVertexConversion(baseMesh,sampleVec,fixedSeedVec); std::vector<MyVertex *> fixedSeedVec;
tri::VoronoiProcessing<MyMesh, tri::EuclideanDistance<MyMesh> >::FixVertexVector(baseMesh,fixedSeedVec); tri::VoronoiProcessing<MyMesh>::SeedToVertexConversion(baseMesh,sampleVec,fixedSeedVec);
tri::VoronoiProcessing<MyMesh, tri::EuclideanDistance<MyMesh> >::FixVertexVector(baseMesh,fixedSeedVec);
vpp.preserveFixedSeed=true;
}
// -- Build a sampling with points on the border // -- Build a sampling with points on the border
MyMesh borderMesh,poissonBorderMesh; MyMesh borderMesh,poissonBorderMesh;
@ -119,7 +125,7 @@ int main( int argc, char **argv )
pp.preGenMesh = &poissonCornerMesh; pp.preGenMesh = &poissonCornerMesh;
pp.preGenFlag=true; pp.preGenFlag=true;
sampleVec.clear(); sampleVec.clear();
tri::SurfaceSampling<MyMesh,tri::TrivialSampler<MyMesh> >::PoissonDiskPruning(mps, borderMesh, radius, pp); tri::SurfaceSampling<MyMesh,tri::TrivialSampler<MyMesh> >::PoissonDiskPruning(mps, borderMesh, radius*0.8f, pp);
tri::Build(poissonBorderMesh,sampleVec); tri::Build(poissonBorderMesh,sampleVec);
tri::io::ExporterPLY<MyMesh>::Save(poissonBorderMesh,"PoissonEdgeMesh.ply"); tri::io::ExporterPLY<MyMesh>::Save(poissonBorderMesh,"PoissonEdgeMesh.ply");
@ -149,13 +155,9 @@ int main( int argc, char **argv )
baseMesh.vert[i].SetS(); baseMesh.vert[i].SetS();
} }
tri::VoronoiProcessingParameter vpp;
vpp.deleteUnreachedRegionFlag=true; vpp.deleteUnreachedRegionFlag=true;
vpp.preserveFixedSeed=true;
vpp.collapseShortEdge=true;
vpp.collapseShortEdgePerc=collapseShortEdgePerc;
vpp.triangulateRegion = true; vpp.triangulateRegion = true;
vpp.unbiasedSeedFlag =true; vpp.triangulateRegion = false;
vpp.geodesicRelaxFlag=false; vpp.geodesicRelaxFlag=false;
vpp.constrainSelectedSeed=true; vpp.constrainSelectedSeed=true;
@ -165,11 +167,16 @@ int main( int argc, char **argv )
tri::VoronoiProcessing<MyMesh, tri::EuclideanDistance<MyMesh> >::VoronoiRelaxing(baseMesh, seedVec, iterNum, dd, vpp); tri::VoronoiProcessing<MyMesh, tri::EuclideanDistance<MyMesh> >::VoronoiRelaxing(baseMesh, seedVec, iterNum, dd, vpp);
int t1=clock(); int t1=clock();
MyMesh voroMesh, voroPoly, delaMesh;
// Get the result in some pleasant form converting it to a real voronoi diagram. // Get the result in some pleasant form converting it to a real voronoi diagram.
tri::VoronoiProcessing<MyMesh, tri::EuclideanDistance<MyMesh> >::ConvertVoronoiDiagramToMesh(baseMesh,outMesh,polyMesh, seedVec, dd, vpp); tri::VoronoiProcessing<MyMesh, tri::EuclideanDistance<MyMesh> >::ConvertVoronoiDiagramToMesh(baseMesh,voroMesh,voroPoly, seedVec, dd, vpp);
tri::io::ExporterPLY<MyMesh>::Save(baseMesh,"base.ply",tri::io::Mask::IOM_VERTCOLOR + tri::io::Mask::IOM_VERTQUALITY ); tri::io::ExporterPLY<MyMesh>::Save(baseMesh,"base.ply",tri::io::Mask::IOM_VERTCOLOR + tri::io::Mask::IOM_VERTQUALITY );
tri::io::ExporterPLY<MyMesh>::Save(outMesh,"out.ply",tri::io::Mask::IOM_VERTCOLOR + tri::io::Mask::IOM_FLAGS ); tri::io::ExporterPLY<MyMesh>::Save(voroMesh,"voroMesh.ply",tri::io::Mask::IOM_VERTCOLOR + tri::io::Mask::IOM_FLAGS );
tri::io::ExporterPLY<MyMesh>::Save(polyMesh,"poly.ply",tri::io::Mask::IOM_VERTCOLOR| tri::io::Mask::IOM_EDGEINDEX ,false); tri::io::ExporterPLY<MyMesh>::Save(voroPoly,"voroPoly.ply",tri::io::Mask::IOM_VERTCOLOR| tri::io::Mask::IOM_EDGEINDEX ,false);
tri::VoronoiProcessing<MyMesh, tri::EuclideanDistance<MyMesh> >::ConvertDelaunayTriangulationToMesh(baseMesh,delaMesh, seedVec, dd, vpp);
tri::io::ExporterPLY<MyMesh>::Save(delaMesh,"delaMesh.ply",tri::io::Mask::IOM_VERTCOLOR + tri::io::Mask::IOM_VERTQUALITY );
// tri::io::ImporterPLY<MyMesh>::Open(baseMesh,argv[1]); // tri::io::ImporterPLY<MyMesh>::Open(baseMesh,argv[1]);
// tri::UpdateTopology<MyMesh>::VertexFace(baseMesh); // tri::UpdateTopology<MyMesh>::VertexFace(baseMesh);