From 388a97c6ac4f998155983d5e91dfc52c6dd4da19 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 24 Oct 2023 15:13:18 +0200 Subject: [PATCH] gitlab-ci: fix url --- .gitlab-ci.yml | 2 +- doc/python/doxygen.hh | 5 ++-- include/hpp/fcl/BV/BV.h | 4 +-- include/hpp/fcl/BV/BV_node.h | 2 +- include/hpp/fcl/BV/RSS.h | 1 + include/hpp/fcl/BV/kDOP.h | 3 +- include/hpp/fcl/BVH/BVH_front.h | 3 +- include/hpp/fcl/BVH/BVH_model.h | 7 +++-- include/hpp/fcl/broadphase/broadphase.h | 7 ++--- include/hpp/fcl/broadphase/broadphase_SSaP.h | 1 + include/hpp/fcl/broadphase/broadphase_SaP.h | 2 +- .../fcl/broadphase/broadphase_bruteforce.h | 1 + .../hpp/fcl/broadphase/broadphase_callbacks.h | 2 +- .../broadphase/broadphase_collision_manager.h | 4 +-- ...adphase_continuous_collision_manager-inl.h | 3 +- .../broadphase_dynamic_AABB_tree-inl.h | 4 +-- .../broadphase/broadphase_dynamic_AABB_tree.h | 2 +- .../broadphase_dynamic_AABB_tree_array.h | 2 +- .../fcl/broadphase/broadphase_spatialhash.h | 1 + .../fcl/broadphase/detail/hierarchy_tree.h | 7 +++-- .../detail/hierarchy_tree_array-inl.h | 4 +-- .../broadphase/detail/hierarchy_tree_array.h | 6 ++-- .../hpp/fcl/broadphase/detail/interval_tree.h | 2 +- .../detail/interval_tree_node-inl.h | 6 ++-- include/hpp/fcl/broadphase/detail/morton.h | 3 +- .../broadphase/detail/simple_hash_table-inl.h | 4 +-- .../fcl/broadphase/detail/simple_hash_table.h | 2 +- .../broadphase/detail/simple_interval-inl.h | 3 +- .../fcl/broadphase/detail/simple_interval.h | 2 +- .../fcl/broadphase/detail/sparse_hash_table.h | 4 +-- .../fcl/broadphase/detail/spatial_hash-inl.h | 3 +- .../hpp/fcl/broadphase/detail/spatial_hash.h | 3 +- include/hpp/fcl/collision.h | 4 +-- include/hpp/fcl/collision_data.h | 10 +++---- include/hpp/fcl/collision_func_matrix.h | 2 +- include/hpp/fcl/collision_object.h | 8 ++--- include/hpp/fcl/data_types.h | 1 - include/hpp/fcl/distance.h | 2 +- include/hpp/fcl/distance_func_matrix.h | 2 +- include/hpp/fcl/fwd.hh | 7 ++--- include/hpp/fcl/hfield.h | 4 +-- include/hpp/fcl/internal/BV_fitter.h | 7 +++-- include/hpp/fcl/internal/BV_splitter.h | 7 +++-- include/hpp/fcl/internal/tools.h | 5 ++-- .../hpp/fcl/internal/traversal_node_base.h | 2 +- .../fcl/internal/traversal_node_bvh_hfield.h | 14 ++++----- .../fcl/internal/traversal_node_bvh_shape.h | 8 ++--- .../hpp/fcl/internal/traversal_node_bvhs.h | 12 ++++---- .../internal/traversal_node_hfield_shape.h | 10 +++---- .../hpp/fcl/internal/traversal_node_octree.h | 4 +-- .../hpp/fcl/internal/traversal_node_setup.h | 5 ++-- .../hpp/fcl/internal/traversal_node_shapes.h | 4 +-- include/hpp/fcl/internal/traversal_recurse.h | 3 +- include/hpp/fcl/mesh_loader/assimp.h | 5 ++-- include/hpp/fcl/mesh_loader/loader.h | 6 ++-- include/hpp/fcl/narrowphase/gjk.h | 6 ++-- include/hpp/fcl/narrowphase/narrowphase.h | 8 ++--- include/hpp/fcl/octree.h | 8 ++--- include/hpp/fcl/serialization/BVH_model.h | 3 +- include/hpp/fcl/serialization/BV_node.h | 3 +- include/hpp/fcl/serialization/BV_splitter.h | 1 - include/hpp/fcl/serialization/OBB.h | 1 - include/hpp/fcl/serialization/OBBRSS.h | 3 +- include/hpp/fcl/serialization/RSS.h | 1 - .../hpp/fcl/serialization/collision_object.h | 3 +- include/hpp/fcl/serialization/convex.h | 5 ++-- include/hpp/fcl/serialization/eigen.h | 3 +- include/hpp/fcl/serialization/fwd.h | 2 +- .../hpp/fcl/serialization/geometric_shapes.h | 2 +- include/hpp/fcl/serialization/hfield.h | 3 +- .../fcl/shape/geometric_shape_to_BVH_model.h | 3 +- include/hpp/fcl/shape/geometric_shapes.h | 4 +-- .../hpp/fcl/shape/geometric_shapes_utility.h | 5 ++-- python/broadphase/broadphase.cc | 8 ++--- python/broadphase/broadphase_callbacks.hh | 4 +-- .../broadphase_collision_manager.hh | 6 ++-- python/collision-geometries.cc | 30 +++++++++---------- python/collision.cc | 8 ++--- python/deprecation.hh | 1 + python/distance.cc | 6 ++-- python/fcl.cc | 12 ++++---- python/fwd.hh | 2 +- python/gjk.cc | 6 ++-- python/math.cc | 4 +-- python/octree.cc | 5 ++-- python/pickle.hh | 5 ++-- python/version.cc | 5 ++-- src/BV/AABB.cpp | 2 +- src/BV/OBB.cpp | 2 +- src/BV/RSS.cpp | 2 +- src/BV/kDOP.cpp | 6 ++-- src/BVH/BVH_model.cpp | 12 ++++---- src/BVH/BV_fitter.cpp | 5 ++-- src/broadphase/broadphase_bruteforce.cpp | 2 +- .../default_broadphase_callbacks.cpp | 1 + src/broadphase/detail/interval_tree_node.cpp | 2 +- src/broadphase/detail/simple_interval.cpp | 1 + src/broadphase/detail/spatial_hash.cpp | 1 + src/collision.cpp | 2 +- src/collision_func_matrix.cpp | 7 ++--- src/collision_utility.cpp | 3 +- src/distance.cpp | 2 +- src/distance/box_halfspace.cpp | 7 +++-- src/distance/box_plane.cpp | 7 +++-- src/distance/box_sphere.cpp | 7 +++-- src/distance/capsule_capsule.cpp | 7 +++-- src/distance/capsule_halfspace.cpp | 7 +++-- src/distance/capsule_plane.cpp | 7 +++-- src/distance/cone_halfspace.cpp | 7 +++-- src/distance/cone_plane.cpp | 7 +++-- src/distance/convex_halfspace.cpp | 2 +- src/distance/cylinder_halfspace.cpp | 7 +++-- src/distance/cylinder_plane.cpp | 7 +++-- src/distance/sphere_cylinder.cpp | 7 +++-- src/distance/sphere_halfspace.cpp | 7 +++-- src/distance/sphere_plane.cpp | 7 +++-- src/distance/sphere_sphere.cpp | 9 +++--- src/distance/triangle_halfspace.cpp | 2 +- src/distance_func_matrix.cpp | 5 ++-- src/hfield.cpp | 12 ++++---- src/intersect.cpp | 5 ++-- src/mesh_loader/assimp.cpp | 5 ++-- src/mesh_loader/loader.cpp | 2 +- src/narrowphase/gjk.cpp | 2 +- src/narrowphase/narrowphase.cpp | 4 +-- src/shape/convex.cpp | 4 +-- src/shape/geometric_shapes_utility.cpp | 2 +- src/traits_traversal.h | 6 ++-- test/benchmark.cpp | 10 +++---- test/box_box_collision.cpp | 8 ++--- test/box_box_distance.cpp | 9 +++--- test/broadphase.cpp | 15 +++++----- test/broadphase_collision_1.cpp | 17 +++++------ test/broadphase_collision_2.cpp | 14 ++++----- test/broadphase_dynamic_AABB_tree.cpp | 2 +- test/bvh_models.cpp | 18 +++++------ test/capsule_box_1.cpp | 7 +++-- test/capsule_box_2.cpp | 11 +++---- test/capsule_capsule.cpp | 10 +++---- test/collision.cpp | 25 +++++++--------- test/convex.cpp | 6 ++-- test/distance.cpp | 13 ++++---- test/distance_lower_bound.cpp | 15 +++++----- test/frontlist.cpp | 12 ++++---- test/geometric_shapes.cpp | 11 +++---- test/gjk.cpp | 8 ++--- test/gjk_convergence_criterion.cpp | 11 +++---- test/hfields.cpp | 13 ++++---- test/math.cpp | 7 ++--- test/nesterov_gjk.cpp | 8 ++--- test/obb.cpp | 14 ++++----- test/octree.cpp | 12 ++++---- test/profiling.cpp | 17 ++++++----- test/security_margin.cpp | 14 ++++----- test/serialization.cpp | 29 ++++++++---------- test/shape_inflation.cpp | 12 ++++---- test/shape_mesh_consistency.cpp | 9 +++--- test/simple.cpp | 9 +++--- test/utility.cpp | 5 ++-- test/utility.h | 4 +-- 160 files changed, 494 insertions(+), 485 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0281d6e18..fcd4d4145 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1 +1 @@ -include: http://rainboard.laas.fr/project/hpp-fcl/.gitlab-ci.yml +include: https://rainboard.laas.fr/project/hpp-fcl/.gitlab-ci.yml diff --git a/doc/python/doxygen.hh b/doc/python/doxygen.hh index 2aa8258f2..f65e4bbaf 100644 --- a/doc/python/doxygen.hh +++ b/doc/python/doxygen.hh @@ -1,10 +1,9 @@ #ifndef DOXYGEN_DOC_HH #define DOXYGEN_DOC_HH -#include -#include - #include +#include +#include #ifndef DOXYGEN_DOC_MAX_NUMBER_OF_ARGUMENTS_IN_CONSTRUCTOR #define DOXYGEN_DOC_MAX_NUMBER_OF_ARGUMENTS_IN_CONSTRUCTOR 10 diff --git a/include/hpp/fcl/BV/BV.h b/include/hpp/fcl/BV/BV.h index b42316ea0..eff97ca06 100644 --- a/include/hpp/fcl/BV/BV.h +++ b/include/hpp/fcl/BV/BV.h @@ -38,11 +38,11 @@ #ifndef HPP_FCL_BV_H #define HPP_FCL_BV_H -#include #include #include -#include #include +#include +#include #include #include diff --git a/include/hpp/fcl/BV/BV_node.h b/include/hpp/fcl/BV/BV_node.h index 8ba57ea26..8e5a92d82 100644 --- a/include/hpp/fcl/BV/BV_node.h +++ b/include/hpp/fcl/BV/BV_node.h @@ -38,9 +38,9 @@ #ifndef HPP_FCL_BV_NODE_H #define HPP_FCL_BV_NODE_H +#include #include -#include #include namespace hpp { diff --git a/include/hpp/fcl/BV/RSS.h b/include/hpp/fcl/BV/RSS.h index 6e624d4ca..83c547dce 100644 --- a/include/hpp/fcl/BV/RSS.h +++ b/include/hpp/fcl/BV/RSS.h @@ -39,6 +39,7 @@ #define HPP_FCL_RSS_H #include + #include namespace hpp { diff --git a/include/hpp/fcl/BV/kDOP.h b/include/hpp/fcl/BV/kDOP.h index 92d82ba4f..5ecbd6912 100644 --- a/include/hpp/fcl/BV/kDOP.h +++ b/include/hpp/fcl/BV/kDOP.h @@ -38,9 +38,10 @@ #ifndef HPP_FCL_KDOP_H #define HPP_FCL_KDOP_H -#include #include +#include + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/BVH/BVH_front.h b/include/hpp/fcl/BVH/BVH_front.h index 9a3a99eea..e82db7935 100644 --- a/include/hpp/fcl/BVH/BVH_front.h +++ b/include/hpp/fcl/BVH/BVH_front.h @@ -38,9 +38,8 @@ #ifndef HPP_FCL_BVH_FRONT_H #define HPP_FCL_BVH_FRONT_H -#include - #include +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/BVH/BVH_model.h b/include/hpp/fcl/BVH/BVH_model.h index a57fc7b84..112660dc6 100644 --- a/include/hpp/fcl/BVH/BVH_model.h +++ b/include/hpp/fcl/BVH/BVH_model.h @@ -39,10 +39,11 @@ #ifndef HPP_FCL_BVH_MODEL_H #define HPP_FCL_BVH_MODEL_H -#include -#include -#include #include +#include +#include + +#include #include namespace hpp { diff --git a/include/hpp/fcl/broadphase/broadphase.h b/include/hpp/fcl/broadphase/broadphase.h index 762792de3..ea8bcdc8e 100644 --- a/include/hpp/fcl/broadphase/broadphase.h +++ b/include/hpp/fcl/broadphase/broadphase.h @@ -35,14 +35,13 @@ #ifndef HPP_FCL_BROADPHASE_BROADPHASE_H #define HPP_FCL_BROADPHASE_BROADPHASE_H +#include "hpp/fcl/broadphase/broadphase_SSaP.h" +#include "hpp/fcl/broadphase/broadphase_SaP.h" +#include "hpp/fcl/broadphase/broadphase_bruteforce.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h" -#include "hpp/fcl/broadphase/broadphase_bruteforce.h" -#include "hpp/fcl/broadphase/broadphase_SaP.h" -#include "hpp/fcl/broadphase/broadphase_SSaP.h" #include "hpp/fcl/broadphase/broadphase_interval_tree.h" #include "hpp/fcl/broadphase/broadphase_spatialhash.h" - #include "hpp/fcl/broadphase/default_broadphase_callbacks.h" #endif // ifndef HPP_FCL_BROADPHASE_BROADPHASE_H diff --git a/include/hpp/fcl/broadphase/broadphase_SSaP.h b/include/hpp/fcl/broadphase/broadphase_SSaP.h index b99eb90c8..2f883ac65 100644 --- a/include/hpp/fcl/broadphase/broadphase_SSaP.h +++ b/include/hpp/fcl/broadphase/broadphase_SSaP.h @@ -39,6 +39,7 @@ #define HPP_FCL_BROAD_PHASE_SSAP_H #include + #include "hpp/fcl/broadphase/broadphase_collision_manager.h" namespace hpp { diff --git a/include/hpp/fcl/broadphase/broadphase_SaP.h b/include/hpp/fcl/broadphase/broadphase_SaP.h index 0751401d1..55599f2da 100644 --- a/include/hpp/fcl/broadphase/broadphase_SaP.h +++ b/include/hpp/fcl/broadphase/broadphase_SaP.h @@ -38,8 +38,8 @@ #ifndef HPP_FCL_BROAD_PHASE_SAP_H #define HPP_FCL_BROAD_PHASE_SAP_H -#include #include +#include #include "hpp/fcl/broadphase/broadphase_collision_manager.h" diff --git a/include/hpp/fcl/broadphase/broadphase_bruteforce.h b/include/hpp/fcl/broadphase/broadphase_bruteforce.h index 734c74fb7..97d92c169 100644 --- a/include/hpp/fcl/broadphase/broadphase_bruteforce.h +++ b/include/hpp/fcl/broadphase/broadphase_bruteforce.h @@ -39,6 +39,7 @@ #define HPP_FCL_BROAD_PHASE_BRUTE_FORCE_H #include + #include "hpp/fcl/broadphase/broadphase_collision_manager.h" namespace hpp { diff --git a/include/hpp/fcl/broadphase/broadphase_callbacks.h b/include/hpp/fcl/broadphase/broadphase_callbacks.h index b9889ce0e..c078f57d7 100644 --- a/include/hpp/fcl/broadphase/broadphase_callbacks.h +++ b/include/hpp/fcl/broadphase/broadphase_callbacks.h @@ -37,8 +37,8 @@ #ifndef HPP_FCL_BROADPHASE_BROAD_PHASE_CALLBACKS_H #define HPP_FCL_BROADPHASE_BROAD_PHASE_CALLBACKS_H -#include "hpp/fcl/fwd.hh" #include "hpp/fcl/data_types.h" +#include "hpp/fcl/fwd.hh" namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/broadphase_collision_manager.h b/include/hpp/fcl/broadphase/broadphase_collision_manager.h index 750907b28..f66ce5c91 100644 --- a/include/hpp/fcl/broadphase/broadphase_collision_manager.h +++ b/include/hpp/fcl/broadphase/broadphase_collision_manager.h @@ -38,12 +38,12 @@ #ifndef HPP_FCL_BROADPHASE_BROADPHASECOLLISIONMANAGER_H #define HPP_FCL_BROADPHASE_BROADPHASECOLLISIONMANAGER_H +#include #include #include -#include -#include "hpp/fcl/collision_object.h" #include "hpp/fcl/broadphase/broadphase_callbacks.h" +#include "hpp/fcl/collision_object.h" namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/broadphase_continuous_collision_manager-inl.h b/include/hpp/fcl/broadphase/broadphase_continuous_collision_manager-inl.h index 93691b200..518a38506 100644 --- a/include/hpp/fcl/broadphase/broadphase_continuous_collision_manager-inl.h +++ b/include/hpp/fcl/broadphase/broadphase_continuous_collision_manager-inl.h @@ -38,9 +38,10 @@ #ifndef HPP_FCL_BROADPHASE_BROADPHASECONTINUOUSCOLLISIONMANAGER_INL_H #define HPP_FCL_BROADPHASE_BROADPHASECONTINUOUSCOLLISIONMANAGER_INL_H -#include "hpp/fcl/broadphase/broadphase_continuous_collision_manager.h" #include +#include "hpp/fcl/broadphase/broadphase_continuous_collision_manager.h" + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h index 0ef013214..dd494ede9 100644 --- a/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h +++ b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h @@ -38,10 +38,10 @@ #ifndef HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_INL_H #define HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_INL_H -#include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h" - #include +#include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h" + #if HPP_FCL_HAVE_OCTOMAP #include "hpp/fcl/octree.h" #endif diff --git a/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h index 10b4341c3..af5cbc28f 100644 --- a/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h +++ b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h @@ -38,8 +38,8 @@ #ifndef HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_H #define HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_H -#include #include +#include #include "hpp/fcl/fwd.hh" // #include "hpp/fcl/BV/utility.h" diff --git a/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h index e4756300b..c7937267b 100644 --- a/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h +++ b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h @@ -38,9 +38,9 @@ #ifndef HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_ARRAY_H #define HPP_FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_ARRAY_H -#include #include #include +#include #include "hpp/fcl/fwd.hh" // #include "hpp/fcl/BV/utility.h" diff --git a/include/hpp/fcl/broadphase/broadphase_spatialhash.h b/include/hpp/fcl/broadphase/broadphase_spatialhash.h index 606b82ada..a69c8148b 100644 --- a/include/hpp/fcl/broadphase/broadphase_spatialhash.h +++ b/include/hpp/fcl/broadphase/broadphase_spatialhash.h @@ -40,6 +40,7 @@ #include #include + #include "hpp/fcl/BV/AABB.h" #include "hpp/fcl/broadphase/broadphase_collision_manager.h" #include "hpp/fcl/broadphase/detail/simple_hash_table.h" diff --git a/include/hpp/fcl/broadphase/detail/hierarchy_tree.h b/include/hpp/fcl/broadphase/detail/hierarchy_tree.h index 54cddd079..a28db73f3 100644 --- a/include/hpp/fcl/broadphase/detail/hierarchy_tree.h +++ b/include/hpp/fcl/broadphase/detail/hierarchy_tree.h @@ -38,14 +38,15 @@ #ifndef HPP_FCL_HIERARCHY_TREE_H #define HPP_FCL_HIERARCHY_TREE_H -#include -#include #include #include -#include "hpp/fcl/warning.hh" +#include +#include + #include "hpp/fcl/BV/AABB.h" #include "hpp/fcl/broadphase/detail/morton.h" #include "hpp/fcl/broadphase/detail/node_base.h" +#include "hpp/fcl/warning.hh" namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/hierarchy_tree_array-inl.h b/include/hpp/fcl/broadphase/detail/hierarchy_tree_array-inl.h index 8bb715fe9..bc0d62117 100644 --- a/include/hpp/fcl/broadphase/detail/hierarchy_tree_array-inl.h +++ b/include/hpp/fcl/broadphase/detail/hierarchy_tree_array-inl.h @@ -38,11 +38,11 @@ #ifndef HPP_FCL_HIERARCHY_TREE_ARRAY_INL_H #define HPP_FCL_HIERARCHY_TREE_ARRAY_INL_H -#include "hpp/fcl/broadphase/detail/hierarchy_tree_array.h" - #include #include +#include "hpp/fcl/broadphase/detail/hierarchy_tree_array.h" + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/hierarchy_tree_array.h b/include/hpp/fcl/broadphase/detail/hierarchy_tree_array.h index 8709a848b..116bd1d4f 100644 --- a/include/hpp/fcl/broadphase/detail/hierarchy_tree_array.h +++ b/include/hpp/fcl/broadphase/detail/hierarchy_tree_array.h @@ -38,14 +38,14 @@ #ifndef HPP_FCL_HIERARCHY_TREE_ARRAY_H #define HPP_FCL_HIERARCHY_TREE_ARRAY_H -#include -#include #include +#include +#include -#include "hpp/fcl/fwd.hh" #include "hpp/fcl/BV/AABB.h" #include "hpp/fcl/broadphase/detail/morton.h" #include "hpp/fcl/broadphase/detail/node_base_array.h" +#include "hpp/fcl/fwd.hh" namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/interval_tree.h b/include/hpp/fcl/broadphase/detail/interval_tree.h index 02ebfbbc2..f9817ba18 100644 --- a/include/hpp/fcl/broadphase/detail/interval_tree.h +++ b/include/hpp/fcl/broadphase/detail/interval_tree.h @@ -38,9 +38,9 @@ #ifndef HPP_FCL_INTERVAL_TREE_H #define HPP_FCL_INTERVAL_TREE_H +#include #include #include -#include #include "hpp/fcl/broadphase/detail/interval_tree_node.h" diff --git a/include/hpp/fcl/broadphase/detail/interval_tree_node-inl.h b/include/hpp/fcl/broadphase/detail/interval_tree_node-inl.h index b9771ae18..3e6551fba 100644 --- a/include/hpp/fcl/broadphase/detail/interval_tree_node-inl.h +++ b/include/hpp/fcl/broadphase/detail/interval_tree_node-inl.h @@ -38,10 +38,10 @@ #ifndef HPP_FCL_BROADPHASE_DETAIL_INTERVALTREENODE_INL_H #define HPP_FCL_BROADPHASE_DETAIL_INTERVALTREENODE_INL_H -#include "hpp/fcl/broadphase/detail/interval_tree_node.h" - -#include #include +#include + +#include "hpp/fcl/broadphase/detail/interval_tree_node.h" namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/morton.h b/include/hpp/fcl/broadphase/detail/morton.h index fb480d387..ca482d30f 100644 --- a/include/hpp/fcl/broadphase/detail/morton.h +++ b/include/hpp/fcl/broadphase/detail/morton.h @@ -39,9 +39,10 @@ #ifndef HPP_FCL_MORTON_H #define HPP_FCL_MORTON_H -#include "hpp/fcl/BV/AABB.h" #include +#include "hpp/fcl/BV/AABB.h" + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/simple_hash_table-inl.h b/include/hpp/fcl/broadphase/detail/simple_hash_table-inl.h index de51472a2..6a77df7b6 100644 --- a/include/hpp/fcl/broadphase/detail/simple_hash_table-inl.h +++ b/include/hpp/fcl/broadphase/detail/simple_hash_table-inl.h @@ -38,9 +38,9 @@ #ifndef HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_INL_H #define HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_INL_H -#include "hpp/fcl/broadphase/detail/simple_hash_table.h" - #include + +#include "hpp/fcl/broadphase/detail/simple_hash_table.h" namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/simple_hash_table.h b/include/hpp/fcl/broadphase/detail/simple_hash_table.h index ed1f0fcd8..034cca45f 100644 --- a/include/hpp/fcl/broadphase/detail/simple_hash_table.h +++ b/include/hpp/fcl/broadphase/detail/simple_hash_table.h @@ -38,9 +38,9 @@ #ifndef HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_H #define HPP_FCL_BROADPHASE_SIMPLEHASHTABLE_H +#include #include #include -#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/simple_interval-inl.h b/include/hpp/fcl/broadphase/detail/simple_interval-inl.h index 78719156c..6a616399d 100644 --- a/include/hpp/fcl/broadphase/detail/simple_interval-inl.h +++ b/include/hpp/fcl/broadphase/detail/simple_interval-inl.h @@ -38,9 +38,10 @@ #ifndef HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_INL_H #define HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_INL_H -#include "hpp/fcl/broadphase/detail/simple_interval.h" #include +#include "hpp/fcl/broadphase/detail/simple_interval.h" + namespace hpp { namespace fcl { namespace detail { diff --git a/include/hpp/fcl/broadphase/detail/simple_interval.h b/include/hpp/fcl/broadphase/detail/simple_interval.h index 0f1976ebf..85d63f76d 100644 --- a/include/hpp/fcl/broadphase/detail/simple_interval.h +++ b/include/hpp/fcl/broadphase/detail/simple_interval.h @@ -38,8 +38,8 @@ #ifndef HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_H #define HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_H -#include "hpp/fcl/fwd.hh" #include "hpp/fcl/data_types.h" +#include "hpp/fcl/fwd.hh" namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/sparse_hash_table.h b/include/hpp/fcl/broadphase/detail/sparse_hash_table.h index 4d8030087..6e7a4b9f8 100644 --- a/include/hpp/fcl/broadphase/detail/sparse_hash_table.h +++ b/include/hpp/fcl/broadphase/detail/sparse_hash_table.h @@ -38,10 +38,10 @@ #ifndef HPP_FCL_BROADPHASE_SPARSEHASHTABLE_H #define HPP_FCL_BROADPHASE_SPARSEHASHTABLE_H -#include -#include #include +#include #include +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/broadphase/detail/spatial_hash-inl.h b/include/hpp/fcl/broadphase/detail/spatial_hash-inl.h index 1248b9eae..fa0670014 100644 --- a/include/hpp/fcl/broadphase/detail/spatial_hash-inl.h +++ b/include/hpp/fcl/broadphase/detail/spatial_hash-inl.h @@ -38,9 +38,10 @@ #ifndef HPP_FCL_BROADPHASE_SPATIALHASH_INL_H #define HPP_FCL_BROADPHASE_SPATIALHASH_INL_H -#include "hpp/fcl/broadphase/detail/spatial_hash.h" #include +#include "hpp/fcl/broadphase/detail/spatial_hash.h" + namespace hpp { namespace fcl { namespace detail { diff --git a/include/hpp/fcl/broadphase/detail/spatial_hash.h b/include/hpp/fcl/broadphase/detail/spatial_hash.h index a7b711ea2..14558a02c 100644 --- a/include/hpp/fcl/broadphase/detail/spatial_hash.h +++ b/include/hpp/fcl/broadphase/detail/spatial_hash.h @@ -38,9 +38,10 @@ #ifndef HPP_FCL_BROADPHASE_SPATIALHASH_H #define HPP_FCL_BROADPHASE_SPATIALHASH_H -#include "hpp/fcl/BV/AABB.h" #include +#include "hpp/fcl/BV/AABB.h" + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/collision.h b/include/hpp/fcl/collision.h index e25f3ae27..9d8914a55 100644 --- a/include/hpp/fcl/collision.h +++ b/include/hpp/fcl/collision.h @@ -39,10 +39,10 @@ #ifndef HPP_FCL_COLLISION_H #define HPP_FCL_COLLISION_H -#include -#include #include #include +#include +#include #include namespace hpp { diff --git a/include/hpp/fcl/collision_data.h b/include/hpp/fcl/collision_data.h index bf4357365..a56efb9e2 100644 --- a/include/hpp/fcl/collision_data.h +++ b/include/hpp/fcl/collision_data.h @@ -38,15 +38,15 @@ #ifndef HPP_FCL_COLLISION_DATA_H #define HPP_FCL_COLLISION_DATA_H -#include -#include -#include - #include -#include #include #include +#include +#include +#include +#include + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/collision_func_matrix.h b/include/hpp/fcl/collision_func_matrix.h index 57b78bdfa..6a0c19cc5 100644 --- a/include/hpp/fcl/collision_func_matrix.h +++ b/include/hpp/fcl/collision_func_matrix.h @@ -38,8 +38,8 @@ #ifndef HPP_FCL_COLLISION_FUNC_MATRIX_H #define HPP_FCL_COLLISION_FUNC_MATRIX_H -#include #include +#include #include namespace hpp { diff --git a/include/hpp/fcl/collision_object.h b/include/hpp/fcl/collision_object.h index 6d9159c54..089d4da76 100644 --- a/include/hpp/fcl/collision_object.h +++ b/include/hpp/fcl/collision_object.h @@ -38,13 +38,13 @@ #ifndef HPP_FCL_COLLISION_OBJECT_BASE_H #define HPP_FCL_COLLISION_OBJECT_BASE_H -#include -#include +#include +#include #include #include -#include -#include +#include +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/data_types.h b/include/hpp/fcl/data_types.h index 952a5cd12..f85685c73 100644 --- a/include/hpp/fcl/data_types.h +++ b/include/hpp/fcl/data_types.h @@ -40,7 +40,6 @@ #include #include - #include namespace hpp { diff --git a/include/hpp/fcl/distance.h b/include/hpp/fcl/distance.h index a146508c2..8133e1abe 100644 --- a/include/hpp/fcl/distance.h +++ b/include/hpp/fcl/distance.h @@ -38,8 +38,8 @@ #ifndef HPP_FCL_DISTANCE_H #define HPP_FCL_DISTANCE_H -#include #include +#include #include #include diff --git a/include/hpp/fcl/distance_func_matrix.h b/include/hpp/fcl/distance_func_matrix.h index cf51cb906..e8f3b5e77 100644 --- a/include/hpp/fcl/distance_func_matrix.h +++ b/include/hpp/fcl/distance_func_matrix.h @@ -38,8 +38,8 @@ #ifndef HPP_FCL_DISTANCE_FUNC_MATRIX_H #define HPP_FCL_DISTANCE_FUNC_MATRIX_H -#include #include +#include #include namespace hpp { diff --git a/include/hpp/fcl/fwd.hh b/include/hpp/fcl/fwd.hh index 0585ce3b4..1997d215a 100644 --- a/include/hpp/fcl/fwd.hh +++ b/include/hpp/fcl/fwd.hh @@ -38,13 +38,12 @@ #ifndef HPP_FCL_FWD_HH #define HPP_FCL_FWD_HH -#include -#include -#include - #include #include #include +#include +#include +#include #if _WIN32 #define HPP_FCL_PRETTY_FUNCTION __FUNCSIG__ diff --git a/include/hpp/fcl/hfield.h b/include/hpp/fcl/hfield.h index adb8f3d01..838717e7d 100644 --- a/include/hpp/fcl/hfield.h +++ b/include/hpp/fcl/hfield.h @@ -37,11 +37,11 @@ #ifndef HPP_FCL_HEIGHT_FIELD_H #define HPP_FCL_HEIGHT_FIELD_H -#include -#include #include #include +#include +#include #include namespace hpp { diff --git a/include/hpp/fcl/internal/BV_fitter.h b/include/hpp/fcl/internal/BV_fitter.h index 514741f0b..7d2ca12a6 100644 --- a/include/hpp/fcl/internal/BV_fitter.h +++ b/include/hpp/fcl/internal/BV_fitter.h @@ -38,10 +38,11 @@ #ifndef HPP_FCL_BV_FITTER_H #define HPP_FCL_BV_FITTER_H -#include -#include -#include #include +#include +#include +#include + #include namespace hpp { diff --git a/include/hpp/fcl/internal/BV_splitter.h b/include/hpp/fcl/internal/BV_splitter.h index 24c5c6077..de3e32aa9 100644 --- a/include/hpp/fcl/internal/BV_splitter.h +++ b/include/hpp/fcl/internal/BV_splitter.h @@ -38,11 +38,12 @@ #ifndef HPP_FCL_BV_SPLITTER_H #define HPP_FCL_BV_SPLITTER_H -#include -#include #include -#include +#include +#include + #include +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/tools.h b/include/hpp/fcl/internal/tools.h index 52a2ecad7..f31088232 100644 --- a/include/hpp/fcl/internal/tools.h +++ b/include/hpp/fcl/internal/tools.h @@ -38,14 +38,13 @@ #ifndef HPP_FCL_INTERNAL_TOOLS_H #define HPP_FCL_INTERNAL_TOOLS_H -#include +#include #include +#include #include #include -#include - namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_node_base.h b/include/hpp/fcl/internal/traversal_node_base.h index a3c56f8d4..8114c4c96 100644 --- a/include/hpp/fcl/internal/traversal_node_base.h +++ b/include/hpp/fcl/internal/traversal_node_base.h @@ -40,9 +40,9 @@ /// @cond INTERNAL +#include #include #include -#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_node_bvh_hfield.h b/include/hpp/fcl/internal/traversal_node_bvh_hfield.h index 27a0caed5..19e76e703 100644 --- a/include/hpp/fcl/internal/traversal_node_bvh_hfield.h +++ b/include/hpp/fcl/internal/traversal_node_bvh_hfield.h @@ -39,21 +39,21 @@ /// @cond INTERNAL -#include -#include -#include -#include #include +#include #include +#include #include #include -#include -#include #include +#include +#include +#include +#include +#include #include #include -#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_node_bvh_shape.h b/include/hpp/fcl/internal/traversal_node_bvh_shape.h index f1ced715e..4381b0868 100644 --- a/include/hpp/fcl/internal/traversal_node_bvh_shape.h +++ b/include/hpp/fcl/internal/traversal_node_bvh_shape.h @@ -40,13 +40,13 @@ /// @cond INTERNAL +#include #include -#include +#include +#include #include +#include #include -#include -#include -#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_node_bvhs.h b/include/hpp/fcl/internal/traversal_node_bvhs.h index 9880bec43..f2bcdc69a 100644 --- a/include/hpp/fcl/internal/traversal_node_bvhs.h +++ b/include/hpp/fcl/internal/traversal_node_bvhs.h @@ -40,19 +40,19 @@ /// @cond INTERNAL -#include -#include -#include #include +#include #include +#include #include -#include -#include #include +#include +#include +#include +#include #include #include -#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_node_hfield_shape.h b/include/hpp/fcl/internal/traversal_node_hfield_shape.h index 9fdcb85d1..eddb23502 100644 --- a/include/hpp/fcl/internal/traversal_node_hfield_shape.h +++ b/include/hpp/fcl/internal/traversal_node_hfield_shape.h @@ -40,13 +40,13 @@ /// @cond INTERNAL #include -#include -#include -#include -#include -#include #include +#include +#include +#include #include +#include +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_node_octree.h b/include/hpp/fcl/internal/traversal_node_octree.h index 7aea1bfa9..d97cc0e4d 100644 --- a/include/hpp/fcl/internal/traversal_node_octree.h +++ b/include/hpp/fcl/internal/traversal_node_octree.h @@ -40,13 +40,13 @@ /// @cond INTERNAL +#include #include +#include #include #include #include -#include #include -#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_node_setup.h b/include/hpp/fcl/internal/traversal_node_setup.h index e73512634..88a9da8c5 100644 --- a/include/hpp/fcl/internal/traversal_node_setup.h +++ b/include/hpp/fcl/internal/traversal_node_setup.h @@ -41,10 +41,9 @@ /// @cond INTERNAL #include -#include - -#include #include +#include +#include // #include #include diff --git a/include/hpp/fcl/internal/traversal_node_shapes.h b/include/hpp/fcl/internal/traversal_node_shapes.h index 1e4550337..bc771439b 100644 --- a/include/hpp/fcl/internal/traversal_node_shapes.h +++ b/include/hpp/fcl/internal/traversal_node_shapes.h @@ -40,11 +40,11 @@ /// @cond INTERNAL +#include #include +#include #include -#include #include -#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/internal/traversal_recurse.h b/include/hpp/fcl/internal/traversal_recurse.h index 1f15fe4f2..7f079b0d0 100644 --- a/include/hpp/fcl/internal/traversal_recurse.h +++ b/include/hpp/fcl/internal/traversal_recurse.h @@ -41,10 +41,11 @@ /// @cond INTERNAL #include -#include #include #include +#include + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/mesh_loader/assimp.h b/include/hpp/fcl/mesh_loader/assimp.h index 115933740..620eb7e90 100644 --- a/include/hpp/fcl/mesh_loader/assimp.h +++ b/include/hpp/fcl/mesh_loader/assimp.h @@ -38,11 +38,12 @@ #ifndef HPP_FCL_MESH_LOADER_ASSIMP_H #define HPP_FCL_MESH_LOADER_ASSIMP_H -#include -#include #include #include +#include +#include + struct aiScene; namespace Assimp { class Importer; diff --git a/include/hpp/fcl/mesh_loader/loader.h b/include/hpp/fcl/mesh_loader/loader.h index d2443cc21..a0721bd45 100644 --- a/include/hpp/fcl/mesh_loader/loader.h +++ b/include/hpp/fcl/mesh_loader/loader.h @@ -38,11 +38,11 @@ #ifndef HPP_FCL_MESH_LOADER_LOADER_H #define HPP_FCL_MESH_LOADER_LOADER_H -#include -#include -#include #include +#include +#include +#include #include namespace hpp { diff --git a/include/hpp/fcl/narrowphase/gjk.h b/include/hpp/fcl/narrowphase/gjk.h index cce65d0b9..b98551cdd 100644 --- a/include/hpp/fcl/narrowphase/gjk.h +++ b/include/hpp/fcl/narrowphase/gjk.h @@ -38,10 +38,10 @@ #ifndef HPP_FCL_GJK_H #define HPP_FCL_GJK_H -#include - -#include #include +#include + +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/narrowphase/narrowphase.h b/include/hpp/fcl/narrowphase/narrowphase.h index 519f3aecc..efa482357 100644 --- a/include/hpp/fcl/narrowphase/narrowphase.h +++ b/include/hpp/fcl/narrowphase/narrowphase.h @@ -40,11 +40,11 @@ #ifndef HPP_FCL_NARROWPHASE_H #define HPP_FCL_NARROWPHASE_H -#include -#include - -#include #include +#include + +#include +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/octree.h b/include/hpp/fcl/octree.h index 19d9d1fd8..18992eccc 100644 --- a/include/hpp/fcl/octree.h +++ b/include/hpp/fcl/octree.h @@ -38,12 +38,12 @@ #ifndef HPP_FCL_OCTREE_H #define HPP_FCL_OCTREE_H -#include - -#include -#include #include #include +#include + +#include +#include namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/serialization/BVH_model.h b/include/hpp/fcl/serialization/BVH_model.h index d48d20b2a..ae8d23444 100644 --- a/include/hpp/fcl/serialization/BVH_model.h +++ b/include/hpp/fcl/serialization/BVH_model.h @@ -6,11 +6,10 @@ #define HPP_FCL_SERIALIZATION_BVH_MODEL_H #include "hpp/fcl/BVH/BVH_model.h" - -#include "hpp/fcl/serialization/fwd.h" #include "hpp/fcl/serialization/BV_node.h" #include "hpp/fcl/serialization/BV_splitter.h" #include "hpp/fcl/serialization/collision_object.h" +#include "hpp/fcl/serialization/fwd.h" #include "hpp/fcl/serialization/memory.h" #include "hpp/fcl/serialization/triangle.h" diff --git a/include/hpp/fcl/serialization/BV_node.h b/include/hpp/fcl/serialization/BV_node.h index 78193cda5..6c42889fa 100644 --- a/include/hpp/fcl/serialization/BV_node.h +++ b/include/hpp/fcl/serialization/BV_node.h @@ -6,9 +6,8 @@ #define HPP_FCL_SERIALIZATION_BV_NODE_H #include "hpp/fcl/BV/BV_node.h" - -#include "hpp/fcl/serialization/fwd.h" #include "hpp/fcl/serialization/OBBRSS.h" +#include "hpp/fcl/serialization/fwd.h" namespace boost { namespace serialization { diff --git a/include/hpp/fcl/serialization/BV_splitter.h b/include/hpp/fcl/serialization/BV_splitter.h index 24eac7649..7025bc9e7 100644 --- a/include/hpp/fcl/serialization/BV_splitter.h +++ b/include/hpp/fcl/serialization/BV_splitter.h @@ -6,7 +6,6 @@ #define HPP_FCL_SERIALIZATION_BV_SPLITTER_H #include "hpp/fcl/internal/BV_splitter.h" - #include "hpp/fcl/serialization/fwd.h" namespace boost { diff --git a/include/hpp/fcl/serialization/OBB.h b/include/hpp/fcl/serialization/OBB.h index 2c07a44e7..ce5f3d742 100644 --- a/include/hpp/fcl/serialization/OBB.h +++ b/include/hpp/fcl/serialization/OBB.h @@ -6,7 +6,6 @@ #define HPP_FCL_SERIALIZATION_OBB_H #include "hpp/fcl/BV/OBB.h" - #include "hpp/fcl/serialization/fwd.h" namespace boost { diff --git a/include/hpp/fcl/serialization/OBBRSS.h b/include/hpp/fcl/serialization/OBBRSS.h index b19ce3a36..dd209d456 100644 --- a/include/hpp/fcl/serialization/OBBRSS.h +++ b/include/hpp/fcl/serialization/OBBRSS.h @@ -6,10 +6,9 @@ #define HPP_FCL_SERIALIZATION_OBBRSS_H #include "hpp/fcl/BV/OBBRSS.h" - -#include "hpp/fcl/serialization/fwd.h" #include "hpp/fcl/serialization/OBB.h" #include "hpp/fcl/serialization/RSS.h" +#include "hpp/fcl/serialization/fwd.h" namespace boost { namespace serialization { diff --git a/include/hpp/fcl/serialization/RSS.h b/include/hpp/fcl/serialization/RSS.h index 4f1f7ee75..2856cae1c 100644 --- a/include/hpp/fcl/serialization/RSS.h +++ b/include/hpp/fcl/serialization/RSS.h @@ -6,7 +6,6 @@ #define HPP_FCL_SERIALIZATION_RSS_H #include "hpp/fcl/BV/RSS.h" - #include "hpp/fcl/serialization/fwd.h" namespace boost { diff --git a/include/hpp/fcl/serialization/collision_object.h b/include/hpp/fcl/serialization/collision_object.h index 4264b38e3..2233573d5 100644 --- a/include/hpp/fcl/serialization/collision_object.h +++ b/include/hpp/fcl/serialization/collision_object.h @@ -6,9 +6,8 @@ #define HPP_FCL_SERIALIZATION_COLLISION_OBJECT_H #include "hpp/fcl/collision_object.h" - -#include "hpp/fcl/serialization/fwd.h" #include "hpp/fcl/serialization/AABB.h" +#include "hpp/fcl/serialization/fwd.h" namespace boost { namespace serialization { diff --git a/include/hpp/fcl/serialization/convex.h b/include/hpp/fcl/serialization/convex.h index dc027bc84..54b20db64 100644 --- a/include/hpp/fcl/serialization/convex.h +++ b/include/hpp/fcl/serialization/convex.h @@ -5,13 +5,12 @@ #ifndef HPP_FCL_SERIALIZATION_CONVEX_H #define HPP_FCL_SERIALIZATION_CONVEX_H -#include "hpp/fcl/shape/convex.h" - #include "hpp/fcl/serialization/fwd.h" #include "hpp/fcl/serialization/geometric_shapes.h" #include "hpp/fcl/serialization/memory.h" -#include "hpp/fcl/serialization/triangle.h" #include "hpp/fcl/serialization/quadrilateral.h" +#include "hpp/fcl/serialization/triangle.h" +#include "hpp/fcl/shape/convex.h" namespace boost { namespace serialization { diff --git a/include/hpp/fcl/serialization/eigen.h b/include/hpp/fcl/serialization/eigen.h index 2aeb2c2e1..0df5a5e4b 100644 --- a/include/hpp/fcl/serialization/eigen.h +++ b/include/hpp/fcl/serialization/eigen.h @@ -12,10 +12,9 @@ #define HPP_FCL_SERIALIZATION_EIGEN_H #include - +#include #include #include -#include // Workaround a bug in GCC >= 7 and C++17 // ref. https://gitlab.com/libeigen/eigen/-/issues/1676 diff --git a/include/hpp/fcl/serialization/fwd.h b/include/hpp/fcl/serialization/fwd.h index 51ef14908..170d7571f 100644 --- a/include/hpp/fcl/serialization/fwd.h +++ b/include/hpp/fcl/serialization/fwd.h @@ -5,8 +5,8 @@ #ifndef HPP_FCL_SERIALIZATION_FWD_H #define HPP_FCL_SERIALIZATION_FWD_H -#include #include +#include #include "hpp/fcl/serialization/eigen.h" diff --git a/include/hpp/fcl/serialization/geometric_shapes.h b/include/hpp/fcl/serialization/geometric_shapes.h index 0459c5f60..8581bc176 100644 --- a/include/hpp/fcl/serialization/geometric_shapes.h +++ b/include/hpp/fcl/serialization/geometric_shapes.h @@ -5,8 +5,8 @@ #ifndef HPP_FCL_SERIALIZATION_GEOMETRIC_SHAPES_H #define HPP_FCL_SERIALIZATION_GEOMETRIC_SHAPES_H -#include "hpp/fcl/shape/geometric_shapes.h" #include "hpp/fcl/serialization/fwd.h" +#include "hpp/fcl/shape/geometric_shapes.h" namespace boost { namespace serialization { diff --git a/include/hpp/fcl/serialization/hfield.h b/include/hpp/fcl/serialization/hfield.h index 7ae2433ef..91e0d9261 100644 --- a/include/hpp/fcl/serialization/hfield.h +++ b/include/hpp/fcl/serialization/hfield.h @@ -6,9 +6,8 @@ #define HPP_FCL_SERIALIZATION_HFIELD_H #include "hpp/fcl/hfield.h" - -#include "hpp/fcl/serialization/fwd.h" #include "hpp/fcl/serialization/OBBRSS.h" +#include "hpp/fcl/serialization/fwd.h" namespace boost { namespace serialization { diff --git a/include/hpp/fcl/shape/geometric_shape_to_BVH_model.h b/include/hpp/fcl/shape/geometric_shape_to_BVH_model.h index dec758e54..8df3d4b75 100644 --- a/include/hpp/fcl/shape/geometric_shape_to_BVH_model.h +++ b/include/hpp/fcl/shape/geometric_shape_to_BVH_model.h @@ -38,8 +38,9 @@ #ifndef GEOMETRIC_SHAPE_TO_BVH_MODEL_H #define GEOMETRIC_SHAPE_TO_BVH_MODEL_H -#include #include +#include + #include namespace hpp { diff --git a/include/hpp/fcl/shape/geometric_shapes.h b/include/hpp/fcl/shape/geometric_shapes.h index c469bd972..96720e321 100644 --- a/include/hpp/fcl/shape/geometric_shapes.h +++ b/include/hpp/fcl/shape/geometric_shapes.h @@ -38,12 +38,12 @@ #ifndef HPP_FCL_GEOMETRIC_SHAPES_H #define HPP_FCL_GEOMETRIC_SHAPES_H -#include - #include #include #include +#include + namespace hpp { namespace fcl { diff --git a/include/hpp/fcl/shape/geometric_shapes_utility.h b/include/hpp/fcl/shape/geometric_shapes_utility.h index 33d412aa2..a3b92327a 100644 --- a/include/hpp/fcl/shape/geometric_shapes_utility.h +++ b/include/hpp/fcl/shape/geometric_shapes_utility.h @@ -38,10 +38,11 @@ #ifndef HPP_FCL_GEOMETRIC_SHAPES_UTILITY_H #define HPP_FCL_GEOMETRIC_SHAPES_UTILITY_H -#include -#include #include #include +#include + +#include namespace hpp { namespace fcl { diff --git a/python/broadphase/broadphase.cc b/python/broadphase/broadphase.cc index 8f4dac9bf..639365174 100644 --- a/python/broadphase/broadphase.cc +++ b/python/broadphase/broadphase.cc @@ -33,13 +33,13 @@ // POSSIBILITY OF SUCH DAMAGE. #include -#include "../fcl.hh" +#include "../fcl.hh" +#include "hpp/fcl/broadphase/broadphase_SSaP.h" +#include "hpp/fcl/broadphase/broadphase_SaP.h" +#include "hpp/fcl/broadphase/broadphase_bruteforce.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h" -#include "hpp/fcl/broadphase/broadphase_bruteforce.h" -#include "hpp/fcl/broadphase/broadphase_SaP.h" -#include "hpp/fcl/broadphase/broadphase_SSaP.h" #include "hpp/fcl/broadphase/broadphase_interval_tree.h" #include "hpp/fcl/broadphase/broadphase_spatialhash.h" diff --git a/python/broadphase/broadphase_callbacks.hh b/python/broadphase/broadphase_callbacks.hh index b6ed07d7b..a6fe668dd 100644 --- a/python/broadphase/broadphase_callbacks.hh +++ b/python/broadphase/broadphase_callbacks.hh @@ -35,10 +35,10 @@ #ifndef HPP_FCL_PYTHON_BROADPHASE_BROADPHASE_CALLBACKS_HH #define HPP_FCL_PYTHON_BROADPHASE_BROADPHASE_CALLBACKS_HH -#include +#include +#include #include -#include #include "../fcl.hh" diff --git a/python/broadphase/broadphase_collision_manager.hh b/python/broadphase/broadphase_collision_manager.hh index 796dbd475..26461b8d7 100644 --- a/python/broadphase/broadphase_collision_manager.hh +++ b/python/broadphase/broadphase_collision_manager.hh @@ -35,12 +35,12 @@ #ifndef HPP_FCL_PYTHON_BROADPHASE_BROADPHASE_COLLISION_MANAGER_HH #define HPP_FCL_PYTHON_BROADPHASE_BROADPHASE_COLLISION_MANAGER_HH -#include - -#include #include #include +#include +#include + #include "../fcl.hh" #ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC diff --git a/python/collision-geometries.cc b/python/collision-geometries.cc index 9801851f6..d952f2aa5 100644 --- a/python/collision-geometries.cc +++ b/python/collision-geometries.cc @@ -32,38 +32,36 @@ // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include -#include - -#include "fcl.hh" -#include "deprecation.hh" - -#include -#include -#include #include #include - -#include #include #include -#include -#include #include +#include +#include +#include +#include +#include + +#include +#include +#include +#include "deprecation.hh" +#include "fcl.hh" #include "pickle.hh" #ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC // FIXME for a reason I do not understand, doxygen fails to understand that // BV_splitter is not defined in hpp/fcl/BVH/BVH_model.h -#include #include +#include -#include "doxygen_autodoc/hpp/fcl/BVH/BVH_model.h" +#include "doxygen_autodoc/functions.h" #include "doxygen_autodoc/hpp/fcl/BV/AABB.h" +#include "doxygen_autodoc/hpp/fcl/BVH/BVH_model.h" #include "doxygen_autodoc/hpp/fcl/hfield.h" #include "doxygen_autodoc/hpp/fcl/shape/geometric_shapes.h" -#include "doxygen_autodoc/functions.h" #endif using namespace boost::python; diff --git a/python/collision.cc b/python/collision.cc index eebd892f9..fb22c7bf7 100644 --- a/python/collision.cc +++ b/python/collision.cc @@ -32,21 +32,21 @@ // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include +#include +#include #include -#include -#include "fcl.hh" #include "deprecation.hh" +#include "fcl.hh" #ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC #include "doxygen_autodoc/functions.h" #include "doxygen_autodoc/hpp/fcl/collision_data.h" #endif -#include "../doc/python/doxygen.hh" #include "../doc/python/doxygen-boost.hh" +#include "../doc/python/doxygen.hh" using namespace boost::python; using namespace hpp::fcl; diff --git a/python/deprecation.hh b/python/deprecation.hh index 0c5e5adeb..8f8999733 100644 --- a/python/deprecation.hh +++ b/python/deprecation.hh @@ -6,6 +6,7 @@ #define HPP_FCL_PYTHON_UTILS_DEPRECATION_H #include + #include #include diff --git a/python/distance.cc b/python/distance.cc index d69427f23..5a98ce319 100644 --- a/python/distance.cc +++ b/python/distance.cc @@ -32,13 +32,13 @@ // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. +#include + #include +#include #include "fcl.hh" -#include -#include - #ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC #include "doxygen_autodoc/functions.h" #include "doxygen_autodoc/hpp/fcl/collision_data.h" diff --git a/python/fcl.cc b/python/fcl.cc index a0061d6fe..3b38002da 100644 --- a/python/fcl.cc +++ b/python/fcl.cc @@ -32,24 +32,22 @@ // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -#include - #include "fcl.hh" -#include -#include #include - +#include #include +#include -#include +#include +#include #ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC #include "doxygen_autodoc/hpp/fcl/mesh_loader/loader.h" #endif -#include "../doc/python/doxygen.hh" #include "../doc/python/doxygen-boost.hh" +#include "../doc/python/doxygen.hh" using namespace hpp::fcl; namespace dv = doxygen::visitor; diff --git a/python/fwd.hh b/python/fwd.hh index 45e24bcbf..70494ada1 100644 --- a/python/fwd.hh +++ b/python/fwd.hh @@ -20,8 +20,8 @@ using hpp::fcl::shared_ptr; #include #undef BOOST_BIND_GLOBAL_PLACEHOLDERS -#include "../doc/python/doxygen.hh" #include "../doc/python/doxygen-boost.hh" +#include "../doc/python/doxygen.hh" namespace bp = boost::python; namespace dv = doxygen::visitor; diff --git a/python/gjk.cc b/python/gjk.cc index c9e9f856f..fc6b6b794 100644 --- a/python/gjk.cc +++ b/python/gjk.cc @@ -32,13 +32,13 @@ // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. +#include + #include +#include #include "fcl.hh" -#include -#include - #ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC #include "doxygen_autodoc/functions.h" #include "doxygen_autodoc/hpp/fcl/narrowphase/gjk.h" diff --git a/python/math.cc b/python/math.cc index 9e92cb12b..a4f936a17 100644 --- a/python/math.cc +++ b/python/math.cc @@ -32,11 +32,11 @@ // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. +#include + #include #include - #include -#include #include "fcl.hh" diff --git a/python/octree.cc b/python/octree.cc index e0721af11..a23489525 100644 --- a/python/octree.cc +++ b/python/octree.cc @@ -1,8 +1,9 @@ -#include "fcl.hh" +#include #include -#include + +#include "fcl.hh" #ifdef HPP_FCL_HAS_DOXYGEN_AUTODOC #include "doxygen_autodoc/functions.h" diff --git a/python/pickle.hh b/python/pickle.hh index 3e640cf0d..37496efe9 100644 --- a/python/pickle.hh +++ b/python/pickle.hh @@ -5,11 +5,10 @@ #ifndef HPP_FCL_PYTHON_PICKLE_H #define HPP_FCL_PYTHON_PICKLE_H +#include +#include #include #include - -#include -#include #include using namespace boost::python; diff --git a/python/version.cc b/python/version.cc index f83798629..5e86f2045 100644 --- a/python/version.cc +++ b/python/version.cc @@ -2,10 +2,11 @@ // Copyright (c) 2019 CNRS INRIA // -#include "hpp/fcl/config.hh" -#include "fcl.hh" #include +#include "fcl.hh" +#include "hpp/fcl/config.hh" + namespace bp = boost::python; inline bool checkVersionAtLeast(int major, int minor, int patch) { diff --git a/src/BV/AABB.cpp b/src/BV/AABB.cpp index 665efc0b4..a7627f0e5 100644 --- a/src/BV/AABB.cpp +++ b/src/BV/AABB.cpp @@ -36,9 +36,9 @@ /** \author Jia Pan */ #include +#include #include -#include namespace hpp { namespace fcl { diff --git a/src/BV/OBB.cpp b/src/BV/OBB.cpp index 10d508953..1dbe80b66 100644 --- a/src/BV/OBB.cpp +++ b/src/BV/OBB.cpp @@ -37,9 +37,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/BV/RSS.cpp b/src/BV/RSS.cpp index 5082775af..bbed88bac 100644 --- a/src/BV/RSS.cpp +++ b/src/BV/RSS.cpp @@ -37,8 +37,8 @@ #include #include -#include #include +#include #include diff --git a/src/BV/kDOP.cpp b/src/BV/kDOP.cpp index 3e92cb30d..3fe644292 100644 --- a/src/BV/kDOP.cpp +++ b/src/BV/kDOP.cpp @@ -36,11 +36,11 @@ /** \author Jia Pan */ #include -#include -#include - #include +#include +#include + namespace hpp { namespace fcl { diff --git a/src/BVH/BVH_model.cpp b/src/BVH/BVH_model.cpp index 7aff1b6b3..47f5a9f94 100644 --- a/src/BVH/BVH_model.cpp +++ b/src/BVH/BVH_model.cpp @@ -36,16 +36,14 @@ /** \author Jia Pan */ -#include - -#include -#include - #include +#include +#include +#include #include +#include -#include -#include +#include namespace hpp { namespace fcl { diff --git a/src/BVH/BV_fitter.cpp b/src/BVH/BV_fitter.cpp index 730447a38..b85a34694 100644 --- a/src/BVH/BV_fitter.cpp +++ b/src/BVH/BV_fitter.cpp @@ -35,11 +35,12 @@ /** \author Jia Pan */ -#include #include -#include +#include #include +#include + namespace hpp { namespace fcl { diff --git a/src/broadphase/broadphase_bruteforce.cpp b/src/broadphase/broadphase_bruteforce.cpp index 17e50dda1..be70f48dd 100644 --- a/src/broadphase/broadphase_bruteforce.cpp +++ b/src/broadphase/broadphase_bruteforce.cpp @@ -37,8 +37,8 @@ #include "hpp/fcl/broadphase/broadphase_bruteforce.h" -#include #include +#include namespace hpp { namespace fcl { diff --git a/src/broadphase/default_broadphase_callbacks.cpp b/src/broadphase/default_broadphase_callbacks.cpp index d76cd28ed..a5e0b8f84 100644 --- a/src/broadphase/default_broadphase_callbacks.cpp +++ b/src/broadphase/default_broadphase_callbacks.cpp @@ -35,6 +35,7 @@ /** @author Sean Curtis (sean@tri.global) */ #include "hpp/fcl/broadphase/default_broadphase_callbacks.h" + #include namespace hpp { diff --git a/src/broadphase/detail/interval_tree_node.cpp b/src/broadphase/detail/interval_tree_node.cpp index b9771ae18..8f3f9b82f 100644 --- a/src/broadphase/detail/interval_tree_node.cpp +++ b/src/broadphase/detail/interval_tree_node.cpp @@ -40,8 +40,8 @@ #include "hpp/fcl/broadphase/detail/interval_tree_node.h" -#include #include +#include namespace hpp { namespace fcl { diff --git a/src/broadphase/detail/simple_interval.cpp b/src/broadphase/detail/simple_interval.cpp index 78719156c..6f87f97ac 100644 --- a/src/broadphase/detail/simple_interval.cpp +++ b/src/broadphase/detail/simple_interval.cpp @@ -39,6 +39,7 @@ #define HPP_FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_INL_H #include "hpp/fcl/broadphase/detail/simple_interval.h" + #include namespace hpp { diff --git a/src/broadphase/detail/spatial_hash.cpp b/src/broadphase/detail/spatial_hash.cpp index 07f7b6631..49c78b6a1 100644 --- a/src/broadphase/detail/spatial_hash.cpp +++ b/src/broadphase/detail/spatial_hash.cpp @@ -39,6 +39,7 @@ #define HPP_FCL_BROADPHASE_SPATIALHASH_INL_H #include "hpp/fcl/broadphase/detail/spatial_hash.h" + #include namespace hpp { diff --git a/src/collision.cpp b/src/collision.cpp index 3da3e4af5..1122f7f32 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -36,8 +36,8 @@ /** \author Jia Pan */ #include -#include #include +#include #include #include diff --git a/src/collision_func_matrix.cpp b/src/collision_func_matrix.cpp index 997c11444..af1fd3ed7 100644 --- a/src/collision_func_matrix.cpp +++ b/src/collision_func_matrix.cpp @@ -35,14 +35,13 @@ /** \author Jia Pan */ +#include <../src/collision_node.h> +#include <../src/traits_traversal.h> #include - +#include #include -#include <../src/collision_node.h> #include -#include #include -#include <../src/traits_traversal.h> namespace hpp { namespace fcl { diff --git a/src/collision_utility.cpp b/src/collision_utility.cpp index 586f6f635..b2f7f59bd 100644 --- a/src/collision_utility.cpp +++ b/src/collision_utility.cpp @@ -14,9 +14,8 @@ // received a copy of the GNU Lesser General Public License along with // hpp-fcl. If not, see . -#include - #include +#include namespace hpp { namespace fcl { diff --git a/src/distance.cpp b/src/distance.cpp index c9625c6c5..aec919233 100644 --- a/src/distance.cpp +++ b/src/distance.cpp @@ -35,8 +35,8 @@ /** \author Jia Pan */ -#include #include +#include #include #include diff --git a/src/distance/box_halfspace.cpp b/src/distance/box_halfspace.cpp index ad17bb7df..331988f2f 100644 --- a/src/distance/box_halfspace.cpp +++ b/src/distance/box_halfspace.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/box_plane.cpp b/src/distance/box_plane.cpp index 5c13a5d9e..c8ee07317 100644 --- a/src/distance/box_plane.cpp +++ b/src/distance/box_plane.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/box_sphere.cpp b/src/distance/box_sphere.cpp index 1515c82ce..db2e6a4f1 100644 --- a/src/distance/box_sphere.cpp +++ b/src/distance/box_sphere.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/capsule_capsule.cpp b/src/distance/capsule_capsule.cpp index af126ce73..070c70f91 100644 --- a/src/distance/capsule_capsule.cpp +++ b/src/distance/capsule_capsule.cpp @@ -31,11 +31,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include #include #include -#include + +#include +#include // Note that partial specialization of template functions is not allowed. // Therefore, two implementations with the default narrow phase solvers are diff --git a/src/distance/capsule_halfspace.cpp b/src/distance/capsule_halfspace.cpp index ef64710d9..8d30660ff 100644 --- a/src/distance/capsule_halfspace.cpp +++ b/src/distance/capsule_halfspace.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/capsule_plane.cpp b/src/distance/capsule_plane.cpp index 671eb5f36..40e07cedf 100644 --- a/src/distance/capsule_plane.cpp +++ b/src/distance/capsule_plane.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/cone_halfspace.cpp b/src/distance/cone_halfspace.cpp index 2b100f06b..a929c2a9a 100644 --- a/src/distance/cone_halfspace.cpp +++ b/src/distance/cone_halfspace.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/cone_plane.cpp b/src/distance/cone_plane.cpp index 60ee36b44..ae212cd15 100644 --- a/src/distance/cone_plane.cpp +++ b/src/distance/cone_plane.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/convex_halfspace.cpp b/src/distance/convex_halfspace.cpp index 897386d52..c5027ccb1 100644 --- a/src/distance/convex_halfspace.cpp +++ b/src/distance/convex_halfspace.cpp @@ -34,9 +34,9 @@ /** \author Joseph Mirabel */ +#include #include -#include #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/cylinder_halfspace.cpp b/src/distance/cylinder_halfspace.cpp index c664071c1..1c5d61aaf 100644 --- a/src/distance/cylinder_halfspace.cpp +++ b/src/distance/cylinder_halfspace.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/cylinder_plane.cpp b/src/distance/cylinder_plane.cpp index 5812afe90..838cd5c44 100644 --- a/src/distance/cylinder_plane.cpp +++ b/src/distance/cylinder_plane.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/sphere_cylinder.cpp b/src/distance/sphere_cylinder.cpp index 004608ade..278ee55f5 100644 --- a/src/distance/sphere_cylinder.cpp +++ b/src/distance/sphere_cylinder.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/sphere_halfspace.cpp b/src/distance/sphere_halfspace.cpp index a1ac8fcf6..dd9b39a5f 100644 --- a/src/distance/sphere_halfspace.cpp +++ b/src/distance/sphere_halfspace.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/sphere_plane.cpp b/src/distance/sphere_plane.cpp index 1048321b0..9ae9931d3 100644 --- a/src/distance/sphere_plane.cpp +++ b/src/distance/sphere_plane.cpp @@ -36,12 +36,13 @@ /** \author Florent Lamiraux */ -#include -#include +#include #include #include -#include +#include +#include + #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance/sphere_sphere.cpp b/src/distance/sphere_sphere.cpp index 13a2b960b..bf8f19a00 100644 --- a/src/distance/sphere_sphere.cpp +++ b/src/distance/sphere_sphere.cpp @@ -33,12 +33,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include #include #include +#include +#include + +#include +#include // Note that partial specialization of template functions is not allowed. // Therefore, two implementations with the default narrow phase solvers are diff --git a/src/distance/triangle_halfspace.cpp b/src/distance/triangle_halfspace.cpp index 13514371e..cf6af73fd 100644 --- a/src/distance/triangle_halfspace.cpp +++ b/src/distance/triangle_halfspace.cpp @@ -34,9 +34,9 @@ /** \author Joseph Mirabel */ +#include #include -#include #include "../narrowphase/details.h" namespace hpp { diff --git a/src/distance_func_matrix.cpp b/src/distance_func_matrix.cpp index ca295473a..f33daae7e 100644 --- a/src/distance_func_matrix.cpp +++ b/src/distance_func_matrix.cpp @@ -35,12 +35,11 @@ /** \author Jia Pan */ -#include - #include <../src/collision_node.h> +#include <../src/traits_traversal.h> +#include #include #include -#include <../src/traits_traversal.h> namespace hpp { namespace fcl { diff --git a/src/hfield.cpp b/src/hfield.cpp index ba771ec65..e4204ddb1 100644 --- a/src/hfield.cpp +++ b/src/hfield.cpp @@ -34,16 +34,14 @@ /** \author Justin Carpentier */ -#include - -#include -#include - #include +#include +#include +#include #include +#include -#include -#include +#include namespace hpp { namespace fcl { diff --git a/src/intersect.cpp b/src/intersect.cpp index ca886a1d8..f74d84987 100644 --- a/src/intersect.cpp +++ b/src/intersect.cpp @@ -36,11 +36,12 @@ /** \author Jia Pan */ #include +#include + +#include #include #include #include -#include -#include namespace hpp { namespace fcl { diff --git a/src/mesh_loader/assimp.cpp b/src/mesh_loader/assimp.cpp index 634beba1f..b895a064b 100644 --- a/src/mesh_loader/assimp.cpp +++ b/src/mesh_loader/assimp.cpp @@ -47,12 +47,13 @@ #define AI_NO_EXCEPT #endif +#include +#include + #include #include #include #include -#include -#include namespace hpp { namespace fcl { diff --git a/src/mesh_loader/loader.cpp b/src/mesh_loader/loader.cpp index b874c54ec..d637c2a67 100644 --- a/src/mesh_loader/loader.cpp +++ b/src/mesh_loader/loader.cpp @@ -34,8 +34,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #ifdef HPP_FCL_HAS_OCTOMAP #include diff --git a/src/narrowphase/gjk.cpp b/src/narrowphase/gjk.cpp index 4d4b1374c..50d77a05b 100644 --- a/src/narrowphase/gjk.cpp +++ b/src/narrowphase/gjk.cpp @@ -35,9 +35,9 @@ /** \author Jia Pan */ -#include #include #include +#include #include namespace hpp { diff --git a/src/narrowphase/narrowphase.cpp b/src/narrowphase/narrowphase.cpp index 51fa9cddf..0e0ed48b4 100644 --- a/src/narrowphase/narrowphase.cpp +++ b/src/narrowphase/narrowphase.cpp @@ -35,12 +35,12 @@ /** \author Jia Pan */ +#include #include +#include #include -#include -#include #include "details.h" namespace hpp { diff --git a/src/shape/convex.cpp b/src/shape/convex.cpp index a2a05a974..db3a5759b 100644 --- a/src/shape/convex.cpp +++ b/src/shape/convex.cpp @@ -1,13 +1,13 @@ #include #ifdef HPP_FCL_HAS_QHULL +#include #include #include #include +#include #include #include -#include -#include using orgQhull::Qhull; using orgQhull::QhullFacet; diff --git a/src/shape/geometric_shapes_utility.cpp b/src/shape/geometric_shapes_utility.cpp index 181487cde..be1668648 100644 --- a/src/shape/geometric_shapes_utility.cpp +++ b/src/shape/geometric_shapes_utility.cpp @@ -35,9 +35,9 @@ /** \author Jia Pan */ -#include #include #include +#include namespace hpp { namespace fcl { diff --git a/src/traits_traversal.h b/src/traits_traversal.h index a8d20c68b..140b53d40 100644 --- a/src/traits_traversal.h +++ b/src/traits_traversal.h @@ -7,11 +7,11 @@ /** \author Lucile Remigy, Joseph Mirabel */ -#include -#include #include <../src/collision_node.h> -#include +#include #include +#include +#include namespace hpp { namespace fcl { diff --git a/test/benchmark.cpp b/test/benchmark.cpp index 54a22e5b3..62dda851d 100644 --- a/test/benchmark.cpp +++ b/test/benchmark.cpp @@ -14,15 +14,15 @@ // received a copy of the GNU Lesser General Public License along with // hpp-fcl. If not, see . +#include +#include +#include + #include -#include -#include #include "../src/collision_node.h" -#include - -#include "utility.h" #include "fcl_resources/config.h" +#include "utility.h" #define RUN_CASE(BV, tf, models, split) \ run(tf, models, split, #BV " - " #split ":\t") diff --git a/test/box_box_collision.cpp b/test/box_box_collision.cpp index b3276a18d..7aeea8def 100644 --- a/test/box_box_collision.cpp +++ b/test/box_box_collision.cpp @@ -1,10 +1,10 @@ #define BOOST_TEST_MODULE BOX_BOX_COLLISION -#include - -#include +#include #include #include -#include + +#include +#include #include "utility.h" diff --git a/test/box_box_distance.cpp b/test/box_box_distance.cpp index f262e44cf..073b603df 100644 --- a/test/box_box_distance.cpp +++ b/test/box_box_distance.cpp @@ -42,14 +42,15 @@ #define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE((x + 1.0), (1.0), (eps)) -#include -#include -#include -#include #include #include +#include +#include #include +#include +#include + #include "utility.h" using hpp::fcl::CollisionGeometryPtr_t; diff --git a/test/broadphase.cpp b/test/broadphase.cpp index 65b96cff6..161a695c3 100644 --- a/test/broadphase.cpp +++ b/test/broadphase.cpp @@ -36,23 +36,24 @@ /** \author Jia Pan */ #define BOOST_TEST_MODULE FCL_BROADPHASE -#include - -#include #include -#include #include +#include + +#include +#include + #include "utility.h" #if USE_GOOGLEHASH -#include -#include #include +#include +#include #endif #include -#include #include +#include using namespace hpp::fcl; using namespace hpp::fcl::detail; diff --git a/test/broadphase_collision_1.cpp b/test/broadphase_collision_1.cpp index 4798e66d0..8e329787d 100644 --- a/test/broadphase_collision_1.cpp +++ b/test/broadphase_collision_1.cpp @@ -36,30 +36,29 @@ /** @author Jia Pan */ #define BOOST_TEST_MODULE BROADPHASE_COLLISION_1 +#include #include -#include "hpp/fcl/broadphase/broadphase_bruteforce.h" -#include "hpp/fcl/broadphase/broadphase_spatialhash.h" -#include "hpp/fcl/broadphase/broadphase_SaP.h" #include "hpp/fcl/broadphase/broadphase_SSaP.h" -#include "hpp/fcl/broadphase/broadphase_interval_tree.h" +#include "hpp/fcl/broadphase/broadphase_SaP.h" +#include "hpp/fcl/broadphase/broadphase_bruteforce.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h" +#include "hpp/fcl/broadphase/broadphase_interval_tree.h" +#include "hpp/fcl/broadphase/broadphase_spatialhash.h" #include "hpp/fcl/broadphase/default_broadphase_callbacks.h" #include "hpp/fcl/broadphase/detail/sparse_hash_table.h" #include "hpp/fcl/broadphase/detail/spatial_hash.h" #include "utility.h" -#include - #if USE_GOOGLEHASH -#include -#include #include +#include +#include #endif -#include #include +#include using namespace hpp::fcl; diff --git a/test/broadphase_collision_2.cpp b/test/broadphase_collision_2.cpp index a6a667465..24c436752 100644 --- a/test/broadphase_collision_2.cpp +++ b/test/broadphase_collision_2.cpp @@ -38,26 +38,26 @@ #define BOOST_TEST_MODULE BROADPHASE_COLLISION_2 #include -#include "hpp/fcl/broadphase/broadphase_bruteforce.h" -#include "hpp/fcl/broadphase/broadphase_spatialhash.h" -#include "hpp/fcl/broadphase/broadphase_SaP.h" #include "hpp/fcl/broadphase/broadphase_SSaP.h" -#include "hpp/fcl/broadphase/broadphase_interval_tree.h" +#include "hpp/fcl/broadphase/broadphase_SaP.h" +#include "hpp/fcl/broadphase/broadphase_bruteforce.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h" +#include "hpp/fcl/broadphase/broadphase_interval_tree.h" +#include "hpp/fcl/broadphase/broadphase_spatialhash.h" #include "hpp/fcl/broadphase/default_broadphase_callbacks.h" #include "hpp/fcl/broadphase/detail/sparse_hash_table.h" #include "hpp/fcl/broadphase/detail/spatial_hash.h" #include "utility.h" #if USE_GOOGLEHASH -#include -#include #include +#include +#include #endif -#include #include +#include using namespace hpp::fcl; diff --git a/test/broadphase_dynamic_AABB_tree.cpp b/test/broadphase_dynamic_AABB_tree.cpp index c16b09d15..fca701047 100644 --- a/test/broadphase_dynamic_AABB_tree.cpp +++ b/test/broadphase_dynamic_AABB_tree.cpp @@ -43,8 +43,8 @@ #include // #include "hpp/fcl/data_types.h" -#include "hpp/fcl/shape/geometric_shapes.h" #include "hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h" +#include "hpp/fcl/shape/geometric_shapes.h" using namespace hpp::fcl; diff --git a/test/bvh_models.cpp b/test/bvh_models.cpp index bb8403054..8e37422ef 100644 --- a/test/bvh_models.cpp +++ b/test/bvh_models.cpp @@ -36,22 +36,22 @@ /** \author Jeongseok Lee */ #define BOOST_TEST_MODULE FCL_BVH_MODELS -#include -#include - -#include "fcl_resources/config.h" - -#include #include #include +#include #include -#include -#include #include #include -#include "utility.h" +#include +#include + +#include +#include #include +#include "fcl_resources/config.h" +#include "utility.h" + using namespace hpp::fcl; template diff --git a/test/capsule_box_1.cpp b/test/capsule_box_1.cpp index e86e5328f..06e8f916a 100644 --- a/test/capsule_box_1.cpp +++ b/test/capsule_box_1.cpp @@ -39,13 +39,14 @@ #define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE((x + 1.0), (1.0), (eps)) -#include -#include -#include #include #include +#include +#include #include +#include + #include "utility.h" BOOST_AUTO_TEST_CASE(distance_capsule_box) { diff --git a/test/capsule_box_2.cpp b/test/capsule_box_2.cpp index add71efd6..e99dd706f 100644 --- a/test/capsule_box_2.cpp +++ b/test/capsule_box_2.cpp @@ -39,15 +39,16 @@ #define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE((x + 1.0), (1.0), (eps)) -#include "utility.h" - -#include -#include -#include #include #include +#include +#include #include +#include + +#include "utility.h" + BOOST_AUTO_TEST_CASE(distance_capsule_box) { typedef hpp::fcl::shared_ptr CollisionGeometryPtr_t; diff --git a/test/capsule_capsule.cpp b/test/capsule_capsule.cpp index 25d95455d..67b29df3f 100644 --- a/test/capsule_capsule.cpp +++ b/test/capsule_capsule.cpp @@ -40,15 +40,15 @@ #define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE((x + 1.0), (1.0), (eps)) -#include -#include -#include -#include -#include #include #include +#include +#include #include +#include +#include + #include "utility.h" using namespace hpp::fcl; diff --git a/test/collision.cpp b/test/collision.cpp index 1a2afa3f7..5c072af2c 100644 --- a/test/collision.cpp +++ b/test/collision.cpp @@ -38,26 +38,23 @@ #include #define BOOST_TEST_MODULE FCL_COLLISION -#include - -#include -#include - -#include #include -#include -#include -#include - +#include +#include #include #include -#include "../src/collision_node.h" -#include - +#include +#include +#include #include -#include "utility.h" +#include +#include +#include + +#include "../src/collision_node.h" #include "fcl_resources/config.h" +#include "utility.h" using namespace hpp::fcl; namespace utf = boost::unit_test::framework; diff --git a/test/convex.cpp b/test/convex.cpp index d55cab48a..1f8824817 100644 --- a/test/convex.cpp +++ b/test/convex.cpp @@ -35,11 +35,11 @@ /** \author Joseph Mirabel */ #define BOOST_TEST_MODULE FCL_GEOMETRIC_SHAPES -#include - -#include #include #include +#include + +#include #include "utility.h" diff --git a/test/distance.cpp b/test/distance.cpp index ed365417a..8bd70612c 100644 --- a/test/distance.cpp +++ b/test/distance.cpp @@ -36,18 +36,17 @@ /** \author Jia Pan */ #define BOOST_TEST_MODULE FCL_DISTANCE -#include +#include +#include +#include -#include #include +#include +#include -#include -#include #include "../src/collision_node.h" -#include - -#include "utility.h" #include "fcl_resources/config.h" +#include "utility.h" using namespace hpp::fcl; namespace utf = boost::unit_test::framework; diff --git a/test/distance_lower_bound.cpp b/test/distance_lower_bound.cpp index e5fd4f0bc..176df2aa5 100644 --- a/test/distance_lower_bound.cpp +++ b/test/distance_lower_bound.cpp @@ -33,18 +33,19 @@ */ #define BOOST_TEST_MODULE FCL_DISTANCE_LOWER_BOUND -#include -#include - -#include -#include #include #include -#include #include +#include #include -#include "utility.h" +#include + +#include +#include +#include + #include "fcl_resources/config.h" +#include "utility.h" using hpp::fcl::BVHModel; using hpp::fcl::CollisionGeometryPtr_t; diff --git a/test/frontlist.cpp b/test/frontlist.cpp index 724144faa..6b4e3ab44 100644 --- a/test/frontlist.cpp +++ b/test/frontlist.cpp @@ -36,16 +36,16 @@ /** \author Jia Pan */ #define BOOST_TEST_MODULE FCL_FRONT_LIST -#include - -#include -#include #include <../src/collision_node.h> #include -#include "utility.h" +#include +#include -#include "fcl_resources/config.h" #include +#include + +#include "fcl_resources/config.h" +#include "utility.h" using namespace hpp::fcl; namespace utf = boost::unit_test::framework; diff --git a/test/geometric_shapes.cpp b/test/geometric_shapes.cpp index d909e6e21..01f765c10 100644 --- a/test/geometric_shapes.cpp +++ b/test/geometric_shapes.cpp @@ -36,16 +36,17 @@ /** \author Jia Pan */ #define BOOST_TEST_MODULE FCL_GEOMETRIC_SHAPES -#include - -#include #include #include -#include "utility.h" -#include #include +#include #include +#include +#include + +#include "utility.h" + using namespace hpp::fcl; FCL_REAL extents[6] = {0, 0, 0, 10, 10, 10}; diff --git a/test/gjk.cpp b/test/gjk.cpp index 32b0ae4c0..cf772c684 100644 --- a/test/gjk.cpp +++ b/test/gjk.cpp @@ -35,13 +35,13 @@ /** \author Florent Lamiraux */ #define BOOST_TEST_MODULE FCL_GJK +#include +#include +#include #include -#include #include -#include -#include -#include +#include #include "utility.h" diff --git a/test/gjk_convergence_criterion.cpp b/test/gjk_convergence_criterion.cpp index cb239d90f..850483b58 100644 --- a/test/gjk_convergence_criterion.cpp +++ b/test/gjk_convergence_criterion.cpp @@ -34,15 +34,16 @@ /** \author Louis Montaut */ -#include "hpp/fcl/data_types.h" #include -#define BOOST_TEST_MODULE FCL_NESTEROV_GJK -#include -#include +#include "hpp/fcl/data_types.h" +#define BOOST_TEST_MODULE FCL_NESTEROV_GJK +#include #include #include -#include + +#include +#include #include "utility.h" diff --git a/test/hfields.cpp b/test/hfields.cpp index bc6d8279a..db5f24d63 100644 --- a/test/hfields.cpp +++ b/test/hfields.cpp @@ -35,22 +35,19 @@ /** \author Justin Carpentier */ #define BOOST_TEST_MODULE FCL_HEIGHT_FIELDS -#include -#include - -#include "fcl_resources/config.h" - #include #include #include -#include #include #include +#include -#include +#include +#include +#include +#include "fcl_resources/config.h" #include "utility.h" -#include using namespace hpp::fcl; diff --git a/test/math.cpp b/test/math.cpp index f26ebb341..8f95784ec 100644 --- a/test/math.cpp +++ b/test/math.cpp @@ -37,13 +37,12 @@ #include #define BOOST_TEST_MODULE FCL_MATH -#include - #include -#include - #include #include +#include + +#include using namespace hpp::fcl; diff --git a/test/nesterov_gjk.cpp b/test/nesterov_gjk.cpp index a75aeb157..3e4d5787b 100644 --- a/test/nesterov_gjk.cpp +++ b/test/nesterov_gjk.cpp @@ -35,12 +35,12 @@ /** \author Louis Montaut */ #define BOOST_TEST_MODULE FCL_NESTEROV_GJK -#include - -#include +#include #include #include -#include + +#include +#include #include "utility.h" diff --git a/test/obb.cpp b/test/obb.cpp index cad2c8c5a..1d9bb7648 100644 --- a/test/obb.cpp +++ b/test/obb.cpp @@ -34,16 +34,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include - -#include +#include "../src/BV/OBB.h" +#include #include -#include "../src/BV/OBB.h" -#include +#include +#include +#include +#include + #include "utility.h" using namespace hpp::fcl; diff --git a/test/octree.cpp b/test/octree.cpp index 222cf5f34..7579e8d9b 100644 --- a/test/octree.cpp +++ b/test/octree.cpp @@ -35,18 +35,18 @@ /** \author Florent Lamiraux */ #define BOOST_TEST_MODULE FCL_OCTREE -#include -#include -#include - #include #include #include -#include #include +#include + +#include +#include +#include -#include "utility.h" #include "fcl_resources/config.h" +#include "utility.h" namespace utf = boost::unit_test::framework; diff --git a/test/profiling.cpp b/test/profiling.cpp index 6c11dac7d..1da3b4dfb 100644 --- a/test/profiling.cpp +++ b/test/profiling.cpp @@ -14,18 +14,19 @@ // received a copy of the GNU Lesser General Public License along with // hpp-fcl. If not, see . -#include - -#include -#include #include -#include -#include +#include #include -#include +#include #include -#include "utility.h" +#include +#include + +#include +#include + #include "fcl_resources/config.h" +#include "utility.h" using namespace hpp::fcl; diff --git a/test/security_margin.cpp b/test/security_margin.cpp index 9232f9c4e..3b989a52b 100644 --- a/test/security_margin.cpp +++ b/test/security_margin.cpp @@ -33,17 +33,17 @@ */ #define BOOST_TEST_MODULE FCL_SECURITY_MARGIN -#include - -#include -#include -#include -#include #include #include +#include +#include +#include #include #include -#include + +#include +#include +#include #include "utility.h" diff --git a/test/serialization.cpp b/test/serialization.cpp index 14bbf33fb..9c497cdcc 100644 --- a/test/serialization.cpp +++ b/test/serialization.cpp @@ -33,35 +33,32 @@ */ #define BOOST_TEST_MODULE FCL_SERIALIZATION -#include -#include - -#include -#include #include #include - -#include +#include +#include #include #include -#include -#include +#include #include +#include +#include #include -#include "utility.h" -#include "fcl_resources/config.h" - -#include +#include +#include #include #include +#include #include #include -#include -#include +#include #include +#include +#include -#include +#include "fcl_resources/config.h" +#include "utility.h" namespace utf = boost::unit_test::framework; diff --git a/test/shape_inflation.cpp b/test/shape_inflation.cpp index e305906bd..22b07b332 100644 --- a/test/shape_inflation.cpp +++ b/test/shape_inflation.cpp @@ -33,17 +33,17 @@ */ #define BOOST_TEST_MODULE FCL_SECURITY_MARGIN -#include - -#include -#include -#include -#include #include #include +#include +#include #include #include +#include +#include +#include + #include "utility.h" using namespace hpp::fcl; diff --git a/test/shape_mesh_consistency.cpp b/test/shape_mesh_consistency.cpp index 0c0e7c907..288f7ceb6 100644 --- a/test/shape_mesh_consistency.cpp +++ b/test/shape_mesh_consistency.cpp @@ -36,12 +36,13 @@ /** \author Jia Pan */ #define BOOST_TEST_MODULE FCL_SHAPE_MESH_CONSISTENCY -#include - +#include +#include #include #include -#include -#include + +#include + #include "utility.h" using namespace hpp::fcl; diff --git a/test/simple.cpp b/test/simple.cpp index 99a7ee521..d8e18520a 100644 --- a/test/simple.cpp +++ b/test/simple.cpp @@ -1,11 +1,12 @@ #define BOOST_TEST_MODULE FCL_SIMPLE +#include +#include +#include + #include +#include -#include -#include -#include #include "fcl_resources/config.h" -#include using namespace hpp::fcl; diff --git a/test/utility.cpp b/test/utility.cpp index d00f9f692..84eb9c11f 100644 --- a/test/utility.cpp +++ b/test/utility.cpp @@ -2,13 +2,12 @@ #include #include -#include - #include #include +#include -#include #include +#include #include #include diff --git a/test/utility.h b/test/utility.h index 370dbf391..519be8b70 100644 --- a/test/utility.h +++ b/test/utility.h @@ -38,10 +38,10 @@ #ifndef TEST_HPP_FCL_UTILITY_H #define TEST_HPP_FCL_UTILITY_H -#include +#include #include #include -#include +#include #include #ifdef HPP_FCL_HAS_OCTOMAP