From 4fb89211304d3cfca0bea23e085cf06c988121f4 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni Date: Thu, 2 Mar 2017 10:12:11 +0100 Subject: [PATCH] Small compilation error (changed interface...) (and other harmless warning removed) --- apps/sample/edgemesh_sampling/edgemesh_sampling.cpp | 4 ++-- apps/sample/polygonmesh_base/polygonmesh.cpp | 2 +- apps/sample/sample.pro | 1 - .../trimesh_voronoisampling/trimesh_voronoisampling.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/sample/edgemesh_sampling/edgemesh_sampling.cpp b/apps/sample/edgemesh_sampling/edgemesh_sampling.cpp index 45198fb0..3d2ee0aa 100644 --- a/apps/sample/edgemesh_sampling/edgemesh_sampling.cpp +++ b/apps/sample/edgemesh_sampling/edgemesh_sampling.cpp @@ -74,11 +74,11 @@ int main( int argc, char **argv ) tri::UpdateTopology::VertexEdge(e); tri::Clean::SelectNonManifoldVertexOnEdgeMesh(e); - printf("Selected vertices %i\n",tri::UpdateSelection::VertexCount(e)); + printf("Selected vertices %lu\n",tri::UpdateSelection::VertexCount(e)); tri::Clean::SplitSelectedVertexOnEdgeMesh(e); printf("Out mesh has %i vert %i edges\n",e.vn,e.en); tri::Clean::SelectCreaseVertexOnEdgeMesh(e,math::ToRad(30.f)); - printf("Selected vertices %i\n",tri::UpdateSelection::VertexCount(e)); + printf("Selected vertices %lu\n",tri::UpdateSelection::VertexCount(e)); tri::Clean::SplitSelectedVertexOnEdgeMesh(e); printf("Out mesh has %i vert %i edges\n",e.vn,e.en); diff --git a/apps/sample/polygonmesh_base/polygonmesh.cpp b/apps/sample/polygonmesh_base/polygonmesh.cpp index c67eb5f5..d1f498ca 100644 --- a/apps/sample/polygonmesh_base/polygonmesh.cpp +++ b/apps/sample/polygonmesh_base/polygonmesh.cpp @@ -126,7 +126,7 @@ class PMesh: public PMesh pm; TMesh tm0; -int main(int argc, char *argv[]) { +int main(int /*argc*/, char *argv[]) { int loadmask; diff --git a/apps/sample/sample.pro b/apps/sample/sample.pro index d2ad96c6..2888b8f9 100644 --- a/apps/sample/sample.pro +++ b/apps/sample/sample.pro @@ -12,7 +12,6 @@ SUBDIRS = trimesh_base \ trimesh_edge \ trimesh_fitting \ trimesh_geodesic \ -# trimesh_ext_mc \ trimesh_hole \ trimesh_inertia \ trimesh_intersection \ diff --git a/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp b/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp index 42a819a5..58fcae97 100644 --- a/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp +++ b/apps/sample/trimesh_voronoisampling/trimesh_voronoisampling.cpp @@ -120,7 +120,7 @@ int main( int argc, char **argv ) // Now save the corner as Fixed Seeds for later... std::vector fixedSeedVec; tri::VoronoiProcessing::SeedToVertexConversion(baseMesh,sampleVec,fixedSeedVec); - tri::VoronoiProcessing >::FixVertexVector(baseMesh,fixedSeedVec); + tri::VoronoiProcessing >::MarkVertexVectorAsFixed(baseMesh,fixedSeedVec); vpp.preserveFixedSeed=true; }