Include header cleaning and reordering.

vcg/complex/algorithms/attribute_seam.h

@@ -1,10 +1,28 @@
+/****************************************************************************
+* VCGLib                                                            o o     *
+* Visual and Computer Graphics Library                            o     o   *
+*                                                                _   O  _   *
+* Copyright(C) 2004-2012                                           \/)\/    *
+* Visual Computing Lab                                            /\/|      *
+* ISTI - Italian National Research Council                           |      *
+*                                                                    \      *
+* All rights reserved.                                                      *
+*                                                                           *
+* This program is free software; you can redistribute it and/or modify      *
+* it under the terms of the GNU General Public License as published by      *
+* the Free Software Foundation; either version 2 of the License, or         *
+* (at your option) any later version.                                       *
+*                                                                           *
+* This program is distributed in the hope that it will be useful,           *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
+* for more details.                                                         *
+*                                                                           *
+****************************************************************************/
 #ifndef VCG_TRI_ATTRIBUTE_SEAM_H
 #define VCG_TRI_ATTRIBUTE_SEAM_H
 
-#include <vector>
-
-#include <vcg/complex/allocate.h>
-
 /*
 
 // sample extract functor

vcg/complex/algorithms/bitquad_creation.h

@@ -1,5 +1,4 @@
 #include <vcg/complex/algorithms/bitquad_support.h>
-#include <vcg/complex/allocate.h>
 
 /** BIT-QUAD creation support:
     a collection of methods that,

vcg/complex/algorithms/bitquad_support.h

@@ -1,7 +1,5 @@
 #ifndef VCG_BITQUAD_SUPPORT
 #define VCG_BITQUAD_SUPPORT
-#include <vector>
-#include <set>
 #include <vcg/simplex/face/jumping_pos.h>
 #include <vcg/simplex/face/topology.h>
 #include <vcg/space/planar_polygon_tessellation.h>

vcg/complex/algorithms/clean.h

@@ -24,12 +24,6 @@
 #ifndef __VCGLIB_CLEAN
 #define __VCGLIB_CLEAN
 
-// Standard headers
-#include <map>
-#include <algorithm>
-#include <utility>
-#include <stack>
-
 // VCG headers
 #include <vcg/complex/complex.h>
 #include <vcg/simplex/face/pos.h>
@@ -37,7 +31,6 @@
 #include <vcg/complex/algorithms/closest.h>
 #include <vcg/space/index/grid_static_ptr.h>
 #include <vcg/space/index/spatial_hashing.h>
-#include <vcg/complex/allocate.h>
 #include <vcg/complex/algorithms/update/selection.h>
 #include <vcg/complex/algorithms/update/flag.h>
 #include <vcg/complex/algorithms/update/normal.h>

vcg/complex/algorithms/create/advancing_front.h

@@ -202,8 +202,8 @@ public:
 
     assert(v2 != v0 && v2 != v1);
 
-    if ((touch.first == FRONT) && (touch.second != front.end()) ||
+    if ( ( (touch.first == FRONT) && (touch.second != front.end()) ) ||
-        (touch.first == DEADS) && (touch.second != deads.end()))
+         ( (touch.first == DEADS) && (touch.second != deads.end()) )    )
 
     {
       //check for orientation and manifoldness
@@ -307,8 +307,8 @@ public:
 
 
     }
-    else if ((touch.first == FRONT) && (touch.second == front.end()) ||
+    else if (((touch.first == FRONT) && (touch.second == front.end())) ||
-             (touch.first == DEADS) && (touch.second == deads.end()))   
+             ((touch.first == DEADS) && (touch.second == deads.end()))    )
     {
 //        assert(CheckEdge(v0, v2));
 //        assert(CheckEdge(v2, v1));

vcg/complex/allocate.h

@@ -20,15 +20,13 @@
 * for more details.                                                         *
 *                                                                           *
 ****************************************************************************/
+#ifndef __VCG_MESH
+#error "This file should not be included alone. It is automatically included by complex.h"
+#endif
 
 #ifndef __VCGLIB_TRIALLOCATOR
 #define __VCGLIB_TRIALLOCATOR
 
-#include <map>
-#include <set>
-#include <vcg/container/simple_temporary_data.h>
-#include <vcg/space/color4.h>
-
 namespace vcg {
 
 namespace tri {

vcg/complex/append.h

@@ -24,10 +24,6 @@
 #ifndef __VCGLIB_APPEND
 #define __VCGLIB_APPEND
 
-#include <vcg/complex/algorithms/update/flag.h>
-#include <vcg/complex/algorithms/update/selection.h>
-#include <set>
-
 namespace vcg {
 namespace tri {
 /** \ingroup trimesh */

vcg/complex/complex.h

@@ -21,21 +21,30 @@
 *                                                                           *
 ****************************************************************************/
 
-#ifndef __VCG_MESH
+#ifndef __VCG_MESH_H
+#define __VCG_MESH_H
 #define __VCG_MESH
 
 #include <assert.h>
 #include <string>
 #include <vector>
 #include <set>
-#include <exception>
+#include <stack>
-
+#include <algorithm>
+#include <map>
+#include <iostream>
+#include <stdexcept>
+#include <limits>
+#include <set>
 #include <vcg/complex/exception.h>
 #include <vcg/container/simple_temporary_data.h>
 #include <vcg/complex/used_types.h>
 #include <vcg/complex/base.h>
 #include <vcg/complex/allocate.h>
+#include <vcg/complex/algorithms/update/flag.h>
+#include <vcg/complex/algorithms/update/selection.h>
 #include <vcg/complex/append.h>
 
+#undef __VCG_MESH
 #endif