From 59c4e013c08bd4aa66af02807e30e9fc47826fea Mon Sep 17 00:00:00 2001
From: Fabio Ganovelli ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Fri, 19 Dec 2008 10:46:19 +0000
Subject: [PATCH] changes to includes to comply promotion of SIMPLEXplu type in
 vcglib see comment below (from vcg commit):

[SIMPLEXplus promotion]
This modification removes the old way to define simplexes (already deprecated and unsupported).
In the following SIMPLEX = [vertex|edge|face|tetrahedron]

All the stuff that was in vcg/simplex/SIMPLEXplus/ has now been promoted to vcg/simplex/

Details:
- the folder vcg/simplex/SIMPLEX/with has been removed
- the file vcg/simplex/SIMPLEX/base.h has been renamed into  vcg/simplex/SIMPLEX/base_old.h
- the content of vcg/simplex/SIMPLEXplus/ has been moved into vcg/simplex/SIMPLEX/
- the folder vcg/simplex/SIMPLEXplus/ has been removed

Actions the update the  code using vcglib:
replace <vcg/simplex/SIMPLEXplus/*> with  <vcg/simplex/SIMPLEX/*> in every include
for MESHLAB users: already done along with this commit
---
 src/meshlab/meshmodel.h                              | 10 +++++-----
 src/meshlabplugins/editalign/align/AlignPair.h       | 10 +++++-----
 src/meshlabplugins/editalign/align/align_parameter.h |  2 +-
 src/meshlabplugins/editrgbtri/controlPoint.cpp       |  2 +-
 src/meshlabplugins/editrgbtri/modButterfly.cpp       |  2 +-
 src/meshlabplugins/editrgbtri/rgbInfo.h              |  2 +-
 src/meshlabplugins/editsegment/curvaturetensor.h     |  4 ++--
 src/meshlabplugins/editsegment/cutting.h             |  4 ++--
 src/meshlabplugins/editslice/editslice.cpp           |  4 ++--
 src/meshlabplugins/editslice/editslice.h             |  8 ++++----
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/meshlab/meshmodel.h b/src/meshlab/meshmodel.h
index df1752b27..24021bfcf 100644
--- a/src/meshlab/meshmodel.h
+++ b/src/meshlab/meshmodel.h
@@ -28,11 +28,11 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <vcg/simplex/vertexplus/base.h>
-#include <vcg/simplex/vertexplus/component_ocf.h>
-#include <vcg/simplex/edgeplus/base.h>
-#include <vcg/simplex/faceplus/base.h>
-#include <vcg/simplex/faceplus/component_ocf.h>
+#include <vcg/simplex/vertex/base.h>
+#include <vcg/simplex/vertex/component_ocf.h>
+#include <vcg/simplex/edge/base.h>
+#include <vcg/simplex/face/base.h>
+#include <vcg/simplex/face/component_ocf.h>
 #include <vcg/simplex/face/topology.h>
 
 #include <vcg/complex/trimesh/base.h>
diff --git a/src/meshlabplugins/editalign/align/AlignPair.h b/src/meshlabplugins/editalign/align/AlignPair.h
index 644af15bf..9236481cf 100644
--- a/src/meshlabplugins/editalign/align/AlignPair.h
+++ b/src/meshlabplugins/editalign/align/AlignPair.h
@@ -42,11 +42,11 @@ Revision 1.2  2005/06/10 16:07:29  cignoni
 
 #include <vcg/math/histogram.h>
 #include <vcg/math/matrix44.h>
-#include <vcg/simplex/vertexplus/base.h>
-#include <vcg/simplex/vertexplus/component.h>
-#include <vcg/simplex/faceplus/base.h>
-#include <vcg/simplex/faceplus/component.h>
-#include <vcg/simplex/faceplus/component_rt.h>
+#include <vcg/simplex/vertex/base.h>
+#include <vcg/simplex/vertex/component.h>
+#include <vcg/simplex/face/base.h>
+#include <vcg/simplex/face/component.h>
+#include <vcg/simplex/face/component_rt.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include<vcg/complex/trimesh/base.h>
 #include<vcg/complex/trimesh/update/normal.h>
diff --git a/src/meshlabplugins/editalign/align/align_parameter.h b/src/meshlabplugins/editalign/align/align_parameter.h
index 98a0bb570..02462bf7f 100644
--- a/src/meshlabplugins/editalign/align/align_parameter.h
+++ b/src/meshlabplugins/editalign/align/align_parameter.h
@@ -23,7 +23,7 @@
 
 #include <meshlab/filterparameter.h>
 #include <meshlabplugins/editalign/align/AlignPair.h>
-#include <vcg/simplex/faceplus/base.h>
+#include <vcg/simplex/face/base.h>
 
 class AlignParameter {
 
diff --git a/src/meshlabplugins/editrgbtri/controlPoint.cpp b/src/meshlabplugins/editrgbtri/controlPoint.cpp
index 1a3b713d7..1b87a6d5c 100644
--- a/src/meshlabplugins/editrgbtri/controlPoint.cpp
+++ b/src/meshlabplugins/editrgbtri/controlPoint.cpp
@@ -1,5 +1,5 @@
 #include "controlPoint.h"
-#include "vcg/simplex/faceplus/component.h"
+#include "vcg/simplex/face/component.h"
 
 /****************************************************************************
 * Rgb Triangulations Plugin                                                 *
diff --git a/src/meshlabplugins/editrgbtri/modButterfly.cpp b/src/meshlabplugins/editrgbtri/modButterfly.cpp
index af7002849..39d821aa8 100644
--- a/src/meshlabplugins/editrgbtri/modButterfly.cpp
+++ b/src/meshlabplugins/editrgbtri/modButterfly.cpp
@@ -1,5 +1,5 @@
 #include "modButterfly.h"
-#include "vcg/simplex/faceplus/component.h"
+#include "vcg/simplex/face/component.h"
 #include <math.h>
 
 /****************************************************************************
diff --git a/src/meshlabplugins/editrgbtri/rgbInfo.h b/src/meshlabplugins/editrgbtri/rgbInfo.h
index 117385388..145df600f 100644
--- a/src/meshlabplugins/editrgbtri/rgbInfo.h
+++ b/src/meshlabplugins/editrgbtri/rgbInfo.h
@@ -29,7 +29,7 @@
 #include <vcg/space/color4.h>
 #include <vcg/space/point3.h>
 #include <iostream>
-#include "vcg/simplex/faceplus/component.h"
+#include "vcg/simplex/face/component.h"
 #include <meshlab/meshmodel.h>
 
 namespace rgbt
diff --git a/src/meshlabplugins/editsegment/curvaturetensor.h b/src/meshlabplugins/editsegment/curvaturetensor.h
index 23d8b5f78..a7bc57269 100644
--- a/src/meshlabplugins/editsegment/curvaturetensor.h
+++ b/src/meshlabplugins/editsegment/curvaturetensor.h
@@ -6,8 +6,8 @@
 #include <vcg/simplex/face/jumping_pos.h>
 
 #include <vcg/complex/trimesh/base.h>
-#include <vcg/simplex/vertexplus/base.h>
-#include <vcg/simplex/faceplus/base.h>
+#include <vcg/simplex/vertex/base.h>
+#include <vcg/simplex/face/base.h>
 #include <vcg/space/point3.h>
 #include <vcg/complex/trimesh/update/normal.h>
 #include <vcg/math/matrix.h>
diff --git a/src/meshlabplugins/editsegment/cutting.h b/src/meshlabplugins/editsegment/cutting.h
index 08d5ede8f..3eced8a15 100644
--- a/src/meshlabplugins/editsegment/cutting.h
+++ b/src/meshlabplugins/editsegment/cutting.h
@@ -11,8 +11,8 @@
 #include <vcg/container/simple_temporary_data.h>
 #include <vcg/simplex/face/pos.h>
 #include <vcg/complex/trimesh/base.h>
-#include <vcg/simplex/vertexplus/base.h>
-#include <vcg/simplex/faceplus/base.h>
+#include <vcg/simplex/vertex/base.h>
+#include <vcg/simplex/face/base.h>
 #include <vcg/space/point3.h>
 #include <vcg/complex/trimesh/update/normal.h>
 #include <curvaturetensor.h>
diff --git a/src/meshlabplugins/editslice/editslice.cpp b/src/meshlabplugins/editslice/editslice.cpp
index 37c3faef6..a828c6d4c 100644
--- a/src/meshlabplugins/editslice/editslice.cpp
+++ b/src/meshlabplugins/editslice/editslice.cpp
@@ -7,8 +7,8 @@
 #include <wrap/gl/pick.h>
 
 #include <vcg/complex/trimesh/create/platonic.h>
-#include <vcg/simplex/vertexplus/base.h>
-#include <vcg/simplex/vertexplus/component_ocf.h>
+#include <vcg/simplex/vertex/base.h>
+#include <vcg/simplex/vertex/component_ocf.h>
 #include <vcg/space/point3.h>
 #include <vcg/space/box3.h>
 #include <vcg/space/index/grid_closest.h>
diff --git a/src/meshlabplugins/editslice/editslice.h b/src/meshlabplugins/editslice/editslice.h
index d12ea394c..1644d35d7 100644
--- a/src/meshlabplugins/editslice/editslice.h
+++ b/src/meshlabplugins/editslice/editslice.h
@@ -13,11 +13,11 @@
 
 #include <vcg/space/index/grid_static_ptr.h>
 
-#include <vcg/simplex/vertexplus/base.h>
-#include <vcg/simplex/vertexplus/component.h>
+#include <vcg/simplex/vertex/base.h>
+#include <vcg/simplex/vertex/component.h>
 #include <vcg/complex/edgemesh/base.h>
-#include <vcg/simplex/edgeplus/base.h>
-#include <vcg/simplex/edgeplus/component.h>
+#include <vcg/simplex/edge/base.h>
+#include <vcg/simplex/edge/component.h>
 #include <wrap/io_edgemesh/export_svg.h>
 
 typedef CMeshO n_Mesh;