From c018a60762bfd3d21507383723ecd3ea9ebac719 Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Fri, 1 Apr 2011 17:09:03 +0000
Subject: [PATCH] Ongoing Rearrangement of filepath

replaced the path to comply the filepaths modification.
The replacements are as follows:

/complex/trimesh/base.h --> /complex/complex.h
/complex/trimesh/allocate.h --> /complex/allocate.h
/complex/trimesh/append.h --> /complex/append.h
/complex/trimesh/ --> /complex/algorithms/
/complex/local_optimization/ ---> /complex/algorithms/local_optimization/
/complex/local_optimization.h ---> /complex/algorithms/local_optimization.h
/complex/intersection.h ---> /complex/algorithms/intersection.h
/complex/boundary.h ---> /complex/algorithms/boundary.h
---
 apps/metro/mesh_type.h                             |  2 +-
 apps/metro/metro.cpp                               |  6 +++---
 apps/metro/sampling.h                              |  4 ++--
 apps/pivoting/cmesh.h                              |  4 ++--
 apps/pivoting/glarea.cpp                           |  6 +++---
 apps/pivoting/glarea.h                             |  2 +-
 apps/pivoting/pivot.h                              |  2 +-
 apps/plyrefine/main.cpp                            | 10 +++++-----
 apps/ptx2ply/ptx2ply.cpp                           | 12 ++++++------
 apps/shadevis/shadevis.cpp                         |  8 ++++----
 apps/test/extractors/extractor/Definitions.h       |  4 ++--
 apps/test/extractors/extractor/main.cpp            |  4 ++--
 apps/test/trackball_SDL/trackball_sdl.cpp          |  6 +++---
 apps/test/trimesh_SDL/trimesh_sdl.cpp              |  6 +++---
 apps/tetra_decimator/main.cpp                      |  4 ++--
 apps/tridecimator/tridecimator.cpp                 | 10 +++++-----
 apps/trimeshinfo/trimeshinfo.cpp                   | 14 +++++++-------
 .../trimeshinfo1.01/trimeshinfo101/main.cpp        | 10 +++++-----
 18 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/apps/metro/mesh_type.h b/apps/metro/mesh_type.h
index a14015c7..53e05c05 100644
--- a/apps/metro/mesh_type.h
+++ b/apps/metro/mesh_type.h
@@ -40,7 +40,7 @@ just color and quality on the vertex
 
 #include <math.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
 // Vertex, Face, Mesh and Grid definitions.
 #include <vcg/simplex/vertex/base.h>
diff --git a/apps/metro/metro.cpp b/apps/metro/metro.cpp
index c478a727..a72e7540 100644
--- a/apps/metro/metro.cpp
+++ b/apps/metro/metro.cpp
@@ -104,10 +104,10 @@ using namespace std;
 #include "defs.h"
 #include "sampling.h"
 #include "mesh_type.h"
-#include <vcg/complex/trimesh/update/edges.h>
-#include <vcg/complex/trimesh/update/bounding.h>
+#include <vcg/complex/algorithms/update/edges.h>
+#include <vcg/complex/algorithms/update/bounding.h>
 #include <vcg/math/histogram.h>
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/algorithms/clean.h>
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export.h>
 
diff --git a/apps/metro/sampling.h b/apps/metro/sampling.h
index d1eeaf58..587cf99c 100644
--- a/apps/metro/sampling.h
+++ b/apps/metro/sampling.h
@@ -101,12 +101,12 @@ instantiate GridStaticPtr on the simplexClass template.
 
 #include <time.h>
 //#include "min_dist_point.h"
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/algorithms/closest.h>
 #include <vcg/space/box3.h>
 #include <vcg/math/histogram.h>
 #include <vcg/space/color4.h>
 #include <vcg/simplex/face/distance.h>
-#include <vcg/complex/trimesh/update/color.h>
+#include <vcg/complex/algorithms/update/color.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/space/index/aabb_binary_tree/aabb_binary_tree.h>
 #include <vcg/space/index/octree.h>
diff --git a/apps/pivoting/cmesh.h b/apps/pivoting/cmesh.h
index c8f867db..973361fc 100644
--- a/apps/pivoting/cmesh.h
+++ b/apps/pivoting/cmesh.h
@@ -5,8 +5,8 @@
 #include <vcg/simplex/face/base.h>
 #include <vcg/simplex/face/pos.h>
 #include <vcg/simplex/face/topology.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/update/normal.h>
 
 #include <vector>
 
diff --git a/apps/pivoting/glarea.cpp b/apps/pivoting/glarea.cpp
index 99447c34..e18beb8c 100644
--- a/apps/pivoting/glarea.cpp
+++ b/apps/pivoting/glarea.cpp
@@ -12,9 +12,9 @@
 #include "cmesh.h"
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/flag.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/flag.h>
 
 #include <vcg/space/normal_extrapolation.h>
 //#include "curvature.h"
diff --git a/apps/pivoting/glarea.h b/apps/pivoting/glarea.h
index 8c38e335..ad3edef4 100644
--- a/apps/pivoting/glarea.h
+++ b/apps/pivoting/glarea.h
@@ -7,7 +7,7 @@
 
 #include <vcg/space/box3.h>
 #include <wrap/gui/trackball.h>
-#include <vcg/complex/trimesh/create/ball_pivoting.h>
+#include <vcg/complex/algorithms/create/ball_pivoting.h>
 #include "cmesh.h"
 
 
diff --git a/apps/pivoting/pivot.h b/apps/pivoting/pivot.h
index 49fe7263..fd64429f 100644
--- a/apps/pivoting/pivot.h
+++ b/apps/pivoting/pivot.h
@@ -6,7 +6,7 @@
 
 
 #include "vcg/space/index/grid_static_ptr.h"
-#include "vcg/complex/trimesh/closest.h"
+#include "vcg/complex/algorithms/closest.h"
 
 namespace vcg {
 namespace tri {
diff --git a/apps/plyrefine/main.cpp b/apps/plyrefine/main.cpp
index 9c1721bb..d96de2f9 100644
--- a/apps/plyrefine/main.cpp
+++ b/apps/plyrefine/main.cpp
@@ -2,12 +2,12 @@
 // mesh definition 
 #include <vcg/simplex/vertex/with/afvn.h>
 #include <vcg/simplex/face/with/af.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/refine.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/refine.h>
 
 // input output
 #include <wrap/io_trimesh/import_ply.h>
diff --git a/apps/ptx2ply/ptx2ply.cpp b/apps/ptx2ply/ptx2ply.cpp
index e4066514..a4f58971 100644
--- a/apps/ptx2ply/ptx2ply.cpp
+++ b/apps/ptx2ply/ptx2ply.cpp
@@ -12,12 +12,12 @@
 #include <vcg/simplex/face/component.h>
 #include <vcg/simplex/face/component_rt.h>
 
-#include<vcg/complex/trimesh/base.h>
-#include<vcg/complex/trimesh/create/platonic.h>
-#include<vcg/complex/trimesh/update/flag.h>
-#include<vcg/complex/trimesh/update/normal.h>
-#include<vcg/complex/trimesh/update/color.h>
-#include<vcg/complex/trimesh/clean.h>
+#include<vcg/complex/complex.h>
+#include<vcg/complex/algorithms/create/platonic.h>
+#include<vcg/complex/algorithms/update/flag.h>
+#include<vcg/complex/algorithms/update/normal.h>
+#include<vcg/complex/algorithms/update/color.h>
+#include<vcg/complex/algorithms/clean.h>
 
 #include<wrap/io_trimesh/import_ply.h>
 #include<wrap/io_trimesh/export_ply.h>
diff --git a/apps/shadevis/shadevis.cpp b/apps/shadevis/shadevis.cpp
index 8b4cc7e8..7b9488ad 100644
--- a/apps/shadevis/shadevis.cpp
+++ b/apps/shadevis/shadevis.cpp
@@ -74,12 +74,12 @@ Added GPL comments
 #include <vcg/simplex/vertex/with/vcvn.h>
 #include <vcg/simplex/face/with/fn.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 #include<wrap/io_trimesh/export_ply.h>
 #include<wrap/io_trimesh/import_ply.h>
-#include<vcg/complex/trimesh/update/normal.h>
-#include<vcg/complex/trimesh/update/bounding.h>
-#include<vcg/complex/trimesh/update/color.h>
+#include<vcg/complex/algorithms/update/normal.h>
+#include<vcg/complex/algorithms/update/bounding.h>
+#include<vcg/complex/algorithms/update/color.h>
 
 #include "visshader.h"
 using namespace vcg;
diff --git a/apps/test/extractors/extractor/Definitions.h b/apps/test/extractors/extractor/Definitions.h
index 9d00b649..a5506a50 100644
--- a/apps/test/extractors/extractor/Definitions.h
+++ b/apps/test/extractors/extractor/Definitions.h
@@ -4,8 +4,8 @@
 #include <vcg/simplex/vertex/with/afvmvn.h>
 #include <vcg/simplex/face/with/afavfn.h>
 #include <vcg/simplex/edge/with/ae.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/allocate.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/allocate.h>
 
 typedef float ScalarType;
 
diff --git a/apps/test/extractors/extractor/main.cpp b/apps/test/extractors/extractor/main.cpp
index 1a3cd6b1..c85866bb 100644
--- a/apps/test/extractors/extractor/main.cpp
+++ b/apps/test/extractors/extractor/main.cpp
@@ -3,8 +3,8 @@
 #include "Definitions.h"
 #include "Volume.h"
 #include "Walker.h"
-#include <vcg/complex/trimesh/create/marching_cubes.h>
-#include <vcg/complex/trimesh/create/extended_marching_cubes.h>
+#include <vcg/complex/algorithms/create/marching_cubes.h>
+#include <vcg/complex/algorithms/create/extended_marching_cubes.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/apps/test/trackball_SDL/trackball_sdl.cpp b/apps/test/trackball_SDL/trackball_sdl.cpp
index 70c4b36c..0043f408 100644
--- a/apps/test/trackball_SDL/trackball_sdl.cpp
+++ b/apps/test/trackball_SDL/trackball_sdl.cpp
@@ -30,11 +30,11 @@ the object rather than rotate it in front of the camera.
 /*include the base definition for the vertex, face, and meshes */
 #include <vcg/simplex/vertex/base.h>
 #include <vcg/simplex/face/base.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
 /*include the algorihm that update bounding box and normals*/
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/normal.h>
 
 /*include the importer from disk*/
 #include <wrap/io_trimesh/import.h>
diff --git a/apps/test/trimesh_SDL/trimesh_sdl.cpp b/apps/test/trimesh_SDL/trimesh_sdl.cpp
index babee31a..11aa4d40 100644
--- a/apps/test/trimesh_SDL/trimesh_sdl.cpp
+++ b/apps/test/trimesh_SDL/trimesh_sdl.cpp
@@ -49,11 +49,11 @@ Initial Relase
 #include <vcg/simplex/face/base.h>
 
 /*include the base definition for the trimesh*/
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
 /*include the algorihm that update bounding box and normals*/
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/normal.h>
 
 /*include the importer from disk*/
 #include <wrap/io_trimesh/import.h>
diff --git a/apps/tetra_decimator/main.cpp b/apps/tetra_decimator/main.cpp
index eacf4957..d1376cf1 100644
--- a/apps/tetra_decimator/main.cpp
+++ b/apps/tetra_decimator/main.cpp
@@ -22,8 +22,8 @@ class MyTetrahedron : public vcg::TetraATAVTQ<MyVertex,MyTetrahedron>{};
 class MyTMesh: public vcg::tetra::Tetramesh< std::vector<MyVertex>, std::vector<MyTetrahedron > >{};
 
 
-#include <vcg/complex/local_optimization.h>
-#include <vcg/complex/local_optimization/tetra_edge_collapse.h>
+#include <vcg/complex/algorithms/local_optimization.h>
+#include <vcg/complex/algorithms/local_optimization/tetra_edge_collapse.h>
 
 
 vcg::LocalOptimization<MyTMesh> *loc;
diff --git a/apps/tridecimator/tridecimator.cpp b/apps/tridecimator/tridecimator.cpp
index 6a530fe2..27daabeb 100644
--- a/apps/tridecimator/tridecimator.cpp
+++ b/apps/tridecimator/tridecimator.cpp
@@ -10,21 +10,21 @@ using namespace std;
 #include <vcg/simplex/vertex/base.h>
 #include <vcg/simplex/face/base.h>
 #include <vcg/simplex/edge/base.h>
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
 #include <vcg/math/quadric.h>
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/algorithms/clean.h>
 
 // io
 #include <wrap/io_trimesh/import.h>
 #include <wrap/io_trimesh/export_ply.h>
 
 // update
-#include <vcg/complex/trimesh/update/topology.h>
+#include <vcg/complex/algorithms/update/topology.h>
 
 // local optimization
-#include <vcg/complex/local_optimization.h>
-#include <vcg/complex/local_optimization/tri_edge_collapse_quadric.h>
+#include <vcg/complex/algorithms/local_optimization.h>
+#include <vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h>
 
 using namespace vcg;
 using namespace tri;
diff --git a/apps/trimeshinfo/trimeshinfo.cpp b/apps/trimeshinfo/trimeshinfo.cpp
index 7ac9868e..656d6394 100644
--- a/apps/trimeshinfo/trimeshinfo.cpp
+++ b/apps/trimeshinfo/trimeshinfo.cpp
@@ -188,12 +188,12 @@ using namespace std;
 #include <vcg/simplex/face/base.h>
 #include <vcg/simplex/face/component.h>
 
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/edges.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/edges.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/clean.h>
 #include <vcg/space/intersection/triangle_triangle3.h>
 
 #include <vcg/math/histogram.h>
@@ -201,7 +201,7 @@ using namespace std;
 #include <wrap/io_trimesh/export.h>
 
 #include <vcg/simplex/face/pos.h> 
-#include <vcg/complex/trimesh/inertia.h> 
+#include <vcg/complex/algorithms/inertia.h> 
 
 #include "XMLTree.h"
 
diff --git a/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/main.cpp b/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/main.cpp
index e5d92ba9..29403b93 100644
--- a/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/main.cpp
+++ b/apps/trimeshinfo/trimeshinfo1.01/trimeshinfo101/main.cpp
@@ -57,11 +57,11 @@ using namespace std;
 #include<vcg/simplex/face/pos.h>   // mi sembra di averlo aggiunto!
 
 
-#include<vcg/complex/trimesh/base.h>
-#include<vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/edges.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/clean.h>
+#include<vcg/complex/complex.h>
+#include<vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/edges.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/clean.h>
 #include <vcg/space/intersection/triangle_triangle3.h>
 #include <vcg/math/histogram.h>
 #include <wrap/io_trimesh/import.h>