Unverified Commit dffbd8fb authored by Joseph Mirabel's avatar Joseph Mirabel Committed by GitHub
Browse files

Merge pull request #97 from LucileRemigy/refactoring

New folder Internal for internal header
parents 92261deb 5ef010b2
...@@ -145,6 +145,21 @@ SET(${PROJECT_NAME}_HEADERS ...@@ -145,6 +145,21 @@ SET(${PROJECT_NAME}_HEADERS
include/hpp/fcl/fwd.hh include/hpp/fcl/fwd.hh
include/hpp/fcl/mesh_loader/assimp.h include/hpp/fcl/mesh_loader/assimp.h
include/hpp/fcl/mesh_loader/loader.h include/hpp/fcl/mesh_loader/loader.h
include/hpp/fcl/internal/BV_fitter.h
include/hpp/fcl/internal/BV_splitter.h
include/hpp/fcl/internal/collision_node.h
include/hpp/fcl/internal/geometric_shapes_utility.h
include/hpp/fcl/internal/intersect.h
include/hpp/fcl/internal/tools.h
include/hpp/fcl/internal/traversal_node_base.h
include/hpp/fcl/internal/traversal_node_bvh_shape.h
include/hpp/fcl/internal/traversal_node_bvhs.h
include/hpp/fcl/internal/traversal_node_octree.h
include/hpp/fcl/internal/traversal_node_setup.h
include/hpp/fcl/internal/traversal_node_shapes.h
include/hpp/fcl/internal/traversal_recurse.h
include/hpp/fcl/internal/traversal.h
include/hpp/fcl/internal/traits_traversal.h
) )
add_subdirectory(src) add_subdirectory(src)
......
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
#include <hpp/fcl/collision_data.h> #include <hpp/fcl/collision_data.h>
#include <hpp/fcl/shape/geometric_shapes.h> #include <hpp/fcl/shape/geometric_shapes.h>
#include <hpp/fcl/narrowphase/narrowphase.h> #include <hpp/fcl/narrowphase/narrowphase.h>
#include "../src/shape/geometric_shapes_utility.h" #include <hpp/fcl/shape/geometric_shapes_utility.h>
#include "traversal_node_base.h" #include <hpp/fcl/internal/traversal_node_base.h>
#include "details/traversal.h" #include <hpp/fcl/internal/traversal.h>
#include <hpp/fcl/BVH/BVH_model.h> #include <hpp/fcl/BVH/BVH_model.h>
......
...@@ -41,14 +41,14 @@ ...@@ -41,14 +41,14 @@
/// @cond INTERNAL /// @cond INTERNAL
#include <hpp/fcl/collision_data.h> #include <hpp/fcl/collision_data.h>
#include "traversal_node_base.h" #include <hpp/fcl/internal/traversal_node_base.h>
#include <hpp/fcl/BV/BV_node.h> #include <hpp/fcl/BV/BV_node.h>
#include <hpp/fcl/BV/BV.h> #include <hpp/fcl/BV/BV.h>
#include <hpp/fcl/BVH/BVH_model.h> #include <hpp/fcl/BVH/BVH_model.h>
#include "../intersect.h" #include <hpp/fcl/internal/intersect.h>
#include <hpp/fcl/shape/geometric_shapes.h> #include <hpp/fcl/shape/geometric_shapes.h>
#include <hpp/fcl/narrowphase/narrowphase.h> #include <hpp/fcl/narrowphase/narrowphase.h>
#include "details/traversal.h" #include <hpp/fcl/internal/traversal.h>
#include <boost/shared_array.hpp> #include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
......
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
/// @cond INTERNAL /// @cond INTERNAL
#include <hpp/fcl/collision_data.h> #include <hpp/fcl/collision_data.h>
#include "traversal_node_base.h" #include <hpp/fcl/internal/traversal_node_base.h>
#include <hpp/fcl/narrowphase/narrowphase.h> #include <hpp/fcl/narrowphase/narrowphase.h>
#include <hpp/fcl/octree.h> #include <hpp/fcl/octree.h>
#include <hpp/fcl/BVH/BVH_model.h> #include <hpp/fcl/BVH/BVH_model.h>
#include "../src/shape/geometric_shapes_utility.h" #include <hpp/fcl/shape/geometric_shapes_utility.h>
namespace hpp namespace hpp
{ {
......
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
/// @cond INTERNAL /// @cond INTERNAL
#include "traversal_node_bvhs.h" #include <hpp/fcl/internal/traversal_node_bvhs.h>
#include "traversal_node_shapes.h" #include <hpp/fcl/internal/traversal_node_shapes.h>
#include "traversal_node_bvh_shape.h" #include <hpp/fcl/internal/traversal_node_bvh_shape.h>
#ifdef HPP_FCL_HAVE_OCTOMAP #ifdef HPP_FCL_HAVE_OCTOMAP
#include "traversal_node_octree.h" #include <hpp/fcl/internal/traversal_node_octree.h>
#endif #endif
#include <hpp/fcl/BVH/BVH_utility.h> #include <hpp/fcl/BVH/BVH_utility.h>
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
#include <hpp/fcl/collision_data.h> #include <hpp/fcl/collision_data.h>
#include <hpp/fcl/narrowphase/narrowphase.h> #include <hpp/fcl/narrowphase/narrowphase.h>
#include <hpp/fcl/BV/BV.h> #include <hpp/fcl/BV/BV.h>
#include "../src/shape/geometric_shapes_utility.h" #include <hpp/fcl/shape/geometric_shapes_utility.h>
#include "traversal_node_base.h" #include <hpp/fcl/internal/traversal_node_base.h>
namespace hpp namespace hpp
{ {
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
#include <hpp/fcl/BVH/BVH_front.h> #include <hpp/fcl/BVH/BVH_front.h>
#include <queue> #include <queue>
#include "traversal_node_base.h" #include <hpp/fcl/internal/traversal_node_base.h>
#include "traversal_node_bvhs.h" #include <hpp/fcl/internal/traversal_node_bvhs.h>
namespace hpp namespace hpp
{ {
......
...@@ -42,8 +42,7 @@ ...@@ -42,8 +42,7 @@
#include <vector> #include <vector>
#include <hpp/fcl/shape/geometric_shapes.h> #include <hpp/fcl/shape/geometric_shapes.h>
#include <hpp/fcl/BV/BV.h> #include <hpp/fcl/BV/BV.h>
#include <hpp/fcl/internal/BV_fitter.h>
#include "../src/BVH/BV_fitter.h"
namespace hpp namespace hpp
{ {
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <hpp/fcl/BVH/BVH_utility.h> #include <hpp/fcl/BVH/BVH_utility.h>
#include <hpp/fcl/math/transform.h> #include <hpp/fcl/math/transform.h>
#include <hpp/fcl/collision_data.h> #include <hpp/fcl/collision_data.h>
#include "../math/tools.h" #include <hpp/fcl/internal/tools.h>
#include <iostream> #include <iostream>
#include <limits> #include <limits>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <hpp/fcl/BV/RSS.h> #include <hpp/fcl/BV/RSS.h>
#include <hpp/fcl/BVH/BVH_utility.h> #include <hpp/fcl/BVH/BVH_utility.h>
#include <iostream> #include <iostream>
#include "../math/tools.h" #include <hpp/fcl/internal/tools.h>
namespace hpp namespace hpp
{ {
namespace fcl namespace fcl
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
#include <hpp/fcl/BV/BV.h> #include <hpp/fcl/BV/BV.h>
#include <hpp/fcl/shape/convex.h> #include <hpp/fcl/shape/convex.h>
#include "../../src/BVH/BV_splitter.h" #include <hpp/fcl/internal/BV_splitter.h>
#include "../../src/BVH/BV_fitter.h" #include <hpp/fcl/internal/BV_fitter.h>
namespace hpp namespace hpp
{ {
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <hpp/fcl/BVH/BVH_utility.h> #include <hpp/fcl/BVH/BVH_utility.h>
#include <hpp/fcl/narrowphase/narrowphase.h> #include <hpp/fcl/narrowphase/narrowphase.h>
#include "../src/shape/geometric_shapes_utility.h" #include <hpp/fcl/shape/geometric_shapes_utility.h>
namespace hpp namespace hpp
{ {
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
/** \author Jia Pan */ /** \author Jia Pan */
#include "BV_fitter.h" #include <hpp/fcl/internal/BV_fitter.h>
#include <hpp/fcl/BVH/BVH_utility.h> #include <hpp/fcl/BVH/BVH_utility.h>
#include <limits> #include <limits>
#include "../math/tools.h" #include <hpp/fcl/internal/tools.h>
namespace hpp namespace hpp
{ {
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/** \author Jia Pan */ /** \author Jia Pan */
#include "BV_splitter.h" #include <hpp/fcl/internal/BV_splitter.h>
namespace hpp namespace hpp
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment