diff --git a/apps/sample/trimesh_hole/trimesh_hole.cpp b/apps/sample/trimesh_hole/trimesh_hole.cpp index 68adbcb2..c9587a1c 100644 --- a/apps/sample/trimesh_hole/trimesh_hole.cpp +++ b/apps/sample/trimesh_hole/trimesh_hole.cpp @@ -49,7 +49,7 @@ class MyMesh : public tri::TriMesh< vector, vector >{}; class MyDelaunayFlip: public vcg::tri::TriEdgeFlip< MyMesh, MyDelaunayFlip > { public: typedef vcg::tri::TriEdgeFlip< MyMesh, MyDelaunayFlip > TEF; - inline MyDelaunayFlip( const TEF::PosType &p, int i) :TEF(p,i){} + inline MyDelaunayFlip( const TEF::PosType &p, int i,BaseParameterClass *pp) :TEF(p,i,pp){} }; bool callback(int percent, const char *str) { @@ -96,7 +96,7 @@ int main(int argc,char ** argv){ int holeSize = atoi(argv[2]); if(algorithm < 0 && algorithm > 4) { - printf("Error in algorithm's selection\n",algorithm); + printf("Error in algorithm's selection %i\n",algorithm); exit(0); } @@ -128,6 +128,7 @@ int main(int argc,char ** argv){ } AVG=sumA/numA; + //tri::Hole holeFiller; switch(algorithm) { case 1: tri::Hole::EarCuttingFill >(m,holeSize,false); break; @@ -177,7 +178,8 @@ int main(int argc,char ** argv){ f->V(2)->ClearW(); } } - vcg::LocalOptimization Fs(m); + BaseParameterClass pp; + vcg::LocalOptimization Fs(m,&pp); Fs.SetTargetMetric(0.0f); Fs.Init(); Fs.DoOptimization(); @@ -204,7 +206,7 @@ int main(int argc,char ** argv){ } //info print - printf("\r Raffino [%d] - > %d",i,vf.size()); + printf("\r Refining [%d] - > %d",i,int(vf.size())); i++; FPP.clear(); @@ -238,14 +240,15 @@ int main(int argc,char ** argv){ added.push_back( &(*f2) ); } - vcg::LocalOptimization FlippingSession(m); + BaseParameterClass pp; + vcg::LocalOptimization FlippingSession(m,&pp); FlippingSession.SetTargetMetric(0.0f); FlippingSession.Init(); FlippingSession.DoOptimization(); }while(!vf.empty()); - vcg::LocalOptimization Fiss(m); + vcg::LocalOptimization Fiss(m,&pp); Fiss.SetTargetMetric(0.0f); Fiss.Init(); Fiss.DoOptimization(); diff --git a/apps/sample/trimesh_intersection/trimesh_intersection.cpp b/apps/sample/trimesh_intersection/trimesh_intersection.cpp index 00e29529..015f88bd 100644 --- a/apps/sample/trimesh_intersection/trimesh_intersection.cpp +++ b/apps/sample/trimesh_intersection/trimesh_intersection.cpp @@ -16,9 +16,9 @@ using namespace std; #include #include //#include -#include -#include -#include +//#include +//#include +//#include // VCG File Format Importer/Exporter #include @@ -44,7 +44,7 @@ class MyVertex : public Vertex< MyUsedTypes, vertex::Coord3f, vertex::BitFlags, class MyEdge : public Edge< MyUsedTypes, edge::VertexRef, edge::EVAdj> {}; class MyFace : public Face {}; -class MyEdgeMesh: public vcg::edg::EdgeMesh< vector, vector > {}; +class MyEdgeMesh: public tri::TriMesh< vector, vector > {}; class MyMesh : public tri::TriMesh< vector, vector >{}; @@ -96,23 +96,16 @@ int main(int argc,char ** argv) vcg::Plane3 plane(distance, direction); - double avg_length; // average length of the edges MyEdgeMesh edge_mesh; // returned EdgeMesh (i.e. the cross-section) - // Create a static grid (for fast indexing) and fill it - TriMeshGrid static_grid; - static_grid.Set(m.face.begin(), m.face.end()); - std::vector intersected_cells; - - vcg::Intersection(plane, - edge_mesh, avg_length, &static_grid, intersected_cells); + vcg::IntersectionPlaneMesh(m, plane, edge_mesh); // Compute bounding box - vcg::edg::UpdateBounding::Box(edge_mesh); + vcg::tri::UpdateBounding::Box(edge_mesh); // export the cross-section - edg::io::SVGProperties pro; - if (edg::io::ExporterSVG::Save(edge_mesh, "out.svg",pro)) + tri::io::SVGProperties pro; + if (tri::io::ExporterSVG::Save(edge_mesh, "out.svg",pro)) printf(" The cross-intersection has been successfully saved (OUT.SVG).\n"); else printf(" The cross-intersection cannot be saved.\n");