manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Huge reordering of header file inclusion order

This commit is contained in:
Paolo Cignoni 2017-03-14 07:48:48 +01:00
parent a34a8dd44e
commit c4d97c2c03
38 changed files with 6 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcg/complex/algorithms/attribute_seam.h
View File

@ -177,7 +177,6 @@ class AttributeSeam
typedef typename src_trimesh_t::VertexIterator src_vertex_i;
typedef typename src_trimesh_t::FaceType src_face_t;
typedef typename src_trimesh_t::FaceIterator src_face_i;
typedef typename src_trimesh_t::VertContainer src_vertex_container_t;
typedef vcg::tri::Allocator<src_trimesh_t> src_mesh_allocator_t;
typedef typename src_mesh_allocator_t :: template PointerUpdater<typename src_trimesh_t::VertexPointer> src_pointer_updater_t;
@ -263,7 +262,6 @@ class AttributeSeam
typedef typename src_trimesh_t::FaceType src_face_t;
typedef typename src_trimesh_t::ConstFaceIterator src_face_ci;
typedef typename dst_trimesh_t::VertContainer dst_vertex_container_t;
typedef typename dst_trimesh_t::VertexType dst_vertex_t;
typedef typename dst_trimesh_t::VertexIterator dst_vertex_i;
typedef typename dst_trimesh_t::FaceType dst_face_t;

6
vcg/complex/algorithms/clean.h
View File

@ -26,16 +26,10 @@
// VCG headers
#include <vcg/complex/complex.h>
#include <vcg/simplex/face/pos.h>
#include <vcg/simplex/face/topology.h>
#include <vcg/simplex/edge/topology.h>
#include <vcg/complex/algorithms/closest.h>
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/space/index/spatial_hashing.h>
#include <vcg/complex/algorithms/update/selection.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/space/triangle3.h>
namespace vcg {

2
vcg/complex/algorithms/clustering.h
View File

@ -27,12 +27,10 @@
#include<vcg/complex/complex.h>
#include <vcg/complex/algorithms/clean.h>
#include<vcg/space/triangle3.h>
#include<vcg/complex/algorithms/update/topology.h>
#include<vcg/space/index/grid_util.h>
#include <iostream>
#include <math.h>
#include <limits>
#include <unordered_set>
#include <unordered_map>

3
vcg/complex/algorithms/convex_hull.h
View File

@ -25,8 +25,7 @@
#include <queue>
#include <unordered_map>
#include <algorithm>
#include <vcg/complex/allocate.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/algorithms/clean.h>
namespace vcg

2
vcg/complex/algorithms/create/advancing_front.h
View File

@ -26,8 +26,6 @@
#include <iostream>
#include <list>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/flag.h>
namespace vcg {
namespace tri {

2
vcg/complex/algorithms/create/platonic.h
View File

@ -26,9 +26,7 @@
#include<vcg/math/base.h>
#include<vcg/complex/algorithms/refine.h>
#include<vcg/complex/algorithms/update/flag.h>
#include<vcg/complex/algorithms/update/position.h>
#include<vcg/complex/algorithms/update/topology.h>
#include<vcg/complex/algorithms/update/bounding.h>
#include<vcg/complex/algorithms/clean.h>
#include<vcg/complex/algorithms/polygon_support.h>

2
vcg/complex/algorithms/create/resampler.h
View File

@ -24,13 +24,11 @@
#define __VCG_MESH_RESAMPLER
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/component_ep.h>
#include <vcg/complex/algorithms/create/marching_cubes.h>
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/complex/algorithms/closest.h>
#include <vcg/space/box3.h>
namespace vcg {
namespace tri {

1
vcg/complex/algorithms/intersection.h
View File

@ -27,7 +27,6 @@
#include<vcg/complex/complex.h>
#include<vcg/complex/algorithms/closest.h>
#include<vcg/complex/algorithms/update/quality.h>
#include<vcg/complex/algorithms/update/selection.h>
#ifndef __VCGLIB_INTERSECTION_TRI_MESH

3
vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h
View File

@ -25,9 +25,6 @@
#define __VCG_TRIMESHCOLLAPSE_QUADRIC__
#include<vcg/math/quadric.h>
#include<vcg/simplex/face/pos.h>
#include<vcg/complex/algorithms/update/flag.h>
#include<vcg/complex/algorithms/update/topology.h>
#include<vcg/complex/algorithms/update/bounding.h>
#include<vcg/complex/algorithms/local_optimization/tri_edge_collapse.h>
#include<vcg/complex/algorithms/local_optimization.h>

1
vcg/complex/algorithms/nring.h
View File

@ -24,7 +24,6 @@
#define RINGWALKER_H
#include <vcg/simplex/face/jumping_pos.h>
#include <vcg/complex/algorithms/update/flag.h>
namespace vcg
{

2
vcg/complex/algorithms/parametrization/tangent_field_operators.h
View File

@ -22,8 +22,6 @@
****************************************************************************/
#include <vcg/math/histogram.h>
#include <vcg/complex/algorithms/update/curvature.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <algorithm>
#ifndef VCG_TANGENT_FIELD_OPERATORS
#define VCG_TANGENT_FIELD_OPERATORS

2
vcg/complex/algorithms/point_sampling.h
View File

@ -42,10 +42,8 @@ sampling strategies (montecarlo, stratified etc).
#include <vcg/complex/algorithms/hole.h>
#include <vcg/complex/algorithms/stat.h>
#include <vcg/complex/algorithms/create/platonic.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/space/segment2.h>
#include <vcg/space/index/grid_static_ptr.h>
namespace vcg

10
vcg/complex/algorithms/polygon_polychord_collapse.h
View File

@ -23,16 +23,8 @@
#ifndef POLYGON_POLYCHORD_COLLAPSE_H
#define POLYGON_POLYCHORD_COLLAPSE_H
#include <vector>
#include <list>
#if __cplusplus >= 201103L
#include <unordered_map>
#else
#include <map>
#endif
#include <set>
#include <algorithm>
#include <iterator>
#include <unordered_map>
#include <vcg/complex/complex.h>
#include <vcg/simplex/face/jumping_pos.h>

1
vcg/complex/algorithms/polygonal_algorithms.h
View File

@ -28,7 +28,6 @@
#include <vcg/space/polygon3.h>
#include <vcg/complex/algorithms/update/color.h>
#include <vcg/complex/algorithms/closest.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/point_sampling.h>
//define a temporary triangle mesh type

4
vcg/complex/algorithms/refine.h
View File

@ -28,10 +28,6 @@
#include <map>
#include <vcg/space/sphere3.h>
#include <vcg/space/plane3.h>
#include <vcg/simplex/face/pos.h>
#include <vcg/simplex/face/topology.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/clean.h>
#include <vcg/space/texcoord2.h>
#include <vcg/space/triangle3.h>

3
vcg/complex/algorithms/refine_loop.h
View File

@ -34,9 +34,6 @@
#include <vcg/space/point3.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/algorithms/refine.h>
#include <vcg/space/color4.h>
#include <vcg/container/simple_temporary_data.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/update/color.h>

3
vcg/complex/algorithms/stat.h
View File

@ -28,11 +28,8 @@
// VCG headers
#include <vcg/math/histogram.h>
#include <vcg/simplex/face/pos.h>
#include <vcg/simplex/face/topology.h>
#include <vcg/complex/algorithms/closest.h>
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/inertia.h>

1
vcg/complex/algorithms/update/color.h
View File

@ -24,7 +24,6 @@
#ifndef __VCG_TRI_UPDATE_COLOR
#define __VCG_TRI_UPDATE_COLOR
#include <limits>
#include <math.h>
#include <time.h>
#include <vcg/space/color4.h>

2
vcg/complex/algorithms/update/curvature.h
View File

@ -25,8 +25,6 @@
#define VCGLIB_UPDATE_CURVATURE_
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/simplex/face/topology.h>
#include <vcg/simplex/face/pos.h>
#include <vcg/simplex/face/jumping_pos.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/point_sampling.h>

1
vcg/complex/algorithms/update/fitmaps.h
View File

@ -27,7 +27,6 @@
#include <vcg/math/histogram.h>
#include <vcg/simplex/face/jumping_pos.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/curvature.h>
#include <vcg/complex/algorithms/update/topology.h>

2
vcg/complex/algorithms/update/flag.h
View File

@ -23,8 +23,6 @@
#ifndef __VCG_TRI_UPDATE_FLAGS
#define __VCG_TRI_UPDATE_FLAGS
#include <vcg/simplex/face/pos.h>
namespace vcg {
namespace tri {
/// \ingroup trimesh

3
vcg/complex/algorithms/update/normal.h
View File

@ -24,10 +24,7 @@
#ifndef __VCG_TRI_UPDATE_NORMALS
#define __VCG_TRI_UPDATE_NORMALS
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/polygon_support.h>
#include <vcg/math/matrix44.h>
#include <vcg/complex/exception.h>
namespace vcg {
namespace tri {

3
vcg/complex/algorithms/update/quality.h
View File

@ -22,9 +22,6 @@
****************************************************************************/
#ifndef __VCG_TRI_UPDATE_QUALITY
#define __VCG_TRI_UPDATE_QUALITY
#include <vcg/simplex/face/pos.h>
#include <vcg/simplex/face/topology.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/stat.h>
namespace vcg {

3
vcg/complex/algorithms/update/selection.h
View File

@ -23,9 +23,6 @@
#ifndef __VCG_TRI_UPDATE_SELECTION
#define __VCG_TRI_UPDATE_SELECTION
#include <queue>
#include <vcg/complex/algorithms/update/flag.h>
namespace vcg {
namespace tri {
/// \ingroup trimesh

5
vcg/complex/algorithms/update/topology.h
View File

@ -23,11 +23,6 @@
#ifndef __VCG_TRI_UPDATE_TOPOLOGY
#define __VCG_TRI_UPDATE_TOPOLOGY
#include <algorithm>
#include <vector>
#include <vcg/simplex/face/pos.h>
#include <vcg/simplex/face/topology.h>
#include <vcg/simplex/edge/topology.h>
namespace vcg {
namespace tri {

4
vcg/complex/complex.h
View File

@ -30,6 +30,7 @@
#include <vector>
#include <set>
#include <stack>
#include <queue>
#include <algorithm>
#include <map>
#include <iostream>
@ -48,6 +49,9 @@
#include <vcg/simplex/edge/topology.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/update/selection.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/mesh_assert.h>
#include <vcg/complex/append.h>

2
vcg/container/simple_temporary_data.h
View File

@ -24,8 +24,6 @@
#ifndef __VCGLIB_SIMPLE__
#define __VCGLIB_SIMPLE__
#include <string.h>
namespace vcg {
class SimpleTempDataBase{

2
vcg/math/gen_normal.h
View File

@ -29,8 +29,6 @@ $Log: gen_normal.h,v $
#ifndef __VCG_GEN_NORMAL
#define __VCG_GEN_NORMAL
#include <algorithm>
namespace vcg {
template <class ScalarType>

2
vcg/math/histogram.h
View File

@ -23,8 +23,6 @@
#ifndef __VCG_HISTOGRAM
#define __VCG_HISTOGRAM
#include <vector>
#include <algorithm>
#include <assert.h>
#include <string>
#include <limits>

12
vcg/simplex/edge/pos.h
View File

@ -20,18 +20,6 @@
* for more details. *
* *
****************************************************************************/
/****************************************************************************
History
$Log: not supported by cvs2svn $
Revision 1.2 2004/05/10 14:40:47 ganovelli
name of adhacency function updated
Revision 1.1 2004/05/10 14:01:56 ganovelli
created
****************************************************************************/
#ifndef __VCG_EDGE_POS
#define __VCG_EDGE_POS

4
vcg/simplex/edge/topology.h
View File

@ -24,10 +24,6 @@
#ifndef _VCG_EDGE_TOPOLOGY
#define _VCG_EDGE_TOPOLOGY
#include <vector>
#include <algorithm>
#include <vcg/simplex/edge/pos.h>
namespace vcg {
namespace edge {
/** \addtogroup edge */

2
vcg/simplex/face/pos.h
View File

@ -29,8 +29,6 @@
#ifndef __VCG_FACE_POS
#define __VCG_FACE_POS
#include <assert.h>
namespace vcg {
namespace face {

3
vcg/simplex/face/topology.h
View File

@ -24,9 +24,6 @@
#ifndef _VCG_FACE_TOPOLOGY
#define _VCG_FACE_TOPOLOGY
#include <vcg/simplex/face/pos.h>
#include <set>
namespace vcg {
namespace face {
/** \addtogroup face */

2
vcg/space/box2.h
View File

@ -24,8 +24,6 @@
#ifndef __VCGLIB_BOX2
#define __VCGLIB_BOX2
#include <assert.h>
#include <algorithm>
#include <vcg/math/base.h>
#include <vcg/space/point2.h>

22
vcg/space/index/grid_static_obj.h
View File

@ -19,33 +19,11 @@
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. *
* *
****************************************************************************/
/****************************************************************************
History
$Log: not supported by cvs2svn $
Revision 1.4 2006/09/27 08:49:32 spinelli
bug fix, add return type to Init
Revision 1.3 2006/08/23 15:20:14 marfr960
corrected minor bugs
Revision 1.2 2005/12/02 00:29:00 cignoni
updated the templates of BasicGrid
Revision 1.1 2005/07/28 08:41:00 cignoni
First working version
Revision 1.13 2005/04/14 17:23:08 ponchio
*** empty log message ***
****************************************************************************/
#ifndef __VCGLIB_UGRID_OBJ
#define __VCGLIB_UGRID_OBJ
#include <vector>
#include <algorithm>
#include <stdio.h>
#include <vcg/space/box3.h>

2
vcg/space/index/grid_static_ptr.h
View File

@ -24,8 +24,6 @@
#ifndef __VCGLIB_UGRID
#define __VCGLIB_UGRID
#include <vector>
#include <algorithm>
#include <stdio.h>
#include <vcg/space/box3.h>

2
vcg/space/outline2_packer.h
View File

@ -26,8 +26,6 @@
#include <limits>
#include <stdio.h>
#include <assert.h>
#include <algorithm>
#include <vector>
#include <vcg/space/box2.h>
#include <vcg/space/rect_packer.h>
#include <vcg/space/point2.h>

1
wrap/dae/util_dae.h
View File

@ -24,7 +24,6 @@
#define __VCGLIB_UTILDAE
#include <vcg/complex/append.h>
#include <wrap/io_trimesh/additionalinfo.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/position.h>