From 1acf0ce1003a3daf5093fc743a2ed153186c9d75 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni <paolo.cignoni@isti.cnr.it>
Date: Fri, 24 Mar 2017 15:23:43 +0100
Subject: [PATCH] Still cleaning samples

---
 .../trimesh_cylinder_clipping.pro                |  5 +----
 .../trimesh_disk_parametrization.cpp             |  7 -------
 .../trimesh_disk_parametrization.pro             | 16 +++-------------
 .../trimesh_montecarlo_sampling.cpp}             |  2 +-
 .../trimesh_montecarlo_sampling.pro              |  3 +++
 .../trimesh_montecarlosampling.pro               |  3 ---
 6 files changed, 8 insertions(+), 28 deletions(-)
 rename apps/sample/{trimesh_montecarlosampling/trimesh_montecarlosampling.cpp => trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.cpp} (96%)
 create mode 100644 apps/sample/trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.pro
 delete mode 100644 apps/sample/trimesh_montecarlosampling/trimesh_montecarlosampling.pro

diff --git a/apps/sample/trimesh_cylinder_clipping/trimesh_cylinder_clipping.pro b/apps/sample/trimesh_cylinder_clipping/trimesh_cylinder_clipping.pro
index f4d46b74..13251b8f 100644
--- a/apps/sample/trimesh_cylinder_clipping/trimesh_cylinder_clipping.pro
+++ b/apps/sample/trimesh_cylinder_clipping/trimesh_cylinder_clipping.pro
@@ -1,5 +1,2 @@
 include(../common.pri)
-SOURCES += trimesh_cylclip.cpp ../../../wrap/ply/plylib.cpp
-
-HEADERS += \
-    cylinder_clip.h
+SOURCES += trimesh_cylinder_clipping.cpp ../../../wrap/ply/plylib.cpp
diff --git a/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp b/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp
index c02b62c3..fb2b37dd 100644
--- a/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp
+++ b/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.cpp
@@ -21,13 +21,6 @@
 *                                                                           *
 ****************************************************************************/
 
-#include<vcg/simplex/vertex/base.h>
-#include<vcg/simplex/vertex/component.h>
-
-#include <vcg/complex/used_types.h>
-
-#include<vcg/simplex/face/base.h>
-#include<vcg/simplex/face/component.h>
 #include<vcg/complex/complex.h>
 #include<vcg/complex/algorithms/create/platonic.h>
 #include<vcg/complex/algorithms/parametrization/poisson_solver.h>
diff --git a/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.pro b/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.pro
index 966c1d09..5f133c00 100644
--- a/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.pro
+++ b/apps/sample/trimesh_disk_parametrization/trimesh_disk_parametrization.pro
@@ -1,13 +1,3 @@
-#DEFINES += VCG_USE_EIGEN
-
-TARGET = trimesh_diskparam
-DEPENDPATH += . ../../..
-
-INCLUDEPATH += . ../../..
-
-CONFIG += console stl
-TEMPLATE = app
-SOURCES += trimesh_diskparam.cpp ../../../wrap/ply/plylib.cpp
-
-# Mac specific Config required to avoid to make application bundles
-CONFIG -= app_bundle
+include(../common.pri)
+TARGET = trimesh_disk_parametrization
+SOURCES += trimesh_disk_parametrization.cpp ../../../wrap/ply/plylib.cpp
diff --git a/apps/sample/trimesh_montecarlosampling/trimesh_montecarlosampling.cpp b/apps/sample/trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.cpp
similarity index 96%
rename from apps/sample/trimesh_montecarlosampling/trimesh_montecarlosampling.cpp
rename to apps/sample/trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.cpp
index 0feb939c..2b5e5a4d 100644
--- a/apps/sample/trimesh_montecarlosampling/trimesh_montecarlosampling.cpp
+++ b/apps/sample/trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.cpp
@@ -71,7 +71,7 @@ int main( int argc, char **argv )
   tri::SurfaceSampling<MyMesh,tri::TrivialSampler<MyMesh> >::Montecarlo(m,mps,10000000);
   int t1=clock();
 
-  printf("Computed a montecarlo distribution of %i vertices radius is %6.3f\n",sampleVec.size(),float(t1-t0)/float(CLOCKS_PER_SEC));
+  printf("Computed a montecarlo distribution of %lu vertices radius is %6.3f\n",sampleVec.size(),float(t1-t0)/float(CLOCKS_PER_SEC));
 
   return 0;
 }
diff --git a/apps/sample/trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.pro b/apps/sample/trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.pro
new file mode 100644
index 00000000..6e74042b
--- /dev/null
+++ b/apps/sample/trimesh_montecarlo_sampling/trimesh_montecarlo_sampling.pro
@@ -0,0 +1,3 @@
+include(../common.pri)
+TARGET = trimesh_montecarlo_sampling
+SOURCES += trimesh_montecarlo_sampling.cpp
diff --git a/apps/sample/trimesh_montecarlosampling/trimesh_montecarlosampling.pro b/apps/sample/trimesh_montecarlosampling/trimesh_montecarlosampling.pro
deleted file mode 100644
index 833ee3bf..00000000
--- a/apps/sample/trimesh_montecarlosampling/trimesh_montecarlosampling.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../common.pri)
-TARGET = trimesh_montecarlosampling
-SOURCES += trimesh_montecarlosampling.cpp