Remove inclusion of internal headers in public headers.

CMakeLists.txt

@@ -122,7 +122,6 @@ SET(${PROJECT_NAME}_HEADERS
   include/hpp/fcl/BV/kDOP.h
   include/hpp/fcl/narrowphase/narrowphase.h
   include/hpp/fcl/narrowphase/gjk.h
-  include/hpp/fcl/shape/geometric_shapes_utility.h
   include/hpp/fcl/shape/geometric_shape_to_BVH_model.h
   include/hpp/fcl/shape/geometric_shapes.h
   include/hpp/fcl/distance_func_matrix.h

include/hpp/fcl/BVH/BVH_model.h

@@ -41,8 +41,6 @@
 #include <hpp/fcl/collision_object.h>
 #include <hpp/fcl/BVH/BVH_internal.h>
 #include <hpp/fcl/BV/BV_node.h>
-#include "../../src/BVH/BV_splitter.h"
-#include "../../src/BVH/BV_fitter.h"
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
@@ -54,6 +52,9 @@ namespace fcl
 
 class ConvexBase;
 
+template <typename BV> class BVFitter;
+template <typename BV> class BVSplitter;
+
 /// @brief A base class describing the bounding hierarchy of a mesh model or a point cloud model (which is viewed as a degraded version of mesh)
 class BVHModelBase : public CollisionGeometry
 {
@@ -258,15 +259,7 @@ public:
   boost::shared_ptr<BVFitter<BV> > bv_fitter;
 
   /// @brief Constructing an empty BVH
-  BVHModel() : BVHModelBase (),
-               bv_splitter(new BVSplitter<BV>(SPLIT_METHOD_MEAN)),
-               bv_fitter(new BVFitter<BV>()),
-               num_bvs_allocated(0),
-               primitive_indices(NULL),
-               bvs(NULL),
-               num_bvs(0)
-  {
-  }
+  BVHModel();
 
   /// @brief copy from another BVH
   BVHModel(const BVHModel& other);

src/BVH/BVH_model.cpp

@@ -36,11 +36,16 @@
 /** \author Jia Pan */
 
 #include <hpp/fcl/BVH/BVH_model.h>
-#include <hpp/fcl/BV/BV.h>
-#include <hpp/fcl/shape/convex.h>
+
 #include <iostream>
 #include <string.h>
 
+#include <hpp/fcl/BV/BV.h>
+#include <hpp/fcl/shape/convex.h>
+
+#include "../../src/BVH/BV_splitter.h"
+#include "../../src/BVH/BV_fitter.h"
+
 namespace hpp
 {
 namespace fcl
@@ -630,6 +635,20 @@ void BVHModelBase::computeLocalAABB()
   aabb_local = aabb_;
 }
 
+
+  /// @brief Constructing an empty BVH
+template<typename BV>
+BVHModel<BV>::BVHModel() :
+  BVHModelBase (),
+  bv_splitter(new BVSplitter<BV>(SPLIT_METHOD_MEAN)),
+  bv_fitter(new BVFitter<BV>()),
+  num_bvs_allocated(0),
+  primitive_indices(NULL),
+  bvs(NULL),
+  num_bvs(0)
+{
+}
+
 template<typename BV>
 void BVHModel<BV>::deleteBVs()
 {
@@ -1015,11 +1034,6 @@ NODE_TYPE BVHModel<KDOP<24> >::getNodeType() const
   return BV_KDOP24;
 }
 
-
-
-
-
-
 template class BVHModel<KDOP<16> >;
 template class BVHModel<KDOP<18> >;
 template class BVHModel<KDOP<24> >;
@@ -1028,6 +1042,7 @@ template class BVHModel<AABB>;
 template class BVHModel<RSS>;
 template class BVHModel<kIOS>;
 template class BVHModel<OBBRSS>;
-}
+
+} // namespace fcl
 
 } // namespace hpp

src/BVH/BVH_utility.cpp

@@ -38,7 +38,7 @@
 
 #include <hpp/fcl/BVH/BVH_utility.h>
 #include <hpp/fcl/narrowphase/narrowphase.h>
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
+#include "../src/shape/geometric_shapes_utility.h"
 
 namespace hpp
 {

src/narrowphase/narrowphase.cpp

@@ -36,10 +36,12 @@
 /** \author Jia Pan */
 
 #include <hpp/fcl/narrowphase/narrowphase.h>
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
-#include "../intersect.h"
-#include <boost/math/constants/constants.hpp>
+
 #include <vector>
+#include <boost/math/constants/constants.hpp>
+
+#include "../src/shape/geometric_shapes_utility.h"
+#include "../src/intersect.h"
 #include "../src/narrowphase/details.h"
 
 namespace hpp

src/shape/geometric_shapes.cpp

@@ -37,7 +37,7 @@
 
 
 #include <hpp/fcl/shape/geometric_shapes.h>
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
+#include "../src/shape/geometric_shapes_utility.h"
 
 namespace hpp
 {

src/shape/geometric_shapes_utility.cpp

@@ -36,7 +36,7 @@
 /** \author Jia Pan */
 
 
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
+#include "../src/shape/geometric_shapes_utility.h"
 #include "../BVH/BV_fitter.h"
 #include "../math/tools.h"
 

include/hpp/fcl/shape/geometric_shapes_utility.h → src/shape/geometric_shapes_utility.h

@@ -43,6 +43,8 @@
 #include <hpp/fcl/shape/geometric_shapes.h>
 #include <hpp/fcl/BV/BV.h>
 
+#include "../src/BVH/BV_fitter.h"
+
 namespace hpp
 {
 namespace fcl

src/traversal/traversal_node_bvh_shape.h

@@ -41,7 +41,7 @@
 
 #include <hpp/fcl/collision_data.h>
 #include <hpp/fcl/shape/geometric_shapes.h>
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
+#include "../src/shape/geometric_shapes_utility.h"
 #include "traversal_node_base.h"
 #include "details/traversal.h"
 #include <hpp/fcl/BVH/BVH_model.h>

src/traversal/traversal_node_octree.h

@@ -41,9 +41,9 @@
 #include <hpp/fcl/collision_data.h>
 #include "traversal_node_base.h"
 #include <hpp/fcl/narrowphase/narrowphase.h>
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
 #include <hpp/fcl/octree.h>
 #include <hpp/fcl/BVH/BVH_model.h>
+#include "../src/shape/geometric_shapes_utility.h"
 
 namespace hpp
 {

src/traversal/traversal_node_shapes.h

@@ -42,9 +42,8 @@
 #include <hpp/fcl/collision_data.h>
 #include "traversal_node_base.h"
 #include <hpp/fcl/narrowphase/narrowphase.h>
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
 #include <hpp/fcl/BV/BV.h>
-#include <hpp/fcl/shape/geometric_shapes_utility.h>
+#include "../src/shape/geometric_shapes_utility.h"
 
 namespace hpp
 {

test/benchmark.cpp

@@ -14,12 +14,15 @@
 // received a copy of the GNU Lesser General Public License along with
 // hpp-fcl. If not, see <http://www.gnu.org/licenses/>.
 
+#include <boost/filesystem.hpp>
+
 #include "../src/traversal/traversal_node_setup.h"
 #include "../src/traversal/traversal_node_bvhs.h"
-#include <../src/collision_node.h>
+#include "../src/collision_node.h"
+#include "../src/BVH/BV_splitter.h"
+
 #include "utility.h"
 #include "fcl_resources/config.h"
-#include <boost/filesystem.hpp>
 
 #define RUN_CASE(BV,tf,models,split) \
   run<BV>(tf, models, split, #BV " - " #split ":\t")

test/collision.cpp

@@ -44,19 +44,22 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/utility/binary.hpp>
 
+#include <boost/filesystem.hpp>
 #include <boost/assign/list_of.hpp>
 
-#include "../src/traversal/traversal_node_bvhs.h"
-#include "../src/traversal/traversal_node_setup.h"
-#include <../src/collision_node.h>
 #include <hpp/fcl/collision.h>
 #include <hpp/fcl/BV/BV.h>
 #include <hpp/fcl/shape/geometric_shapes.h>
 #include <hpp/fcl/narrowphase/narrowphase.h>
 #include <hpp/fcl/mesh_loader/assimp.h>
+
+#include "../src/traversal/traversal_node_bvhs.h"
+#include "../src/traversal/traversal_node_setup.h"
+#include "../src/collision_node.h"
+#include "../src/BVH/BV_splitter.h"
+
 #include "utility.h"
 #include "fcl_resources/config.h"
-#include <boost/filesystem.hpp>
 
 using namespace hpp::fcl;
 

test/distance.cpp

@@ -39,14 +39,16 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/utility/binary.hpp>
+#include <boost/timer.hpp>
+#include <boost/filesystem.hpp>
 
 #include "../src/traversal/traversal_node_bvhs.h"
 #include "../src/traversal/traversal_node_setup.h"
-#include <../src/collision_node.h>
+#include "../src/collision_node.h"
+#include "../src/BVH/BV_splitter.h"
+
 #include "utility.h"
-#include <boost/timer.hpp>
 #include "fcl_resources/config.h"
-#include <boost/filesystem.hpp>
 
 using namespace hpp::fcl;
 

test/frontlist.cpp

@@ -44,6 +44,7 @@
 #include "../src/traversal/traversal_node_bvhs.h"
 #include "../src/traversal/traversal_node_setup.h"
 #include <../src/collision_node.h>
+#include <../src/BVH/BV_splitter.h>
 #include "utility.h"
 
 #include "fcl_resources/config.h"

test/octree.cpp

@@ -38,14 +38,16 @@
 #define BOOST_TEST_DYN_LINK
 #include <fstream>
 #include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
 
 #include <hpp/fcl/BVH/BVH_model.h>
 #include <hpp/fcl/collision.h>
 #include <hpp/fcl/distance.h>
 #include <hpp/fcl/shape/geometric_shapes.h>
+#include "../src/BVH/BV_splitter.h"
+
 #include "utility.h"
 #include "fcl_resources/config.h"
-#include <boost/filesystem.hpp>
 
 using hpp::fcl::Vec3f;
 using hpp::fcl::Triangle;