From 5909925947e403a21046cd227845a73fb3d36335 Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Fri, 1 Apr 2011 17:07:57 +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
---
 .../aabb_binary_tree/aabb_binary_tree.cpp     | 10 +--
 apps/sample/polygonmesh_base/polygonmesh.cpp  | 14 ++--
 .../polygonmesh_quadsimpl/quadsimpl.cpp       | 20 +++---
 apps/sample/trimesh_QT/glarea.h               |  8 +--
 .../trimesh_attribute/trimesh_attribute.cpp   |  4 +-
 .../trimesh_ball_pivoting.cpp                 | 14 ++--
 apps/sample/trimesh_base/trimesh_base.cpp     |  6 +-
 .../trimesh_base/trimesh_definition.cpp       |  2 +-
 .../trimesh_clustering/trimesh_clustering.cpp | 14 ++--
 apps/sample/trimesh_hole/trimesh_hole.cpp     | 20 +++---
 .../trimesh_intersection.cpp                  | 14 ++--
 .../trimesh_isosurface/trimesh_isosurface.cpp | 10 +--
 apps/sample/trimesh_join/trimesh_join.cpp     | 12 ++--
 .../sample/trimesh_optional/mesh_definition.h |  2 +-
 .../trimesh_optional/trimesh_optional.cpp     | 68 +++++++++----------
 .../trimesh_optional/trimesh_optional_occ.cpp |  4 +-
 .../trimesh_optional/trimesh_optional_ocf.cpp |  4 +-
 .../trimesh_simpdata_simp.cpp                 |  4 +-
 apps/sample/trimesh_pos_demo/glwidget.cpp     |  6 +-
 apps/sample/trimesh_pos_demo/mesh_type.h      |  2 +-
 .../trimesh_pos_demo/trimesh_pos_demo.cpp     |  6 +-
 .../trimesh_pos_demo/trimesh_vfiter_demo.cpp  |  6 +-
 apps/sample/trimesh_ray/trimesh_ray.cpp       | 22 +++---
 apps/sample/trimesh_refine/trimesh_refine.cpp | 14 ++--
 apps/sample/trimesh_smooth/trimesh_smooth.cpp | 10 +--
 .../trimesh_split_vertex.cpp                  |  4 +-
 .../trimesh_topology/trimesh_topology.cpp     |  6 +-
 27 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/apps/sample/aabb_binary_tree/aabb_binary_tree.cpp b/apps/sample/aabb_binary_tree/aabb_binary_tree.cpp
index e5fdfc9e..74c6a8d5 100644
--- a/apps/sample/aabb_binary_tree/aabb_binary_tree.cpp
+++ b/apps/sample/aabb_binary_tree/aabb_binary_tree.cpp
@@ -12,11 +12,11 @@
 #include<vcg/simplex/face/component_rt.h>
 
 #include<vcg/simplex/face/distance.h>
-#include<vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/create/platonic.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/edges.h>
-#include <vcg/complex/trimesh/update/flag.h>
+#include<vcg/complex/complex.h>
+#include <vcg/complex/algorithms/create/platonic.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/edges.h>
+#include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/space/intersection3.h>
 
 #include <vcg/space/index/aabb_binary_tree/aabb_binary_tree.h>
diff --git a/apps/sample/polygonmesh_base/polygonmesh.cpp b/apps/sample/polygonmesh_base/polygonmesh.cpp
index 4c146c50..689cb8b9 100644
--- a/apps/sample/polygonmesh_base/polygonmesh.cpp
+++ b/apps/sample/polygonmesh_base/polygonmesh.cpp
@@ -33,15 +33,15 @@
 #include <vcg/connectors/hedge.h>
 
 /*include the base definition for the trimesh*/
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
 /*include the algorithms for updating: */
-#include <vcg/complex/trimesh/update/topology.h>	/* topology */
-#include <vcg/complex/trimesh/update/bounding.h>	/* bounding box */
-#include <vcg/complex/trimesh/update/normal.h>		/* normal */
+#include <vcg/complex/algorithms/update/topology.h>	/* topology */
+#include <vcg/complex/algorithms/update/bounding.h>	/* bounding box */
+#include <vcg/complex/algorithms/update/normal.h>		/* normal */
 
 /*include the algorithms for mesh fixing  */
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/algorithms/clean.h>
 
 /*include the importer from disk*/
 #include <wrap/io_trimesh/import.h>
@@ -50,13 +50,13 @@
 #include <wrap/io_trimesh/export_ply.h>
 
 /* include the support for polygon meshes (function to convert from/to trimesh)*/
-#include <vcg/complex/trimesh/polygon_support.h>
+#include <vcg/complex/algorithms/polygon_support.h>
 
 /* include the support for polygon meshes (the component for the face )*/
 #include <vcg/simplex/face/component_polygon.h>
 
 /* include the support for half edges */
-#include <vcg/complex/trimesh/update/halfedge_indexed.h>
+#include <vcg/complex/algorithms/update/halfedge_indexed.h>
 
 
 using namespace vcg;
diff --git a/apps/sample/polygonmesh_quadsimpl/quadsimpl.cpp b/apps/sample/polygonmesh_quadsimpl/quadsimpl.cpp
index 786a102f..05ca0354 100644
--- a/apps/sample/polygonmesh_quadsimpl/quadsimpl.cpp
+++ b/apps/sample/polygonmesh_quadsimpl/quadsimpl.cpp
@@ -35,15 +35,15 @@
 #include <vcg/connectors/hedge.h>
 
 /*include the base definition for the trimesh*/
-#include <vcg/complex/trimesh/base.h>
+#include <vcg/complex/complex.h>
 
 /*include the algorithms for updating: */
-#include <vcg/complex/trimesh/update/topology.h>	/* topology */
-#include <vcg/complex/trimesh/update/bounding.h>	/* bounding box */
-#include <vcg/complex/trimesh/update/normal.h>		/* normal */
+#include <vcg/complex/algorithms/update/topology.h>	/* topology */
+#include <vcg/complex/algorithms/update/bounding.h>	/* bounding box */
+#include <vcg/complex/algorithms/update/normal.h>		/* normal */
 
 /*include the algorithms for mesh fixing  */
-#include <vcg/complex/trimesh/clean.h>
+#include <vcg/complex/algorithms/clean.h>
 
 /*include the importer from disk*/
 #include <wrap/io_trimesh/import.h>
@@ -51,21 +51,21 @@
 #include <wrap/io_trimesh/export_off.h>
 
 /* include the support for polygon meshes (function to convert from/to trimesh)*/
-#include <vcg/complex/trimesh/polygon_support.h>
+#include <vcg/complex/algorithms/polygon_support.h>
 
 /* include the support for polygon meshes (the component for the face )*/
 #include <vcg/simplex/face/component_polygon.h>
 
 /* include the support for half edges */
-#include <vcg/complex/trimesh/update/halfedge_indexed.h>
+#include <vcg/complex/algorithms/update/halfedge_indexed.h>
 
-#include <vcg/complex/local_optimization/quad_diag_collapse.h>
+#include <vcg/complex/algorithms/local_optimization/quad_diag_collapse.h>
 
-#include <vcg/complex/trimesh/update/edges.h>
+#include <vcg/complex/algorithms/update/edges.h>
 
 #include <vcg/simplex/face/component_rt.h>
 
-#include <vcg/complex/trimesh/update/fitmaps.h>
+#include <vcg/complex/algorithms/update/fitmaps.h>
 
 using namespace vcg;
 using namespace std;
diff --git a/apps/sample/trimesh_QT/glarea.h b/apps/sample/trimesh_QT/glarea.h
index e174ec51..7c38fc37 100644
--- a/apps/sample/trimesh_QT/glarea.h
+++ b/apps/sample/trimesh_QT/glarea.h
@@ -40,10 +40,10 @@ Initial release.
 /// vcg imports
 #include <vcg/simplex/vertex/base.h>
 #include <vcg/simplex/face/base.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/create/platonic.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/create/platonic.h>
 
 /// wrapper imports
 #include <wrap/io_trimesh/import.h>
diff --git a/apps/sample/trimesh_attribute/trimesh_attribute.cpp b/apps/sample/trimesh_attribute/trimesh_attribute.cpp
index f0f781e4..62bf3fd9 100644
--- a/apps/sample/trimesh_attribute/trimesh_attribute.cpp
+++ b/apps/sample/trimesh_attribute/trimesh_attribute.cpp
@@ -3,8 +3,8 @@
 #include<vcg/simplex/vertex/component.h>
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/component.h>
-#include<vcg/complex/trimesh/base.h>
-#include<vcg/complex/trimesh/allocate.h>
+#include<vcg/complex/complex.h>
+#include<vcg/complex/allocate.h>
 
 
 class MyEdge;
diff --git a/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp b/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp
index 4497b07b..d91f4421 100644
--- a/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp
+++ b/apps/sample/trimesh_ball_pivoting/trimesh_ball_pivoting.cpp
@@ -2,19 +2,19 @@
 // mesh definition 
 //#include <vcg/simplex/vertex/with/vn.h>
 //#include <vcg/simplex/face/with/af.h>
-//#include <vcg/complex/trimesh/base.h>
+//#include <vcg/complex/complex.h>
 
 #include<vcg/simplex/vertex/base.h>
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/topology.h>
 
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/create/ball_pivoting.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/create/ball_pivoting.h>
 
 // input output
 #include <wrap/io_trimesh/import_ply.h>
diff --git a/apps/sample/trimesh_base/trimesh_base.cpp b/apps/sample/trimesh_base/trimesh_base.cpp
index 1ee1a160..4843ec90 100644
--- a/apps/sample/trimesh_base/trimesh_base.cpp
+++ b/apps/sample/trimesh_base/trimesh_base.cpp
@@ -30,17 +30,17 @@
 #include<vcg/simplex/face/component.h>
 
 #include<vcg/simplex/face/topology.h>
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 
 // input output
 #include<wrap/io_trimesh/import.h>
 #include<wrap/io_trimesh/export.h>
 
 // topology computation
-#include<vcg/complex/trimesh/update/topology.h>
+#include<vcg/complex/algorithms/update/topology.h>
 
 // normals
-#include<vcg/complex/trimesh/update/normal.h>
+#include<vcg/complex/algorithms/update/normal.h>
 
 using namespace vcg;
 using namespace std;
diff --git a/apps/sample/trimesh_base/trimesh_definition.cpp b/apps/sample/trimesh_base/trimesh_definition.cpp
index c4c590ab..1a6588b8 100644
--- a/apps/sample/trimesh_base/trimesh_definition.cpp
+++ b/apps/sample/trimesh_base/trimesh_definition.cpp
@@ -5,7 +5,7 @@
 #include <vcg/simplex/face/base.h>   
 #include <vcg/simplex/face/component.h>   
 
-#include <vcg/complex/trimesh/base.h>   
+#include <vcg/complex/complex.h>   
 
 class MyEdge;
 class MyFace;
diff --git a/apps/sample/trimesh_clustering/trimesh_clustering.cpp b/apps/sample/trimesh_clustering/trimesh_clustering.cpp
index df9993fc..8a33b117 100644
--- a/apps/sample/trimesh_clustering/trimesh_clustering.cpp
+++ b/apps/sample/trimesh_clustering/trimesh_clustering.cpp
@@ -2,19 +2,19 @@
 // mesh definition 
 //#include <vcg/simplex/vertex/with/vn.h>
 //#include <vcg/simplex/face/with/af.h>
-//#include <vcg/complex/trimesh/base.h>
+//#include <vcg/complex/complex.h>
 
 #include<vcg/simplex/vertex/base.h>
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/topology.h>
 
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/clustering.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/clustering.h>
 
 // input output
 #include <wrap/io_trimesh/import_ply.h>
diff --git a/apps/sample/trimesh_hole/trimesh_hole.cpp b/apps/sample/trimesh_hole/trimesh_hole.cpp
index e0208bce..68adbcb2 100644
--- a/apps/sample/trimesh_hole/trimesh_hole.cpp
+++ b/apps/sample/trimesh_hole/trimesh_hole.cpp
@@ -5,19 +5,19 @@
 #include<vcg/simplex/vertex/base.h>
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/topology.h>
-#include<vcg/complex/trimesh/base.h>
-#include<vcg/complex/trimesh/hole.h>
-#include<vcg/complex/local_optimization.h>
-#include<vcg/complex/local_optimization/tri_edge_flip.h>
-#include<vcg/complex/trimesh/smooth.h>
-#include<vcg/complex/trimesh/refine.h>
+#include<vcg/complex/complex.h>
+#include<vcg/complex/algorithms/hole.h>
+#include<vcg/complex/algorithms/local_optimization.h>
+#include<vcg/complex/algorithms/local_optimization/tri_edge_flip.h>
+#include<vcg/complex/algorithms/smooth.h>
+#include<vcg/complex/algorithms/refine.h>
 
-#include<vcg/complex/trimesh/update/selection.h>
+#include<vcg/complex/algorithms/update/selection.h>
 
 // topology computation
-#include<vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/update/normal.h>
+#include<vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/update/normal.h>
 
 // half edge iterators
 #include<vcg/simplex/face/pos.h>
diff --git a/apps/sample/trimesh_intersection/trimesh_intersection.cpp b/apps/sample/trimesh_intersection/trimesh_intersection.cpp
index 9036c34e..00e29529 100644
--- a/apps/sample/trimesh_intersection/trimesh_intersection.cpp
+++ b/apps/sample/trimesh_intersection/trimesh_intersection.cpp
@@ -7,13 +7,13 @@ using namespace std;
 #include<vcg/simplex/edge/component.h>
 #include<vcg/simplex/vertex/base.h>
 #include<vcg/simplex/face/base.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/intersection.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/complex/algorithms/intersection.h>
 #include <vcg/space/index/grid_static_ptr.h>
 //#include <vcg/simplex/edge/with/ae.h>
 #include <vcg/complex/edgemesh/base.h>
diff --git a/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp b/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp
index 07001b84..bd2ba7bc 100644
--- a/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp
+++ b/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp
@@ -4,11 +4,11 @@
 #include <vcg/math/perlin_noise.h>
 #include <vcg/simplex/vertex/base.h>
 #include <vcg/simplex/face/base.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/allocate.h>
-#include <vcg/complex/trimesh/create/marching_cubes.h>
-#include <vcg/complex/trimesh/create/extended_marching_cubes.h>
-#include <vcg/complex/trimesh/create/mc_trivial_walker.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/allocate.h>
+#include <vcg/complex/algorithms/create/marching_cubes.h>
+#include <vcg/complex/algorithms/create/extended_marching_cubes.h>
+#include <vcg/complex/algorithms/create/mc_trivial_walker.h>
 #include <wrap/io_trimesh/export_ply.h>
 
 
diff --git a/apps/sample/trimesh_join/trimesh_join.cpp b/apps/sample/trimesh_join/trimesh_join.cpp
index aa7b3f57..3f51d3ec 100644
--- a/apps/sample/trimesh_join/trimesh_join.cpp
+++ b/apps/sample/trimesh_join/trimesh_join.cpp
@@ -4,12 +4,12 @@
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/topology.h>
 
-#include<vcg/complex/trimesh/base.h>
-#include<vcg/complex/trimesh/allocate.h>
-#include<vcg/complex/trimesh/append.h>
-#include<vcg/complex/trimesh/clean.h>
-#include<vcg/complex/trimesh/clip.h>
-#include<vcg/complex/trimesh/update/bounding.h>
+#include<vcg/complex/complex.h>
+#include<vcg/complex/allocate.h>
+#include<vcg/complex/append.h>
+#include<vcg/complex/algorithms/clean.h>
+#include<vcg/complex/algorithms/clip.h>
+#include<vcg/complex/algorithms/update/bounding.h>
 
 
 // input output
diff --git a/apps/sample/trimesh_optional/mesh_definition.h b/apps/sample/trimesh_optional/mesh_definition.h
index 6959e843..6acd33d5 100644
--- a/apps/sample/trimesh_optional/mesh_definition.h
+++ b/apps/sample/trimesh_optional/mesh_definition.h
@@ -1,7 +1,7 @@
 #ifndef _MESH_DEF_
 #define _MESH_DEF_
 
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 #include<vcg/simplex/vertex/base.h>
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/topology.h>
diff --git a/apps/sample/trimesh_optional/trimesh_optional.cpp b/apps/sample/trimesh_optional/trimesh_optional.cpp
index 3c5745bf..c9590e8d 100644
--- a/apps/sample/trimesh_optional/trimesh_optional.cpp
+++ b/apps/sample/trimesh_optional/trimesh_optional.cpp
@@ -2,13 +2,13 @@
 #include <time.h>
 
 #include "mesh_definition.h"
-#include<vcg/complex/trimesh/allocate.h>
-#include<vcg/complex/trimesh/create/platonic.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/update/bounding.h>
-#include <vcg/complex/trimesh/refine.h>
+#include<vcg/complex/allocate.h>
+#include<vcg/complex/algorithms/create/platonic.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/update/bounding.h>
+#include <vcg/complex/algorithms/refine.h>
 
 using namespace vcg;
 using namespace std;
@@ -60,33 +60,33 @@ cmof.face.EnableFFAdjacency();
 	cmof.vert.EnableQuality();
 
 	unsigned int hh = 0;
-	for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi,++hh){
-		if(hh%3==0)
-			vcg::tri::Allocator<CMeshOcf>::DeleteVertex(cmof,*vi);
-	}
-
-  for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
-      {
-        if(!(*vi).IsD())
-        {
-          float q =vi->Q();
-          float r =vi->R();
-          int ii = vi - cmof.vert.begin();
-          assert(q==r);
-        }
-      }
-
-      tri::Allocator<CMeshOcf>::CompactVertexVector(cmof);
-      tri::UpdateBounding<CMeshOcf>::Box(cmof);
-      for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
-      {
-        if(!(*vi).IsD())
-        {
-          float q =vi->Q();
-          float r =vi->R();
-          int ii = vi - cmof.vert.begin();
-          assert(q==r);
-        }
+	for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi,++hh){
+		if(hh%3==0)
+			vcg::tri::Allocator<CMeshOcf>::DeleteVertex(cmof,*vi);
+	}
+
+  for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
+      {
+        if(!(*vi).IsD())
+        {
+          float q =vi->Q();
+          float r =vi->R();
+          int ii = vi - cmof.vert.begin();
+          assert(q==r);
+        }
+      }
+
+      tri::Allocator<CMeshOcf>::CompactVertexVector(cmof);
+      tri::UpdateBounding<CMeshOcf>::Box(cmof);
+      for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
+      {
+        if(!(*vi).IsD())
+        {
+          float q =vi->Q();
+          float r =vi->R();
+          int ii = vi - cmof.vert.begin();
+          assert(q==r);
+        }
       }
 
 
diff --git a/apps/sample/trimesh_optional/trimesh_optional_occ.cpp b/apps/sample/trimesh_optional/trimesh_optional_occ.cpp
index 9272aec8..d2e9e1c8 100644
--- a/apps/sample/trimesh_optional/trimesh_optional_occ.cpp
+++ b/apps/sample/trimesh_optional/trimesh_optional_occ.cpp
@@ -4,9 +4,9 @@
 #include <vcg/simplex/face/base.h>   
 #include <vcg/simplex/face/component.h>   
 
-#include <vcg/complex/trimesh/base.h>   
+#include <vcg/complex/complex.h>   
 
-#include<vcg/complex/trimesh/create/platonic.h>
+#include<vcg/complex/algorithms/create/platonic.h>
 
 class MyEdge;
 class MyFace;
diff --git a/apps/sample/trimesh_optional/trimesh_optional_ocf.cpp b/apps/sample/trimesh_optional/trimesh_optional_ocf.cpp
index b110d879..cdbde5bb 100644
--- a/apps/sample/trimesh_optional/trimesh_optional_ocf.cpp
+++ b/apps/sample/trimesh_optional/trimesh_optional_ocf.cpp
@@ -4,9 +4,9 @@
 #include <vcg/simplex/face/base.h>   
 #include <vcg/simplex/face/component.h>   
 
-#include <vcg/complex/trimesh/base.h>   
+#include <vcg/complex/complex.h>   
 
-#include<vcg/complex/trimesh/create/platonic.h>
+#include<vcg/complex/algorithms/create/platonic.h>
 
 class MyEdge;
 class MyFace;
diff --git a/apps/sample/trimesh_optional/trimesh_simpdata_simp.cpp b/apps/sample/trimesh_optional/trimesh_simpdata_simp.cpp
index 91142292..cef4a1ca 100644
--- a/apps/sample/trimesh_optional/trimesh_simpdata_simp.cpp
+++ b/apps/sample/trimesh_optional/trimesh_simpdata_simp.cpp
@@ -5,10 +5,10 @@
 #include <vcg/simplex/face/base.h>   
 #include <vcg/simplex/face/component.h>   
 
-#include <vcg/complex/trimesh/base.h>   
+#include <vcg/complex/complex.h>   
 #include<vcg/container/simple_temporary_data.h>
 
-#include<vcg/complex/trimesh/create/platonic.h>
+#include<vcg/complex/algorithms/create/platonic.h>
 
 class MyEdge;
 class MyFace;
diff --git a/apps/sample/trimesh_pos_demo/glwidget.cpp b/apps/sample/trimesh_pos_demo/glwidget.cpp
index 3f3a6494..b186da52 100644
--- a/apps/sample/trimesh_pos_demo/glwidget.cpp
+++ b/apps/sample/trimesh_pos_demo/glwidget.cpp
@@ -45,9 +45,9 @@ cvs problem during frist committ. repeated
 #include <wrap/gl/picking.h>
 #include <wrap/gl/space.h>
 #include <wrap/gl/pos.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/topology.h>
+#include <vcg/complex/algorithms/update/bounding.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/topology.h>
 
 
 GLWidget::GLWidget(QWidget *parent)
diff --git a/apps/sample/trimesh_pos_demo/mesh_type.h b/apps/sample/trimesh_pos_demo/mesh_type.h
index 10be99d7..b19e3fe8 100644
--- a/apps/sample/trimesh_pos_demo/mesh_type.h
+++ b/apps/sample/trimesh_pos_demo/mesh_type.h
@@ -34,7 +34,7 @@ first draft. Working but  ugly interface. right mouse of the button to place a p
 /** the definition of face */
 #include<vcg/simplex/face/base.h>
 /** definition of triangle mesh */
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 
 /** allocation vertices and faces of triangle mesh */
 #include<wrap/io_trimesh/import_PLY.h>
diff --git a/apps/sample/trimesh_pos_demo/trimesh_pos_demo.cpp b/apps/sample/trimesh_pos_demo/trimesh_pos_demo.cpp
index 6c41cb96..61a889c1 100644
--- a/apps/sample/trimesh_pos_demo/trimesh_pos_demo.cpp
+++ b/apps/sample/trimesh_pos_demo/trimesh_pos_demo.cpp
@@ -5,10 +5,10 @@
 #include <vcg/simplex/face/base.h>   
 #include <vcg/simplex/face/component.h>   
 
-#include <vcg/complex/trimesh/base.h>   
-#include<vcg/complex/trimesh/create/platonic.h>
+#include <vcg/complex/complex.h>   
+#include<vcg/complex/algorithms/create/platonic.h>
 
-#include<vcg/complex/trimesh/update/topology.h>
+#include<vcg/complex/algorithms/update/topology.h>
 
 #include <vcg/simplex/face/pos.h> 
 
diff --git a/apps/sample/trimesh_pos_demo/trimesh_vfiter_demo.cpp b/apps/sample/trimesh_pos_demo/trimesh_vfiter_demo.cpp
index 98653400..c61edf03 100644
--- a/apps/sample/trimesh_pos_demo/trimesh_vfiter_demo.cpp
+++ b/apps/sample/trimesh_pos_demo/trimesh_vfiter_demo.cpp
@@ -5,10 +5,10 @@
 #include <vcg/simplex/face/base.h>   
 #include <vcg/simplex/face/component.h>   
 
-#include <vcg/complex/trimesh/base.h>   
-#include<vcg/complex/trimesh/create/platonic.h>
+#include <vcg/complex/complex.h>   
+#include<vcg/complex/algorithms/create/platonic.h>
 
-#include<vcg/complex/trimesh/update/topology.h>
+#include<vcg/complex/algorithms/update/topology.h>
 
 #include <vcg/simplex/face/pos.h> 
 
diff --git a/apps/sample/trimesh_ray/trimesh_ray.cpp b/apps/sample/trimesh_ray/trimesh_ray.cpp
index 55b84899..94d71c3c 100644
--- a/apps/sample/trimesh_ray/trimesh_ray.cpp
+++ b/apps/sample/trimesh_ray/trimesh_ray.cpp
@@ -6,19 +6,19 @@ using namespace std;
 #include<vcg/simplex/edge/base.h>
 #include<vcg/simplex/vertex/base.h>
 #include<vcg/simplex/face/base.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/quality.h>
-#include <vcg/complex/trimesh/update/color.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/stat.h>
-#include <vcg/complex/trimesh/clean.h>
-#include <vcg/complex/intersection.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/quality.h>
+#include <vcg/complex/algorithms/update/color.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/stat.h>
+#include <vcg/complex/algorithms/clean.h>
+#include <vcg/complex/algorithms/intersection.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/space/index/spatial_hashing.h>
-#include <vcg/complex/trimesh/closest.h>
+#include <vcg/complex/algorithms/closest.h>
 
 // VCG File Format Importer/Exporter
 #include <wrap/io_trimesh/import.h>
diff --git a/apps/sample/trimesh_refine/trimesh_refine.cpp b/apps/sample/trimesh_refine/trimesh_refine.cpp
index 9355a0b8..b802beaa 100644
--- a/apps/sample/trimesh_refine/trimesh_refine.cpp
+++ b/apps/sample/trimesh_refine/trimesh_refine.cpp
@@ -3,15 +3,15 @@
 #include<vcg/simplex/face/component_ocf.h>
 #include<vcg/simplex/face/topology.h>
 
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/refine.h>
-#include <vcg/complex/trimesh/refine_loop.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/normal.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/refine.h>
+#include <vcg/complex/algorithms/refine_loop.h>
 
-#include <vcg/complex/trimesh/bitquad_creation.h>
+#include <vcg/complex/algorithms/bitquad_creation.h>
 
 // input output
 #include <wrap/io_trimesh/import_ply.h>
diff --git a/apps/sample/trimesh_smooth/trimesh_smooth.cpp b/apps/sample/trimesh_smooth/trimesh_smooth.cpp
index 9f2532fc..57e93900 100644
--- a/apps/sample/trimesh_smooth/trimesh_smooth.cpp
+++ b/apps/sample/trimesh_smooth/trimesh_smooth.cpp
@@ -4,13 +4,13 @@
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/topology.h>
 
-#include<vcg/complex/trimesh/base.h>
+#include<vcg/complex/complex.h>
 
-#include <vcg/complex/trimesh/update/topology.h>
-#include <vcg/complex/trimesh/update/normal.h>
+#include <vcg/complex/algorithms/update/topology.h>
+#include <vcg/complex/algorithms/update/normal.h>
 // to clean up a mesh
-#include<vcg/complex/trimesh/clean.h>
-#include<vcg/complex/trimesh/smooth.h>
+#include<vcg/complex/algorithms/clean.h>
+#include<vcg/complex/algorithms/smooth.h>
 
 // input output
 #include <wrap/io_trimesh/import.h>
diff --git a/apps/sample/trimesh_split_vertex/trimesh_split_vertex.cpp b/apps/sample/trimesh_split_vertex/trimesh_split_vertex.cpp
index 044e8abf..228e6863 100644
--- a/apps/sample/trimesh_split_vertex/trimesh_split_vertex.cpp
+++ b/apps/sample/trimesh_split_vertex/trimesh_split_vertex.cpp
@@ -4,8 +4,8 @@
 #include <vcg/simplex/vertex/component_ocf.h>
 #include <vcg/simplex/face/base.h>
 #include <vcg/simplex/face/component_ocf.h>
-#include <vcg/complex/trimesh/base.h>
-#include <vcg/complex/trimesh/attribute_seam.h>
+#include <vcg/complex/complex.h>
+#include <vcg/complex/algorithms/attribute_seam.h>
 
 #include <wrap/io_trimesh/import_ply.h>
 #include <wrap/io_trimesh/export_ply.h>
diff --git a/apps/sample/trimesh_topology/trimesh_topology.cpp b/apps/sample/trimesh_topology/trimesh_topology.cpp
index 0f6533e9..cf08f1d6 100644
--- a/apps/sample/trimesh_topology/trimesh_topology.cpp
+++ b/apps/sample/trimesh_topology/trimesh_topology.cpp
@@ -3,11 +3,11 @@
 #include<vcg/simplex/vertex/base.h>
 #include<vcg/simplex/face/base.h>
 #include<vcg/simplex/face/topology.h>
-#include<vcg/complex/trimesh/base.h>
-#include<vcg/complex/trimesh/create/platonic.h>
+#include<vcg/complex/complex.h>
+#include<vcg/complex/algorithms/create/platonic.h>
 
 // topology computation
-#include<vcg/complex/trimesh/update/topology.h>
+#include<vcg/complex/algorithms/update/topology.h>
 
 // half edge iterators
 #include<vcg/simplex/face/pos.h>