From c20533b4f9722ef160e0f0c46d7bdfcfb5785638 Mon Sep 17 00:00:00 2001 From: Florent Lamiraux <florent@laas.fr> Date: Tue, 9 Dec 2014 11:36:34 +0100 Subject: [PATCH] Move headers from include/fcl to include/hpp/fcl This enables users to install the official version of fcl together with hpp-fcl. --- CMakeLists.txt | 183 +++++++++--------- include/{ => hpp}/fcl/BV/AABB.h | 2 +- include/{ => hpp}/fcl/BV/BV.h | 14 +- include/{ => hpp}/fcl/BV/BV_node.h | 6 +- include/{ => hpp}/fcl/BV/OBB.h | 4 +- include/{ => hpp}/fcl/BV/OBBRSS.h | 4 +- include/{ => hpp}/fcl/BV/RSS.h | 4 +- include/{ => hpp}/fcl/BV/kDOP.h | 2 +- include/{ => hpp}/fcl/BV/kIOS.h | 2 +- include/{ => hpp}/fcl/BVH/BVH_front.h | 0 include/{ => hpp}/fcl/BVH/BVH_internal.h | 2 +- include/{ => hpp}/fcl/BVH/BVH_model.h | 10 +- include/{ => hpp}/fcl/BVH/BVH_utility.h | 2 +- include/{ => hpp}/fcl/BVH/BV_fitter.h | 6 +- include/{ => hpp}/fcl/BVH/BV_splitter.h | 6 +- include/{ => hpp}/fcl/CMakeLists.txt | 0 .../{ => hpp}/fcl/articulated_model/joint.h | 4 +- .../fcl/articulated_model/joint_config.h | 2 +- .../{ => hpp}/fcl/articulated_model/link.h | 4 +- .../{ => hpp}/fcl/articulated_model/model.h | 6 +- .../fcl/articulated_model/model_config.h | 4 +- include/{ => hpp}/fcl/broadphase/broadphase.h | 16 +- .../fcl/broadphase/broadphase_SSaP.h | 2 +- .../{ => hpp}/fcl/broadphase/broadphase_SaP.h | 2 +- .../fcl/broadphase/broadphase_bruteforce.h | 2 +- .../broadphase/broadphase_dynamic_AABB_tree.h | 8 +- .../broadphase_dynamic_AABB_tree_array.h | 8 +- .../fcl/broadphase/broadphase_interval_tree.h | 4 +- .../fcl/broadphase/broadphase_spatialhash.h | 8 +- .../fcl/broadphase/broadphase_spatialhash.hxx | 0 include/{ => hpp}/fcl/broadphase/hash.h | 0 .../{ => hpp}/fcl/broadphase/hierarchy_tree.h | 6 +- .../fcl/broadphase/hierarchy_tree.hxx | 0 .../{ => hpp}/fcl/broadphase/interval_tree.h | 0 include/{ => hpp}/fcl/broadphase/morton.h | 4 +- .../fcl/ccd/conservative_advancement.h | 6 +- .../fcl/ccd/interpolation/interpolation.h | 2 +- .../ccd/interpolation/interpolation_factory.h | 4 +- .../ccd/interpolation/interpolation_linear.h | 4 +- include/{ => hpp}/fcl/ccd/interval.h | 2 +- include/{ => hpp}/fcl/ccd/interval_matrix.h | 6 +- include/{ => hpp}/fcl/ccd/interval_vector.h | 4 +- include/{ => hpp}/fcl/ccd/motion.h | 4 +- include/{ => hpp}/fcl/ccd/motion_base.h | 8 +- include/{ => hpp}/fcl/ccd/simplex.h | 0 include/{ => hpp}/fcl/ccd/support.h | 0 include/{ => hpp}/fcl/ccd/taylor_matrix.h | 6 +- include/{ => hpp}/fcl/ccd/taylor_model.h | 2 +- include/{ => hpp}/fcl/ccd/taylor_vector.h | 4 +- include/{ => hpp}/fcl/collision.h | 6 +- include/{ => hpp}/fcl/collision_data.h | 8 +- include/{ => hpp}/fcl/collision_func_matrix.h | 4 +- include/{ => hpp}/fcl/collision_node.h | 6 +- include/{ => hpp}/fcl/collision_object.h | 8 +- include/{ => hpp}/fcl/config-fcl.hh.in | 2 +- include/{ => hpp}/fcl/continuous_collision.h | 6 +- include/{ => hpp}/fcl/data_types.h | 0 include/{ => hpp}/fcl/deprecated.h | 0 include/{ => hpp}/fcl/distance.h | 4 +- include/{ => hpp}/fcl/distance_func_matrix.h | 4 +- include/{ => hpp}/fcl/doc.hh | 0 include/{ => hpp}/fcl/exception.h | 0 include/{ => hpp}/fcl/fwd.hh | 0 include/{ => hpp}/fcl/intersect.h | 2 +- include/{ => hpp}/fcl/knn/greedy_kcenters.h | 2 +- include/{ => hpp}/fcl/knn/nearest_neighbors.h | 0 .../fcl/knn/nearest_neighbors_GNAT.h | 6 +- .../fcl/knn/nearest_neighbors_flann.h | 6 +- .../fcl/knn/nearest_neighbors_linear.h | 4 +- .../fcl/knn/nearest_neighbors_sqrtapprox.h | 4 +- include/{ => hpp}/fcl/learning/classifier.h | 2 +- include/{ => hpp}/fcl/math/math_details.h | 0 include/{ => hpp}/fcl/math/matrix_3f.h | 2 +- include/{ => hpp}/fcl/math/sampling.h | 4 +- include/{ => hpp}/fcl/math/transform.h | 2 +- include/{ => hpp}/fcl/math/vec_3f.h | 8 +- include/{ => hpp}/fcl/math/vec_nf.h | 2 +- include/{ => hpp}/fcl/narrowphase/gjk.h | 4 +- .../{ => hpp}/fcl/narrowphase/gjk_libccd.h | 4 +- .../{ => hpp}/fcl/narrowphase/narrowphase.h | 4 +- include/{ => hpp}/fcl/octree.h | 4 +- include/{ => hpp}/fcl/profile.h | 0 .../fcl/shape/geometric_shape_to_BVH_model.h | 4 +- .../{ => hpp}/fcl/shape/geometric_shapes.h | 4 +- .../fcl/shape/geometric_shapes_utility.h | 4 +- .../{ => hpp}/fcl/simd/math_simd_details.h | 2 +- include/{ => hpp}/fcl/simd/simd_intersect.h | 2 +- .../fcl/traversal/traversal_node_base.h | 6 +- .../fcl/traversal/traversal_node_bvh_shape.h | 10 +- .../fcl/traversal/traversal_node_bvhs.h | 14 +- .../fcl/traversal/traversal_node_octree.h | 12 +- .../fcl/traversal/traversal_node_setup.h | 12 +- .../fcl/traversal/traversal_node_shapes.h | 14 +- .../fcl/traversal/traversal_recurse.h | 6 +- src/BV/AABB.cpp | 2 +- src/BV/OBB.cpp | 6 +- src/BV/OBBRSS.cpp | 2 +- src/BV/RSS.cpp | 4 +- src/BV/kDOP.cpp | 2 +- src/BV/kIOS.cpp | 6 +- src/BVH/BVH_model.cpp | 4 +- src/BVH/BVH_utility.cpp | 2 +- src/BVH/BV_fitter.cpp | 4 +- src/BVH/BV_splitter.cpp | 2 +- src/articulated_model/joint.cpp | 6 +- src/articulated_model/joint_config.cpp | 4 +- src/articulated_model/link.cpp | 4 +- src/articulated_model/model.cpp | 4 +- src/articulated_model/model_config.cpp | 4 +- src/broadphase/broadphase_SSaP.cpp | 2 +- src/broadphase/broadphase_SaP.cpp | 2 +- src/broadphase/broadphase_bruteforce.cpp | 2 +- .../broadphase_dynamic_AABB_tree.cpp | 4 +- .../broadphase_dynamic_AABB_tree_array.cpp | 4 +- src/broadphase/broadphase_interval_tree.cpp | 2 +- src/broadphase/broadphase_spatialhash.cpp | 2 +- src/broadphase/hierarchy_tree.cpp | 2 +- src/broadphase/interval_tree.cpp | 2 +- src/ccd/conservative_advancement.cpp | 14 +- src/ccd/interpolation/interpolation.cpp | 2 +- .../interpolation/interpolation_factory.cpp | 4 +- .../interpolation/interpolation_linear.cpp | 4 +- src/ccd/interval.cpp | 2 +- src/ccd/interval_matrix.cpp | 2 +- src/ccd/interval_vector.cpp | 2 +- src/ccd/motion.cpp | 2 +- src/ccd/taylor_matrix.cpp | 2 +- src/ccd/taylor_model.cpp | 2 +- src/ccd/taylor_vector.cpp | 2 +- src/collision.cpp | 6 +- src/collision_data.cpp | 2 +- src/collision_func_matrix.cpp | 8 +- src/collision_node.cpp | 4 +- src/continuous_collision.cpp | 16 +- src/distance.cpp | 6 +- src/distance_capsule_capsule.cpp | 4 +- src/distance_func_matrix.cpp | 8 +- src/distance_func_matrix.h | 2 +- src/intersect.cpp | 2 +- src/math/sampling.cpp | 2 +- src/math/transform.cpp | 2 +- src/narrowphase/gjk.cpp | 4 +- src/narrowphase/gjk_libccd.cpp | 4 +- src/narrowphase/narrowphase.cpp | 6 +- src/profile.cpp | 2 +- src/shape/geometric_shapes.cpp | 4 +- src/shape/geometric_shapes_utility.cpp | 4 +- src/traversal/traversal_node_base.cpp | 2 +- src/traversal/traversal_node_bvhs.cpp | 2 +- src/traversal/traversal_node_setup.cpp | 2 +- src/traversal/traversal_recurse.cpp | 2 +- test/general_test.cpp | 8 +- test/libsvm_classifier.h | 2 +- test/test_fcl_box_box_distance.cpp | 10 +- test/test_fcl_broadphase.cpp | 8 +- test/test_fcl_capsule_box_1.cpp | 10 +- test/test_fcl_capsule_box_2.cpp | 10 +- test/test_fcl_capsule_capsule.cpp | 10 +- test/test_fcl_collision.cpp | 14 +- test/test_fcl_distance.cpp | 6 +- test/test_fcl_distance_lower_bound.cpp | 14 +- test/test_fcl_frontlist.cpp | 6 +- test/test_fcl_geometric_shapes.cpp | 6 +- test/test_fcl_math.cpp | 10 +- test/test_fcl_obb.cpp | 2 +- test/test_fcl_octomap.cpp | 12 +- test/test_fcl_shape_mesh_consistency.cpp | 8 +- test/test_fcl_simple.cpp | 12 +- test/test_fcl_sphere_capsule.cpp | 6 +- test/test_fcl_utility.cpp | 6 +- test/test_fcl_utility.h | 6 +- 171 files changed, 476 insertions(+), 477 deletions(-) rename include/{ => hpp}/fcl/BV/AABB.h (99%) rename include/{ => hpp}/fcl/BV/BV.h (97%) rename include/{ => hpp}/fcl/BV/BV_node.h (98%) rename include/{ => hpp}/fcl/BV/OBB.h (98%) rename include/{ => hpp}/fcl/BV/OBBRSS.h (98%) rename include/{ => hpp}/fcl/BV/RSS.h (98%) rename include/{ => hpp}/fcl/BV/kDOP.h (99%) rename include/{ => hpp}/fcl/BV/kIOS.h (99%) rename include/{ => hpp}/fcl/BVH/BVH_front.h (100%) rename include/{ => hpp}/fcl/BVH/BVH_internal.h (99%) rename include/{ => hpp}/fcl/BVH/BVH_model.h (98%) rename include/{ => hpp}/fcl/BVH/BVH_utility.h (99%) rename include/{ => hpp}/fcl/BVH/BV_fitter.h (99%) rename include/{ => hpp}/fcl/BVH/BV_splitter.h (98%) rename include/{ => hpp}/fcl/CMakeLists.txt (100%) rename include/{ => hpp}/fcl/articulated_model/joint.h (98%) rename include/{ => hpp}/fcl/articulated_model/joint_config.h (98%) rename include/{ => hpp}/fcl/articulated_model/link.h (97%) rename include/{ => hpp}/fcl/articulated_model/model.h (96%) rename include/{ => hpp}/fcl/articulated_model/model_config.h (96%) rename include/{ => hpp}/fcl/broadphase/broadphase.h (95%) rename include/{ => hpp}/fcl/broadphase/broadphase_SSaP.h (99%) rename include/{ => hpp}/fcl/broadphase/broadphase_SaP.h (99%) rename include/{ => hpp}/fcl/broadphase/broadphase_bruteforce.h (98%) rename include/{ => hpp}/fcl/broadphase/broadphase_dynamic_AABB_tree.h (97%) rename include/{ => hpp}/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h (97%) rename include/{ => hpp}/fcl/broadphase/broadphase_interval_tree.h (98%) rename include/{ => hpp}/fcl/broadphase/broadphase_spatialhash.h (97%) rename include/{ => hpp}/fcl/broadphase/broadphase_spatialhash.hxx (100%) rename include/{ => hpp}/fcl/broadphase/hash.h (100%) rename include/{ => hpp}/fcl/broadphase/hierarchy_tree.h (99%) rename include/{ => hpp}/fcl/broadphase/hierarchy_tree.hxx (100%) rename include/{ => hpp}/fcl/broadphase/interval_tree.h (100%) rename include/{ => hpp}/fcl/broadphase/morton.h (99%) rename include/{ => hpp}/fcl/ccd/conservative_advancement.h (95%) rename include/{ => hpp}/fcl/ccd/interpolation/interpolation.h (98%) rename include/{ => hpp}/fcl/ccd/interpolation/interpolation_factory.h (96%) rename include/{ => hpp}/fcl/ccd/interpolation/interpolation_linear.h (96%) rename include/{ => hpp}/fcl/ccd/interval.h (99%) rename include/{ => hpp}/fcl/ccd/interval_matrix.h (96%) rename include/{ => hpp}/fcl/ccd/interval_vector.h (98%) rename include/{ => hpp}/fcl/ccd/motion.h (99%) rename include/{ => hpp}/fcl/ccd/motion_base.h (97%) rename include/{ => hpp}/fcl/ccd/simplex.h (100%) rename include/{ => hpp}/fcl/ccd/support.h (100%) rename include/{ => hpp}/fcl/ccd/taylor_matrix.h (97%) rename include/{ => hpp}/fcl/ccd/taylor_model.h (99%) rename include/{ => hpp}/fcl/ccd/taylor_vector.h (98%) rename include/{ => hpp}/fcl/collision.h (96%) rename include/{ => hpp}/fcl/collision_data.h (99%) rename include/{ => hpp}/fcl/collision_func_matrix.h (97%) rename include/{ => hpp}/fcl/collision_node.h (95%) rename include/{ => hpp}/fcl/collision_object.h (98%) rename include/{ => hpp}/fcl/config-fcl.hh.in (98%) rename include/{ => hpp}/fcl/continuous_collision.h (90%) rename include/{ => hpp}/fcl/data_types.h (100%) rename include/{ => hpp}/fcl/deprecated.h (100%) rename include/{ => hpp}/fcl/distance.h (97%) rename include/{ => hpp}/fcl/distance_func_matrix.h (97%) rename include/{ => hpp}/fcl/doc.hh (100%) rename include/{ => hpp}/fcl/exception.h (100%) rename include/{ => hpp}/fcl/fwd.hh (100%) rename include/{ => hpp}/fcl/intersect.h (97%) rename include/{ => hpp}/fcl/knn/greedy_kcenters.h (99%) rename include/{ => hpp}/fcl/knn/nearest_neighbors.h (100%) rename include/{ => hpp}/fcl/knn/nearest_neighbors_GNAT.h (99%) rename include/{ => hpp}/fcl/knn/nearest_neighbors_flann.h (99%) rename include/{ => hpp}/fcl/knn/nearest_neighbors_linear.h (98%) rename include/{ => hpp}/fcl/knn/nearest_neighbors_sqrtapprox.h (98%) rename include/{ => hpp}/fcl/learning/classifier.h (99%) rename include/{ => hpp}/fcl/math/math_details.h (100%) rename include/{ => hpp}/fcl/math/matrix_3f.h (99%) rename include/{ => hpp}/fcl/math/sampling.h (99%) rename include/{ => hpp}/fcl/math/transform.h (99%) rename include/{ => hpp}/fcl/math/vec_3f.h (98%) rename include/{ => hpp}/fcl/math/vec_nf.h (99%) rename include/{ => hpp}/fcl/narrowphase/gjk.h (99%) rename include/{ => hpp}/fcl/narrowphase/gjk_libccd.h (98%) rename include/{ => hpp}/fcl/narrowphase/narrowphase.h (99%) rename include/{ => hpp}/fcl/octree.h (99%) rename include/{ => hpp}/fcl/profile.h (100%) rename include/{ => hpp}/fcl/shape/geometric_shape_to_BVH_model.h (99%) rename include/{ => hpp}/fcl/shape/geometric_shapes.h (99%) rename include/{ => hpp}/fcl/shape/geometric_shapes_utility.h (99%) rename include/{ => hpp}/fcl/simd/math_simd_details.h (99%) rename include/{ => hpp}/fcl/simd/simd_intersect.h (99%) rename include/{ => hpp}/fcl/traversal/traversal_node_base.h (98%) rename include/{ => hpp}/fcl/traversal/traversal_node_bvh_shape.h (99%) rename include/{ => hpp}/fcl/traversal/traversal_node_bvhs.h (99%) rename include/{ => hpp}/fcl/traversal/traversal_node_octree.h (99%) rename include/{ => hpp}/fcl/traversal/traversal_node_setup.h (99%) rename include/{ => hpp}/fcl/traversal/traversal_node_shapes.h (95%) rename include/{ => hpp}/fcl/traversal/traversal_recurse.h (96%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c47e4a1..0d281a56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,6 @@ cmake_minimum_required(VERSION 2.8) set(CXX_DISABLE_WERROR TRUE) -set(CUSTOM_HEADER_DIR fcl) include(cmake/base.cmake) include(cmake/boost.cmake) @@ -61,103 +60,103 @@ add_optional_dependency("octomap >= 1.6") # endif() SET(${PROJECT_NAME}_HEADERS - include/fcl/collision_data.h - include/fcl/profile.h - include/fcl/exception.h - include/fcl/ccd/taylor_vector.h - include/fcl/ccd/interval_vector.h - include/fcl/ccd/simplex.h - include/fcl/ccd/support.h - include/fcl/ccd/interval_matrix.h - include/fcl/ccd/interval.h - include/fcl/ccd/interpolation/interpolation_factory.h - include/fcl/ccd/interpolation/interpolation_linear.h - include/fcl/ccd/interpolation/interpolation.h - include/fcl/ccd/conservative_advancement.h - include/fcl/ccd/taylor_model.h - include/fcl/ccd/taylor_matrix.h - include/fcl/ccd/motion_base.h - include/fcl/ccd/motion.h - include/fcl/deprecated.h - include/fcl/BV/kIOS.h - include/fcl/BV/BV.h - include/fcl/BV/RSS.h - include/fcl/BV/OBBRSS.h - include/fcl/BV/BV_node.h - include/fcl/BV/AABB.h - include/fcl/BV/OBB.h - include/fcl/BV/kDOP.h - include/fcl/narrowphase/narrowphase.h - include/fcl/narrowphase/gjk.h - include/fcl/narrowphase/gjk_libccd.h - include/fcl/broadphase/interval_tree.h - include/fcl/broadphase/broadphase_spatialhash.h - include/fcl/broadphase/broadphase_dynamic_AABB_tree.h - include/fcl/broadphase/broadphase_SSaP.h - include/fcl/broadphase/broadphase_interval_tree.h - include/fcl/broadphase/broadphase.h - include/fcl/broadphase/hierarchy_tree.h - include/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h - include/fcl/broadphase/broadphase_SaP.h - include/fcl/broadphase/broadphase_bruteforce.h - include/fcl/broadphase/morton.h - include/fcl/broadphase/hash.h - include/fcl/learning/classifier.h - include/fcl/shape/geometric_shapes_utility.h - include/fcl/shape/geometric_shape_to_BVH_model.h - include/fcl/shape/geometric_shapes.h - include/fcl/simd/simd_intersect.h - include/fcl/simd/math_simd_details.h - include/fcl/distance_func_matrix.h - include/fcl/collision.h - include/fcl/collision_node.h - include/fcl/collision_func_matrix.h - include/fcl/distance.h - include/fcl/knn/greedy_kcenters.h - include/fcl/knn/nearest_neighbors_GNAT.h - include/fcl/knn/nearest_neighbors_flann.h - include/fcl/knn/nearest_neighbors_sqrtapprox.h - include/fcl/knn/nearest_neighbors_linear.h - include/fcl/knn/nearest_neighbors.h - include/fcl/continuous_collision.h - include/fcl/math/vec_nf.h - include/fcl/math/matrix_3f.h - include/fcl/math/vec_3f.h - include/fcl/math/sampling.h - include/fcl/math/math_details.h - include/fcl/math/transform.h - include/fcl/traversal/traversal_node_shapes.h - include/fcl/traversal/traversal_node_setup.h - include/fcl/traversal/traversal_recurse.h - include/fcl/traversal/traversal_node_octree.h - include/fcl/traversal/traversal_node_bvhs.h - include/fcl/traversal/traversal_node_bvh_shape.h - include/fcl/traversal/traversal_node_base.h - include/fcl/data_types.h - include/fcl/articulated_model/model.h - include/fcl/articulated_model/joint_config.h - include/fcl/articulated_model/model_config.h - include/fcl/articulated_model/joint.h - include/fcl/articulated_model/link.h - include/fcl/BVH/BV_splitter.h - include/fcl/BVH/BVH_internal.h - include/fcl/BVH/BVH_model.h - include/fcl/BVH/BV_fitter.h - include/fcl/BVH/BVH_front.h - include/fcl/BVH/BVH_utility.h - include/fcl/intersect.h - include/fcl/collision_object.h - include/fcl/octree.h - include/fcl/fwd.hh + include/hpp/fcl/collision_data.h + include/hpp/fcl/profile.h + include/hpp/fcl/exception.h + include/hpp/fcl/ccd/taylor_vector.h + include/hpp/fcl/ccd/interval_vector.h + include/hpp/fcl/ccd/simplex.h + include/hpp/fcl/ccd/support.h + include/hpp/fcl/ccd/interval_matrix.h + include/hpp/fcl/ccd/interval.h + include/hpp/fcl/ccd/interpolation/interpolation_factory.h + include/hpp/fcl/ccd/interpolation/interpolation_linear.h + include/hpp/fcl/ccd/interpolation/interpolation.h + include/hpp/fcl/ccd/conservative_advancement.h + include/hpp/fcl/ccd/taylor_model.h + include/hpp/fcl/ccd/taylor_matrix.h + include/hpp/fcl/ccd/motion_base.h + include/hpp/fcl/ccd/motion.h + include/hpp/fcl/deprecated.h + include/hpp/fcl/BV/kIOS.h + include/hpp/fcl/BV/BV.h + include/hpp/fcl/BV/RSS.h + include/hpp/fcl/BV/OBBRSS.h + include/hpp/fcl/BV/BV_node.h + include/hpp/fcl/BV/AABB.h + include/hpp/fcl/BV/OBB.h + include/hpp/fcl/BV/kDOP.h + include/hpp/fcl/narrowphase/narrowphase.h + include/hpp/fcl/narrowphase/gjk.h + include/hpp/fcl/narrowphase/gjk_libccd.h + include/hpp/fcl/broadphase/interval_tree.h + include/hpp/fcl/broadphase/broadphase_spatialhash.h + include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h + include/hpp/fcl/broadphase/broadphase_SSaP.h + include/hpp/fcl/broadphase/broadphase_interval_tree.h + include/hpp/fcl/broadphase/broadphase.h + include/hpp/fcl/broadphase/hierarchy_tree.h + include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h + include/hpp/fcl/broadphase/broadphase_SaP.h + include/hpp/fcl/broadphase/broadphase_bruteforce.h + include/hpp/fcl/broadphase/morton.h + include/hpp/fcl/broadphase/hash.h + include/hpp/fcl/learning/classifier.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/simd/simd_intersect.h + include/hpp/fcl/simd/math_simd_details.h + include/hpp/fcl/distance_func_matrix.h + include/hpp/fcl/collision.h + include/hpp/fcl/collision_node.h + include/hpp/fcl/collision_func_matrix.h + include/hpp/fcl/distance.h + include/hpp/fcl/knn/greedy_kcenters.h + include/hpp/fcl/knn/nearest_neighbors_GNAT.h + include/hpp/fcl/knn/nearest_neighbors_flann.h + include/hpp/fcl/knn/nearest_neighbors_sqrtapprox.h + include/hpp/fcl/knn/nearest_neighbors_linear.h + include/hpp/fcl/knn/nearest_neighbors.h + include/hpp/fcl/continuous_collision.h + include/hpp/fcl/math/vec_nf.h + include/hpp/fcl/math/matrix_3f.h + include/hpp/fcl/math/vec_3f.h + include/hpp/fcl/math/sampling.h + include/hpp/fcl/math/math_details.h + include/hpp/fcl/math/transform.h + include/hpp/fcl/traversal/traversal_node_shapes.h + include/hpp/fcl/traversal/traversal_node_setup.h + include/hpp/fcl/traversal/traversal_recurse.h + include/hpp/fcl/traversal/traversal_node_octree.h + include/hpp/fcl/traversal/traversal_node_bvhs.h + include/hpp/fcl/traversal/traversal_node_bvh_shape.h + include/hpp/fcl/traversal/traversal_node_base.h + include/hpp/fcl/data_types.h + include/hpp/fcl/articulated_model/model.h + include/hpp/fcl/articulated_model/joint_config.h + include/hpp/fcl/articulated_model/model_config.h + include/hpp/fcl/articulated_model/joint.h + include/hpp/fcl/articulated_model/link.h + include/hpp/fcl/BVH/BV_splitter.h + include/hpp/fcl/BVH/BVH_internal.h + include/hpp/fcl/BVH/BVH_model.h + include/hpp/fcl/BVH/BV_fitter.h + include/hpp/fcl/BVH/BVH_front.h + include/hpp/fcl/BVH/BVH_utility.h + include/hpp/fcl/intersect.h + include/hpp/fcl/collision_object.h + include/hpp/fcl/octree.h + include/hpp/fcl/fwd.hh ) pkg_config_append_libs("hpp-fcl") add_subdirectory(src) add_subdirectory(test) -config_files(include/fcl/config-fcl.hh) -install(FILES ${PROJECT_BINARY_DIR}/include/fcl/config-fcl.hh - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fcl +config_files(include/hpp/fcl/config-fcl.hh) +install(FILES ${PROJECT_BINARY_DIR}/include/hpp/fcl/config-fcl.hh + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hpp/fcl PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE ) setup_project_finalize() diff --git a/include/fcl/BV/AABB.h b/include/hpp/fcl/BV/AABB.h similarity index 99% rename from include/fcl/BV/AABB.h rename to include/hpp/fcl/BV/AABB.h index ae379878..1a244650 100644 --- a/include/fcl/BV/AABB.h +++ b/include/hpp/fcl/BV/AABB.h @@ -39,7 +39,7 @@ #define FCL_AABB_H #include <stdexcept> -#include "fcl/math/vec_3f.h" +#include <hpp/fcl/math/vec_3f.h> namespace fcl { diff --git a/include/fcl/BV/BV.h b/include/hpp/fcl/BV/BV.h similarity index 97% rename from include/fcl/BV/BV.h rename to include/hpp/fcl/BV/BV.h index bee56f67..d8118640 100644 --- a/include/fcl/BV/BV.h +++ b/include/hpp/fcl/BV/BV.h @@ -39,13 +39,13 @@ #define FCL_BV_H -#include "fcl/BV/kDOP.h" -#include "fcl/BV/AABB.h" -#include "fcl/BV/OBB.h" -#include "fcl/BV/RSS.h" -#include "fcl/BV/OBBRSS.h" -#include "fcl/BV/kIOS.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/BV/kDOP.h> +#include <hpp/fcl/BV/AABB.h> +#include <hpp/fcl/BV/OBB.h> +#include <hpp/fcl/BV/RSS.h> +#include <hpp/fcl/BV/OBBRSS.h> +#include <hpp/fcl/BV/kIOS.h> +#include <hpp/fcl/math/transform.h> /** \brief Main namespace */ namespace fcl diff --git a/include/fcl/BV/BV_node.h b/include/hpp/fcl/BV/BV_node.h similarity index 98% rename from include/fcl/BV/BV_node.h rename to include/hpp/fcl/BV/BV_node.h index fa2fa13a..9d2f5cff 100644 --- a/include/fcl/BV/BV_node.h +++ b/include/hpp/fcl/BV/BV_node.h @@ -39,10 +39,10 @@ #ifndef FCL_BV_NODE_H #define FCL_BV_NODE_H -#include "fcl/math/vec_3f.h" -#include "fcl/math/matrix_3f.h" +#include <hpp/fcl/math/vec_3f.h> +#include <hpp/fcl/math/matrix_3f.h> -#include "fcl/BV/BV.h" +#include <hpp/fcl/BV/BV.h> #include <iostream> namespace fcl diff --git a/include/fcl/BV/OBB.h b/include/hpp/fcl/BV/OBB.h similarity index 98% rename from include/fcl/BV/OBB.h rename to include/hpp/fcl/BV/OBB.h index ac035eda..1dcd7160 100644 --- a/include/fcl/BV/OBB.h +++ b/include/hpp/fcl/BV/OBB.h @@ -39,8 +39,8 @@ #define FCL_OBB_H -#include "fcl/math/vec_3f.h" -#include "fcl/math/matrix_3f.h" +#include <hpp/fcl/math/vec_3f.h> +#include <hpp/fcl/math/matrix_3f.h> namespace fcl { diff --git a/include/fcl/BV/OBBRSS.h b/include/hpp/fcl/BV/OBBRSS.h similarity index 98% rename from include/fcl/BV/OBBRSS.h rename to include/hpp/fcl/BV/OBBRSS.h index aaf172b0..5b3b9532 100644 --- a/include/fcl/BV/OBBRSS.h +++ b/include/hpp/fcl/BV/OBBRSS.h @@ -39,8 +39,8 @@ #define FCL_OBBRSS_H -#include "fcl/BV/OBB.h" -#include "fcl/BV/RSS.h" +#include <hpp/fcl/BV/OBB.h> +#include <hpp/fcl/BV/RSS.h> namespace fcl { diff --git a/include/fcl/BV/RSS.h b/include/hpp/fcl/BV/RSS.h similarity index 98% rename from include/fcl/BV/RSS.h rename to include/hpp/fcl/BV/RSS.h index e25a546a..4e42bab3 100644 --- a/include/fcl/BV/RSS.h +++ b/include/hpp/fcl/BV/RSS.h @@ -39,8 +39,8 @@ #define FCL_RSS_H #include <stdexcept> -#include "fcl/math/vec_3f.h" -#include "fcl/math/matrix_3f.h" +#include <hpp/fcl/math/vec_3f.h> +#include <hpp/fcl/math/matrix_3f.h> #include <boost/math/constants/constants.hpp> namespace fcl diff --git a/include/fcl/BV/kDOP.h b/include/hpp/fcl/BV/kDOP.h similarity index 99% rename from include/fcl/BV/kDOP.h rename to include/hpp/fcl/BV/kDOP.h index d33f5a8a..eb102f96 100644 --- a/include/fcl/BV/kDOP.h +++ b/include/hpp/fcl/BV/kDOP.h @@ -39,7 +39,7 @@ #define FCL_KDOP_H #include <stdexcept> -#include "fcl/math/vec_3f.h" +#include <hpp/fcl/math/vec_3f.h> namespace fcl { diff --git a/include/fcl/BV/kIOS.h b/include/hpp/fcl/BV/kIOS.h similarity index 99% rename from include/fcl/BV/kIOS.h rename to include/hpp/fcl/BV/kIOS.h index eab7c940..8df8b9f1 100644 --- a/include/fcl/BV/kIOS.h +++ b/include/hpp/fcl/BV/kIOS.h @@ -38,7 +38,7 @@ #ifndef FCL_KIOS_H #define FCL_KIOS_H -#include "fcl/BV/OBB.h" +#include <hpp/fcl/BV/OBB.h> namespace fcl diff --git a/include/fcl/BVH/BVH_front.h b/include/hpp/fcl/BVH/BVH_front.h similarity index 100% rename from include/fcl/BVH/BVH_front.h rename to include/hpp/fcl/BVH/BVH_front.h diff --git a/include/fcl/BVH/BVH_internal.h b/include/hpp/fcl/BVH/BVH_internal.h similarity index 99% rename from include/fcl/BVH/BVH_internal.h rename to include/hpp/fcl/BVH/BVH_internal.h index 397aef43..b7fd4147 100644 --- a/include/fcl/BVH/BVH_internal.h +++ b/include/hpp/fcl/BVH/BVH_internal.h @@ -38,7 +38,7 @@ #ifndef FCL_BVH_INTERNAL_H #define FCL_BVH_INTERNAL_H -#include "fcl/data_types.h" +#include <hpp/fcl/data_types.h> namespace fcl { diff --git a/include/fcl/BVH/BVH_model.h b/include/hpp/fcl/BVH/BVH_model.h similarity index 98% rename from include/fcl/BVH/BVH_model.h rename to include/hpp/fcl/BVH/BVH_model.h index 69a30b3d..8db515ee 100644 --- a/include/fcl/BVH/BVH_model.h +++ b/include/hpp/fcl/BVH/BVH_model.h @@ -38,11 +38,11 @@ #ifndef FCL_BVH_MODEL_H #define FCL_BVH_MODEL_H -#include "fcl/collision_object.h" -#include "fcl/BVH/BVH_internal.h" -#include "fcl/BV/BV_node.h" -#include "fcl/BVH/BV_splitter.h" -#include "fcl/BVH/BV_fitter.h" +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/BVH/BVH_internal.h> +#include <hpp/fcl/BV/BV_node.h> +#include <hpp/fcl/BVH/BV_splitter.h> +#include <hpp/fcl/BVH/BV_fitter.h> #include <vector> #include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> diff --git a/include/fcl/BVH/BVH_utility.h b/include/hpp/fcl/BVH/BVH_utility.h similarity index 99% rename from include/fcl/BVH/BVH_utility.h rename to include/hpp/fcl/BVH/BVH_utility.h index 87c190de..b5783ed7 100644 --- a/include/fcl/BVH/BVH_utility.h +++ b/include/hpp/fcl/BVH/BVH_utility.h @@ -39,7 +39,7 @@ #ifndef FCL_BVH_UTILITY_H #define FCL_BVH_UTILITY_H -#include "fcl/BVH/BVH_model.h" +#include <hpp/fcl/BVH/BVH_model.h> namespace fcl diff --git a/include/fcl/BVH/BV_fitter.h b/include/hpp/fcl/BVH/BV_fitter.h similarity index 99% rename from include/fcl/BVH/BV_fitter.h rename to include/hpp/fcl/BVH/BV_fitter.h index 2e7b40eb..38e1f814 100644 --- a/include/fcl/BVH/BV_fitter.h +++ b/include/hpp/fcl/BVH/BV_fitter.h @@ -38,9 +38,9 @@ #ifndef FCL_BV_FITTER_H #define FCL_BV_FITTER_H -#include "fcl/BVH/BVH_internal.h" -#include "fcl/BV/kIOS.h" -#include "fcl/BV/OBBRSS.h" +#include <hpp/fcl/BVH/BVH_internal.h> +#include <hpp/fcl/BV/kIOS.h> +#include <hpp/fcl/BV/OBBRSS.h> #include <iostream> namespace fcl diff --git a/include/fcl/BVH/BV_splitter.h b/include/hpp/fcl/BVH/BV_splitter.h similarity index 98% rename from include/fcl/BVH/BV_splitter.h rename to include/hpp/fcl/BVH/BV_splitter.h index 890f0af4..c10670fd 100644 --- a/include/fcl/BVH/BV_splitter.h +++ b/include/hpp/fcl/BVH/BV_splitter.h @@ -38,9 +38,9 @@ #ifndef FCL_BV_SPLITTER_H #define FCL_BV_SPLITTER_H -#include "fcl/BVH/BVH_internal.h" -#include "fcl/BV/kIOS.h" -#include "fcl/BV/OBBRSS.h" +#include <hpp/fcl/BVH/BVH_internal.h> +#include <hpp/fcl/BV/kIOS.h> +#include <hpp/fcl/BV/OBBRSS.h> #include <vector> #include <iostream> diff --git a/include/fcl/CMakeLists.txt b/include/hpp/fcl/CMakeLists.txt similarity index 100% rename from include/fcl/CMakeLists.txt rename to include/hpp/fcl/CMakeLists.txt diff --git a/include/fcl/articulated_model/joint.h b/include/hpp/fcl/articulated_model/joint.h similarity index 98% rename from include/fcl/articulated_model/joint.h rename to include/hpp/fcl/articulated_model/joint.h index 1fa05346..7c5b36ad 100644 --- a/include/fcl/articulated_model/joint.h +++ b/include/hpp/fcl/articulated_model/joint.h @@ -38,8 +38,8 @@ #ifndef FCL_ARTICULATED_MODEL_JOINT_H #define FCL_ARTICULATED_MODEL_JOINT_H -#include "fcl/math/transform.h" -#include "fcl/data_types.h" +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/data_types.h> #include <string> #include <vector> diff --git a/include/fcl/articulated_model/joint_config.h b/include/hpp/fcl/articulated_model/joint_config.h similarity index 98% rename from include/fcl/articulated_model/joint_config.h rename to include/hpp/fcl/articulated_model/joint_config.h index f87533d6..bd5ddf18 100644 --- a/include/fcl/articulated_model/joint_config.h +++ b/include/hpp/fcl/articulated_model/joint_config.h @@ -38,7 +38,7 @@ #ifndef FCL_ARTICULATED_MODEL_JOINT_CONFIG_H #define FCL_ARTICULATED_MODEL_JOINT_CONFIG_H -#include "fcl/data_types.h" +#include <hpp/fcl/data_types.h> #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <vector> diff --git a/include/fcl/articulated_model/link.h b/include/hpp/fcl/articulated_model/link.h similarity index 97% rename from include/fcl/articulated_model/link.h rename to include/hpp/fcl/articulated_model/link.h index 1df1c4cb..41c7c48a 100644 --- a/include/fcl/articulated_model/link.h +++ b/include/hpp/fcl/articulated_model/link.h @@ -38,8 +38,8 @@ #ifndef FCL_ARTICULATED_MODEL_LINK_H #define FCL_ARTICULATED_MODEL_LINK_H -#include "fcl/data_types.h" -#include "fcl/collision_object.h" +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/collision_object.h> #include <boost/shared_ptr.hpp> #include <vector> diff --git a/include/fcl/articulated_model/model.h b/include/hpp/fcl/articulated_model/model.h similarity index 96% rename from include/fcl/articulated_model/model.h rename to include/hpp/fcl/articulated_model/model.h index bc95504c..c2359849 100644 --- a/include/fcl/articulated_model/model.h +++ b/include/hpp/fcl/articulated_model/model.h @@ -38,10 +38,10 @@ #ifndef FCL_ARTICULATED_MODEL_MODEL_H #define FCL_ARTICULATED_MODEL_MODEL_H -#include "fcl/articulated_model/joint.h" -#include "fcl/articulated_model/link.h" +#include <hpp/fcl/articulated_model/joint.h> +#include <hpp/fcl/articulated_model/link.h> -#include "fcl/data_types.h" +#include <hpp/fcl/data_types.h> #include <boost/shared_ptr.hpp> #include <map> diff --git a/include/fcl/articulated_model/model_config.h b/include/hpp/fcl/articulated_model/model_config.h similarity index 96% rename from include/fcl/articulated_model/model_config.h rename to include/hpp/fcl/articulated_model/model_config.h index 49e8a640..a0699ca2 100644 --- a/include/fcl/articulated_model/model_config.h +++ b/include/hpp/fcl/articulated_model/model_config.h @@ -38,8 +38,8 @@ #ifndef FCL_ARTICULATED_MODEL_MODEL_CONFIG_H #define FCL_ARTICULATED_MODEL_MODEL_CONFIG_H -#include "fcl/data_types.h" -#include "fcl/articulated_model/joint_config.h" +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/articulated_model/joint_config.h> #include <string> #include <map> #include <boost/weak_ptr.hpp> diff --git a/include/fcl/broadphase/broadphase.h b/include/hpp/fcl/broadphase/broadphase.h similarity index 95% rename from include/fcl/broadphase/broadphase.h rename to include/hpp/fcl/broadphase/broadphase.h index ded5e11d..04311be5 100644 --- a/include/fcl/broadphase/broadphase.h +++ b/include/hpp/fcl/broadphase/broadphase.h @@ -40,7 +40,7 @@ #ifndef FCL_BROAD_PHASE_H #define FCL_BROAD_PHASE_H -#include "fcl/collision_object.h" +#include <hpp/fcl/collision_object.h> #include <set> #include <vector> @@ -230,12 +230,12 @@ public: } -#include "fcl/broadphase/broadphase_bruteforce.h" -#include "fcl/broadphase/broadphase_spatialhash.h" -#include "fcl/broadphase/broadphase_SaP.h" -#include "fcl/broadphase/broadphase_SSaP.h" -#include "fcl/broadphase/broadphase_interval_tree.h" -#include "fcl/broadphase/broadphase_dynamic_AABB_tree.h" -#include "fcl/broadphase/broadphase_dynamic_AABB_tree_array.h" +#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_dynamic_AABB_tree.h> +#include <hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h> #endif diff --git a/include/fcl/broadphase/broadphase_SSaP.h b/include/hpp/fcl/broadphase/broadphase_SSaP.h similarity index 99% rename from include/fcl/broadphase/broadphase_SSaP.h rename to include/hpp/fcl/broadphase/broadphase_SSaP.h index be3cc46a..28e7107b 100644 --- a/include/fcl/broadphase/broadphase_SSaP.h +++ b/include/hpp/fcl/broadphase/broadphase_SSaP.h @@ -39,7 +39,7 @@ #ifndef FCL_BROAD_PHASE_SSAP_H #define FCL_BROAD_PHASE_SSAP_H -#include "fcl/broadphase/broadphase.h" +#include <hpp/fcl/broadphase/broadphase.h> namespace fcl { diff --git a/include/fcl/broadphase/broadphase_SaP.h b/include/hpp/fcl/broadphase/broadphase_SaP.h similarity index 99% rename from include/fcl/broadphase/broadphase_SaP.h rename to include/hpp/fcl/broadphase/broadphase_SaP.h index 62404b3d..21b07bb6 100644 --- a/include/fcl/broadphase/broadphase_SaP.h +++ b/include/hpp/fcl/broadphase/broadphase_SaP.h @@ -38,7 +38,7 @@ #ifndef FCL_BROAD_PHASE_SAP_H #define FCL_BROAD_PHASE_SAP_H -#include "fcl/broadphase/broadphase.h" +#include <hpp/fcl/broadphase/broadphase.h> #include <map> #include <list> diff --git a/include/fcl/broadphase/broadphase_bruteforce.h b/include/hpp/fcl/broadphase/broadphase_bruteforce.h similarity index 98% rename from include/fcl/broadphase/broadphase_bruteforce.h rename to include/hpp/fcl/broadphase/broadphase_bruteforce.h index 12ebba83..6e712107 100644 --- a/include/fcl/broadphase/broadphase_bruteforce.h +++ b/include/hpp/fcl/broadphase/broadphase_bruteforce.h @@ -38,7 +38,7 @@ #ifndef FCL_BROAD_PHASE_BRUTE_FORCE_H #define FCL_BROAD_PHASE_BRUTE_FORCE_H -#include "fcl/broadphase/broadphase.h" +#include <hpp/fcl/broadphase/broadphase.h> #include <list> diff --git a/include/fcl/broadphase/broadphase_dynamic_AABB_tree.h b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h similarity index 97% rename from include/fcl/broadphase/broadphase_dynamic_AABB_tree.h rename to include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h index 1b8ea896..bd6a6063 100644 --- a/include/fcl/broadphase/broadphase_dynamic_AABB_tree.h +++ b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h @@ -39,10 +39,10 @@ #ifndef FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_H #define FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_H -#include "fcl/broadphase/broadphase.h" -#include "fcl/broadphase/hierarchy_tree.h" -#include "fcl/BV/BV.h" -#include "fcl/shape/geometric_shapes_utility.h" +#include <hpp/fcl/broadphase/broadphase.h> +#include <hpp/fcl/broadphase/hierarchy_tree.h> +#include <hpp/fcl/BV/BV.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> #include <boost/unordered_map.hpp> #include <boost/bind.hpp> #include <limits> diff --git a/include/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h similarity index 97% rename from include/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h rename to include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h index 3c132e09..731010dd 100644 --- a/include/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h +++ b/include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h @@ -38,10 +38,10 @@ #ifndef FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_ARRAY_H #define FCL_BROAD_PHASE_DYNAMIC_AABB_TREE_ARRAY_H -#include "fcl/broadphase/broadphase.h" -#include "fcl/broadphase/hierarchy_tree.h" -#include "fcl/BV/BV.h" -#include "fcl/shape/geometric_shapes_utility.h" +#include <hpp/fcl/broadphase/broadphase.h> +#include <hpp/fcl/broadphase/hierarchy_tree.h> +#include <hpp/fcl/BV/BV.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> #include <boost/unordered_map.hpp> #include <boost/bind.hpp> #include <limits> diff --git a/include/fcl/broadphase/broadphase_interval_tree.h b/include/hpp/fcl/broadphase/broadphase_interval_tree.h similarity index 98% rename from include/fcl/broadphase/broadphase_interval_tree.h rename to include/hpp/fcl/broadphase/broadphase_interval_tree.h index eb9c7cd5..53c105ef 100644 --- a/include/fcl/broadphase/broadphase_interval_tree.h +++ b/include/hpp/fcl/broadphase/broadphase_interval_tree.h @@ -38,8 +38,8 @@ #ifndef FCL_BROAD_PHASE_INTERVAL_TREE_H #define FCL_BROAD_PHASE_INTERVAL_TREE_H -#include "fcl/broadphase/broadphase.h" -#include "fcl/broadphase/interval_tree.h" +#include <hpp/fcl/broadphase/broadphase.h> +#include <hpp/fcl/broadphase/interval_tree.h> #include <deque> #include <map> diff --git a/include/fcl/broadphase/broadphase_spatialhash.h b/include/hpp/fcl/broadphase/broadphase_spatialhash.h similarity index 97% rename from include/fcl/broadphase/broadphase_spatialhash.h rename to include/hpp/fcl/broadphase/broadphase_spatialhash.h index 21de859d..fbcded16 100644 --- a/include/fcl/broadphase/broadphase_spatialhash.h +++ b/include/hpp/fcl/broadphase/broadphase_spatialhash.h @@ -38,9 +38,9 @@ #ifndef FCL_BROAD_PHASE_SPATIAL_HASH_H #define FCL_BROAD_PHASE_SPATIAL_HASH_H -#include "fcl/broadphase/broadphase.h" -#include "fcl/broadphase/hash.h" -#include "fcl/BV/AABB.h" +#include <hpp/fcl/broadphase/broadphase.h> +#include <hpp/fcl/broadphase/hash.h> +#include <hpp/fcl/BV/AABB.h> #include <list> #include <map> @@ -193,7 +193,7 @@ protected: } -#include "fcl/broadphase/broadphase_spatialhash.hxx" +#include <hpp/fcl/broadphase/broadphase_spatialhash.hxx> #endif diff --git a/include/fcl/broadphase/broadphase_spatialhash.hxx b/include/hpp/fcl/broadphase/broadphase_spatialhash.hxx similarity index 100% rename from include/fcl/broadphase/broadphase_spatialhash.hxx rename to include/hpp/fcl/broadphase/broadphase_spatialhash.hxx diff --git a/include/fcl/broadphase/hash.h b/include/hpp/fcl/broadphase/hash.h similarity index 100% rename from include/fcl/broadphase/hash.h rename to include/hpp/fcl/broadphase/hash.h diff --git a/include/fcl/broadphase/hierarchy_tree.h b/include/hpp/fcl/broadphase/hierarchy_tree.h similarity index 99% rename from include/fcl/broadphase/hierarchy_tree.h rename to include/hpp/fcl/broadphase/hierarchy_tree.h index ed055ff7..347e90a3 100644 --- a/include/fcl/broadphase/hierarchy_tree.h +++ b/include/hpp/fcl/broadphase/hierarchy_tree.h @@ -40,8 +40,8 @@ #include <vector> #include <map> -#include "fcl/BV/AABB.h" -#include "fcl/broadphase/morton.h" +#include <hpp/fcl/BV/AABB.h> +#include <hpp/fcl/broadphase/morton.h> #include <boost/bind.hpp> #include <boost/iterator/zip_iterator.hpp> @@ -587,7 +587,7 @@ const size_t HierarchyTree<BV>::NULL_NODE; } -#include "fcl/broadphase/hierarchy_tree.hxx" +#include <hpp/fcl/broadphase/hierarchy_tree.hxx> #endif diff --git a/include/fcl/broadphase/hierarchy_tree.hxx b/include/hpp/fcl/broadphase/hierarchy_tree.hxx similarity index 100% rename from include/fcl/broadphase/hierarchy_tree.hxx rename to include/hpp/fcl/broadphase/hierarchy_tree.hxx diff --git a/include/fcl/broadphase/interval_tree.h b/include/hpp/fcl/broadphase/interval_tree.h similarity index 100% rename from include/fcl/broadphase/interval_tree.h rename to include/hpp/fcl/broadphase/interval_tree.h diff --git a/include/fcl/broadphase/morton.h b/include/hpp/fcl/broadphase/morton.h similarity index 99% rename from include/fcl/broadphase/morton.h rename to include/hpp/fcl/broadphase/morton.h index 11b91ec6..f599a7cc 100644 --- a/include/fcl/broadphase/morton.h +++ b/include/hpp/fcl/broadphase/morton.h @@ -39,8 +39,8 @@ #define FCL_MORTON_H #include <boost/dynamic_bitset.hpp> -#include "fcl/data_types.h" -#include "fcl/BV/AABB.h" +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/BV/AABB.h> namespace fcl { diff --git a/include/fcl/ccd/conservative_advancement.h b/include/hpp/fcl/ccd/conservative_advancement.h similarity index 95% rename from include/fcl/ccd/conservative_advancement.h rename to include/hpp/fcl/ccd/conservative_advancement.h index b94f6c10..9c0a993f 100644 --- a/include/fcl/ccd/conservative_advancement.h +++ b/include/hpp/fcl/ccd/conservative_advancement.h @@ -39,9 +39,9 @@ #define FCL_CONSERVATIVE_ADVANCEMENT_H -#include "fcl/collision_object.h" -#include "fcl/collision_data.h" -#include "fcl/ccd/motion_base.h" +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/collision_data.h> +#include <hpp/fcl/ccd/motion_base.h> namespace fcl diff --git a/include/fcl/ccd/interpolation/interpolation.h b/include/hpp/fcl/ccd/interpolation/interpolation.h similarity index 98% rename from include/fcl/ccd/interpolation/interpolation.h rename to include/hpp/fcl/ccd/interpolation/interpolation.h index 4e84a7c6..07d8be71 100644 --- a/include/fcl/ccd/interpolation/interpolation.h +++ b/include/hpp/fcl/ccd/interpolation/interpolation.h @@ -38,7 +38,7 @@ #ifndef FCL_CCD_INTERPOLATION_INTERPOLATION_H #define FCL_CCD_INTERPOLATION_INTERPOLATION_H -#include "fcl/data_types.h" +#include <hpp/fcl/data_types.h> namespace fcl { diff --git a/include/fcl/ccd/interpolation/interpolation_factory.h b/include/hpp/fcl/ccd/interpolation/interpolation_factory.h similarity index 96% rename from include/fcl/ccd/interpolation/interpolation_factory.h rename to include/hpp/fcl/ccd/interpolation/interpolation_factory.h index c8b3ec55..c8aa0885 100644 --- a/include/fcl/ccd/interpolation/interpolation_factory.h +++ b/include/hpp/fcl/ccd/interpolation/interpolation_factory.h @@ -38,8 +38,8 @@ #ifndef FCL_CCD_INTERPOLATION_INTERPOLATION_FACTORY_H #define FCL_CCD_INTERPOLATION_INTERPOLATION_FACTORY_H -#include "fcl/data_types.h" -#include "fcl/ccd/interpolation/interpolation.h" +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/ccd/interpolation/interpolation.h> #include <map> diff --git a/include/fcl/ccd/interpolation/interpolation_linear.h b/include/hpp/fcl/ccd/interpolation/interpolation_linear.h similarity index 96% rename from include/fcl/ccd/interpolation/interpolation_linear.h rename to include/hpp/fcl/ccd/interpolation/interpolation_linear.h index ecef3734..cc50ee67 100644 --- a/include/fcl/ccd/interpolation/interpolation_linear.h +++ b/include/hpp/fcl/ccd/interpolation/interpolation_linear.h @@ -38,8 +38,8 @@ #ifndef FCL_CCD_INTERPOLATION_INTERPOLATION_LINEAR_H #define FCL_CCD_INTERPOLATION_INTERPOLATION_LINEAR_H -#include "fcl/data_types.h" -#include "fcl/ccd/interpolation/interpolation.h" +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/ccd/interpolation/interpolation.h> #include <boost/shared_ptr.hpp> diff --git a/include/fcl/ccd/interval.h b/include/hpp/fcl/ccd/interval.h similarity index 99% rename from include/fcl/ccd/interval.h rename to include/hpp/fcl/ccd/interval.h index 5afa5b4c..6ea96df7 100644 --- a/include/fcl/ccd/interval.h +++ b/include/hpp/fcl/ccd/interval.h @@ -40,7 +40,7 @@ #ifndef FCL_CCD_INTERVAL_H #define FCL_CCD_INTERVAL_H -#include "fcl/data_types.h" +#include <hpp/fcl/data_types.h> namespace fcl { diff --git a/include/fcl/ccd/interval_matrix.h b/include/hpp/fcl/ccd/interval_matrix.h similarity index 96% rename from include/fcl/ccd/interval_matrix.h rename to include/hpp/fcl/ccd/interval_matrix.h index 6084812a..f828387a 100644 --- a/include/fcl/ccd/interval_matrix.h +++ b/include/hpp/fcl/ccd/interval_matrix.h @@ -39,9 +39,9 @@ #ifndef FCL_CCD_INTERVAL_MATRIX_H #define FCL_CCD_INTERVAL_MATRIX_H -#include "fcl/ccd/interval.h" -#include "fcl/ccd/interval_vector.h" -#include "fcl/math/matrix_3f.h" +#include <hpp/fcl/ccd/interval.h> +#include <hpp/fcl/ccd/interval_vector.h> +#include <hpp/fcl/math/matrix_3f.h> namespace fcl { diff --git a/include/fcl/ccd/interval_vector.h b/include/hpp/fcl/ccd/interval_vector.h similarity index 98% rename from include/fcl/ccd/interval_vector.h rename to include/hpp/fcl/ccd/interval_vector.h index 745480a8..f5b71b64 100644 --- a/include/fcl/ccd/interval_vector.h +++ b/include/hpp/fcl/ccd/interval_vector.h @@ -39,8 +39,8 @@ #ifndef FCL_CCD_INTERVAL_VECTOR_H #define FCL_CCD_INTERVAL_VECTOR_H -#include "fcl/ccd/interval.h" -#include "fcl/math/vec_3f.h" +#include <hpp/fcl/ccd/interval.h> +#include <hpp/fcl/math/vec_3f.h> namespace fcl { diff --git a/include/fcl/ccd/motion.h b/include/hpp/fcl/ccd/motion.h similarity index 99% rename from include/fcl/ccd/motion.h rename to include/hpp/fcl/ccd/motion.h index b640d6cf..c54d3398 100644 --- a/include/fcl/ccd/motion.h +++ b/include/hpp/fcl/ccd/motion.h @@ -39,8 +39,8 @@ #ifndef FCL_CCD_MOTION_H #define FCL_CCD_MOTION_H -#include "fcl/ccd/motion_base.h" -#include "fcl/intersect.h" +#include <hpp/fcl/ccd/motion_base.h> +#include <hpp/fcl/intersect.h> #include <iostream> #include <vector> diff --git a/include/fcl/ccd/motion_base.h b/include/hpp/fcl/ccd/motion_base.h similarity index 97% rename from include/fcl/ccd/motion_base.h rename to include/hpp/fcl/ccd/motion_base.h index b675a3bd..500888e6 100644 --- a/include/fcl/ccd/motion_base.h +++ b/include/hpp/fcl/ccd/motion_base.h @@ -40,10 +40,10 @@ #define FCL_CCD_MOTION_BASE_H -#include "fcl/math/transform.h" -#include "fcl/ccd/taylor_matrix.h" -#include "fcl/ccd/taylor_vector.h" -#include "fcl/BV/RSS.h" +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/ccd/taylor_matrix.h> +#include <hpp/fcl/ccd/taylor_vector.h> +#include <hpp/fcl/BV/RSS.h> namespace fcl { diff --git a/include/fcl/ccd/simplex.h b/include/hpp/fcl/ccd/simplex.h similarity index 100% rename from include/fcl/ccd/simplex.h rename to include/hpp/fcl/ccd/simplex.h diff --git a/include/fcl/ccd/support.h b/include/hpp/fcl/ccd/support.h similarity index 100% rename from include/fcl/ccd/support.h rename to include/hpp/fcl/ccd/support.h diff --git a/include/fcl/ccd/taylor_matrix.h b/include/hpp/fcl/ccd/taylor_matrix.h similarity index 97% rename from include/fcl/ccd/taylor_matrix.h rename to include/hpp/fcl/ccd/taylor_matrix.h index a27435b7..18819387 100644 --- a/include/fcl/ccd/taylor_matrix.h +++ b/include/hpp/fcl/ccd/taylor_matrix.h @@ -39,9 +39,9 @@ #define FCL_CCD_TAYLOR_MATRIX_H -#include "fcl/math/matrix_3f.h" -#include "fcl/ccd/taylor_vector.h" -#include "fcl/ccd/interval_matrix.h" +#include <hpp/fcl/math/matrix_3f.h> +#include <hpp/fcl/ccd/taylor_vector.h> +#include <hpp/fcl/ccd/interval_matrix.h> namespace fcl { diff --git a/include/fcl/ccd/taylor_model.h b/include/hpp/fcl/ccd/taylor_model.h similarity index 99% rename from include/fcl/ccd/taylor_model.h rename to include/hpp/fcl/ccd/taylor_model.h index b53b0140..418de73f 100644 --- a/include/fcl/ccd/taylor_model.h +++ b/include/hpp/fcl/ccd/taylor_model.h @@ -38,7 +38,7 @@ #ifndef FCL_CCD_TAYLOR_MODEL_H #define FCL_CCD_TAYLOR_MODEL_H -#include "fcl/ccd/interval.h" +#include <hpp/fcl/ccd/interval.h> #include <boost/shared_ptr.hpp> namespace fcl diff --git a/include/fcl/ccd/taylor_vector.h b/include/hpp/fcl/ccd/taylor_vector.h similarity index 98% rename from include/fcl/ccd/taylor_vector.h rename to include/hpp/fcl/ccd/taylor_vector.h index 52a68db2..a17c262a 100644 --- a/include/fcl/ccd/taylor_vector.h +++ b/include/hpp/fcl/ccd/taylor_vector.h @@ -38,8 +38,8 @@ #ifndef FCL_CCD_TAYLOR_VECTOR_H #define FCL_CCD_TAYLOR_VECTOR_H -#include "fcl/ccd/interval_vector.h" -#include "fcl/ccd/taylor_model.h" +#include <hpp/fcl/ccd/interval_vector.h> +#include <hpp/fcl/ccd/taylor_model.h> namespace fcl { diff --git a/include/fcl/collision.h b/include/hpp/fcl/collision.h similarity index 96% rename from include/fcl/collision.h rename to include/hpp/fcl/collision.h index e8a1237c..b69ef3b5 100644 --- a/include/fcl/collision.h +++ b/include/hpp/fcl/collision.h @@ -39,9 +39,9 @@ #ifndef FCL_COLLISION_H #define FCL_COLLISION_H -#include "fcl/math/vec_3f.h" -#include "fcl/collision_object.h" -#include "fcl/collision_data.h" +#include <hpp/fcl/math/vec_3f.h> +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/collision_data.h> namespace fcl { diff --git a/include/fcl/collision_data.h b/include/hpp/fcl/collision_data.h similarity index 99% rename from include/fcl/collision_data.h rename to include/hpp/fcl/collision_data.h index dcfe25f6..be3c4e6a 100644 --- a/include/fcl/collision_data.h +++ b/include/hpp/fcl/collision_data.h @@ -39,12 +39,12 @@ #ifndef FCL_COLLISION_DATA_H #define FCL_COLLISION_DATA_H -#include "fcl/collision_object.h" -#include "fcl/learning/classifier.h" -#include "fcl/knn/nearest_neighbors.h" +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/learning/classifier.h> +#include <hpp/fcl/knn/nearest_neighbors.h> -#include "fcl/math/vec_3f.h" +#include <hpp/fcl/math/vec_3f.h> #include <vector> #include <set> #include <limits> diff --git a/include/fcl/collision_func_matrix.h b/include/hpp/fcl/collision_func_matrix.h similarity index 97% rename from include/fcl/collision_func_matrix.h rename to include/hpp/fcl/collision_func_matrix.h index edbbc941..9cbaa8f2 100644 --- a/include/fcl/collision_func_matrix.h +++ b/include/hpp/fcl/collision_func_matrix.h @@ -40,8 +40,8 @@ #define FCL_COLLISION_FUNC_MATRIX_H -#include "fcl/collision_object.h" -#include "fcl/collision_data.h" +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/collision_data.h> namespace fcl { diff --git a/include/fcl/collision_node.h b/include/hpp/fcl/collision_node.h similarity index 95% rename from include/fcl/collision_node.h rename to include/hpp/fcl/collision_node.h index bc52dbb9..dddfa7f7 100644 --- a/include/fcl/collision_node.h +++ b/include/hpp/fcl/collision_node.h @@ -39,9 +39,9 @@ #ifndef FCL_COLLISION_NODE_H #define FCL_COLLISION_NODE_H -#include "fcl/traversal/traversal_node_base.h" -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/BVH/BVH_front.h" +#include <hpp/fcl/traversal/traversal_node_base.h> +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/BVH/BVH_front.h> diff --git a/include/fcl/collision_object.h b/include/hpp/fcl/collision_object.h similarity index 98% rename from include/fcl/collision_object.h rename to include/hpp/fcl/collision_object.h index 7fb13fbc..fb140008 100644 --- a/include/fcl/collision_object.h +++ b/include/hpp/fcl/collision_object.h @@ -39,10 +39,10 @@ #ifndef FCL_COLLISION_OBJECT_BASE_H #define FCL_COLLISION_OBJECT_BASE_H -#include <fcl/deprecated.h> -#include "fcl/BV/AABB.h" -#include "fcl/math/transform.h" -#include "fcl/ccd/motion_base.h" +#include <hpp/fcl/deprecated.h> +#include <hpp/fcl/BV/AABB.h> +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/ccd/motion_base.h> #include <boost/shared_ptr.hpp> namespace fcl diff --git a/include/fcl/config-fcl.hh.in b/include/hpp/fcl/config-fcl.hh.in similarity index 98% rename from include/fcl/config-fcl.hh.in rename to include/hpp/fcl/config-fcl.hh.in index d510a290..14cc27dd 100644 --- a/include/fcl/config-fcl.hh.in +++ b/include/hpp/fcl/config-fcl.hh.in @@ -35,7 +35,7 @@ #ifndef FCL_CONFIG_FCL_HH # define FCL_CONFIG_FCL_HH -# include "fcl/config.h" +# include "config.h" #cmakedefine01 FCL_HAVE_SSE #cmakedefine01 FCL_HAVE_OCTOMAP diff --git a/include/fcl/continuous_collision.h b/include/hpp/fcl/continuous_collision.h similarity index 90% rename from include/fcl/continuous_collision.h rename to include/hpp/fcl/continuous_collision.h index ef6812d0..43dd73a5 100644 --- a/include/fcl/continuous_collision.h +++ b/include/hpp/fcl/continuous_collision.h @@ -1,9 +1,9 @@ #ifndef FCL_CONTINUOUS_COLLISION_H #define FCL_CONTINUOUS_COLLISION_H -#include "fcl/math/vec_3f.h" -#include "fcl/collision_object.h" -#include "fcl/collision_data.h" +#include <hpp/fcl/math/vec_3f.h> +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/collision_data.h> namespace fcl { diff --git a/include/fcl/data_types.h b/include/hpp/fcl/data_types.h similarity index 100% rename from include/fcl/data_types.h rename to include/hpp/fcl/data_types.h diff --git a/include/fcl/deprecated.h b/include/hpp/fcl/deprecated.h similarity index 100% rename from include/fcl/deprecated.h rename to include/hpp/fcl/deprecated.h diff --git a/include/fcl/distance.h b/include/hpp/fcl/distance.h similarity index 97% rename from include/fcl/distance.h rename to include/hpp/fcl/distance.h index 4f82c8f0..d277d381 100644 --- a/include/fcl/distance.h +++ b/include/hpp/fcl/distance.h @@ -38,8 +38,8 @@ #ifndef FCL_DISTANCE_H #define FCL_DISTANCE_H -#include "fcl/collision_object.h" -#include "fcl/collision_data.h" +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/collision_data.h> namespace fcl { diff --git a/include/fcl/distance_func_matrix.h b/include/hpp/fcl/distance_func_matrix.h similarity index 97% rename from include/fcl/distance_func_matrix.h rename to include/hpp/fcl/distance_func_matrix.h index 2a190349..1f4fe3c7 100644 --- a/include/fcl/distance_func_matrix.h +++ b/include/hpp/fcl/distance_func_matrix.h @@ -38,8 +38,8 @@ #ifndef FCL_DISTANCE_FUNC_MATRIX_H #define FCL_DISTANCE_FUNC_MATRIX_H -#include "fcl/collision_object.h" -#include "fcl/collision_data.h" +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/collision_data.h> namespace fcl { diff --git a/include/fcl/doc.hh b/include/hpp/fcl/doc.hh similarity index 100% rename from include/fcl/doc.hh rename to include/hpp/fcl/doc.hh diff --git a/include/fcl/exception.h b/include/hpp/fcl/exception.h similarity index 100% rename from include/fcl/exception.h rename to include/hpp/fcl/exception.h diff --git a/include/fcl/fwd.hh b/include/hpp/fcl/fwd.hh similarity index 100% rename from include/fcl/fwd.hh rename to include/hpp/fcl/fwd.hh diff --git a/include/fcl/intersect.h b/include/hpp/fcl/intersect.h similarity index 97% rename from include/fcl/intersect.h rename to include/hpp/fcl/intersect.h index 1149d42f..7dd36318 100644 --- a/include/fcl/intersect.h +++ b/include/hpp/fcl/intersect.h @@ -38,7 +38,7 @@ #ifndef FCL_INTERSECT_H #define FCL_INTERSECT_H -#include "fcl/math/transform.h" +#include <hpp/fcl/math/transform.h> #include <boost/math/special_functions/erf.hpp> namespace fcl diff --git a/include/fcl/knn/greedy_kcenters.h b/include/hpp/fcl/knn/greedy_kcenters.h similarity index 99% rename from include/fcl/knn/greedy_kcenters.h rename to include/hpp/fcl/knn/greedy_kcenters.h index 03032776..38ea9549 100644 --- a/include/fcl/knn/greedy_kcenters.h +++ b/include/hpp/fcl/knn/greedy_kcenters.h @@ -38,7 +38,7 @@ #define FCL_KNN_GREEDY_KCENTERS_H -#include "fcl/math/sampling.h" +#include <hpp/fcl/math/sampling.h> namespace fcl { diff --git a/include/fcl/knn/nearest_neighbors.h b/include/hpp/fcl/knn/nearest_neighbors.h similarity index 100% rename from include/fcl/knn/nearest_neighbors.h rename to include/hpp/fcl/knn/nearest_neighbors.h diff --git a/include/fcl/knn/nearest_neighbors_GNAT.h b/include/hpp/fcl/knn/nearest_neighbors_GNAT.h similarity index 99% rename from include/fcl/knn/nearest_neighbors_GNAT.h rename to include/hpp/fcl/knn/nearest_neighbors_GNAT.h index e6e8196e..4d3c6ac1 100644 --- a/include/fcl/knn/nearest_neighbors_GNAT.h +++ b/include/hpp/fcl/knn/nearest_neighbors_GNAT.h @@ -37,9 +37,9 @@ #ifndef FCL_KNN_NEAREST_NEIGHBORS_GNAT_H #define FCL_KNN_NEAREST_NEIGHBORS_GNAT_H -#include "fcl/knn/nearest_neighbors.h" -#include "fcl/knn/greedy_kcenters.h" -#include "fcl/exception.h" +#include <hpp/fcl/knn/nearest_neighbors.h> +#include <hpp/fcl/knn/greedy_kcenters.h> +#include <hpp/fcl/exception.h> #include <boost/unordered_set.hpp> #include <queue> #include <algorithm> diff --git a/include/fcl/knn/nearest_neighbors_flann.h b/include/hpp/fcl/knn/nearest_neighbors_flann.h similarity index 99% rename from include/fcl/knn/nearest_neighbors_flann.h rename to include/hpp/fcl/knn/nearest_neighbors_flann.h index 328f9f99..c222c7e8 100644 --- a/include/fcl/knn/nearest_neighbors_flann.h +++ b/include/hpp/fcl/knn/nearest_neighbors_flann.h @@ -37,14 +37,14 @@ #ifndef FCL_KNN_NEAREST_NEIGHBORS_FLANN_H #define FCL_KNN_NEAREST_NEIGHBORS_FLANN_H -#include <fcl/config-fcl.hh> +#include <hpp/fcl/config-fcl.hh> #if FCL_HAVE_FLANN == 0 # error FLANN is not available. Please use a different NearestNeighbors data structure #else -#include "fcl/knn/nearest_neighbors.h" +#include <hpp/fcl/knn/nearest_neighbors.h> #include <flann/flann.hpp> -#include "fcl/exception.h" +#include <hpp/fcl/exception.h> namespace fcl { diff --git a/include/fcl/knn/nearest_neighbors_linear.h b/include/hpp/fcl/knn/nearest_neighbors_linear.h similarity index 98% rename from include/fcl/knn/nearest_neighbors_linear.h rename to include/hpp/fcl/knn/nearest_neighbors_linear.h index 04145641..bc387b09 100644 --- a/include/fcl/knn/nearest_neighbors_linear.h +++ b/include/hpp/fcl/knn/nearest_neighbors_linear.h @@ -38,8 +38,8 @@ #ifndef FCL_KNN_NEAREST_NEIGHBORS_LINEAR_H #define FCL_KNN_NEAREST_NEIGHBORS_LINEAR_H -#include "fcl/knn/nearest_neighbors.h" -#include "fcl/exception.h" +#include <hpp/fcl/knn/nearest_neighbors.h> +#include <hpp/fcl/exception.h> #include <algorithm> namespace fcl diff --git a/include/fcl/knn/nearest_neighbors_sqrtapprox.h b/include/hpp/fcl/knn/nearest_neighbors_sqrtapprox.h similarity index 98% rename from include/fcl/knn/nearest_neighbors_sqrtapprox.h rename to include/hpp/fcl/knn/nearest_neighbors_sqrtapprox.h index 00644e57..e4748b6a 100644 --- a/include/fcl/knn/nearest_neighbors_sqrtapprox.h +++ b/include/hpp/fcl/knn/nearest_neighbors_sqrtapprox.h @@ -38,8 +38,8 @@ #ifndef FCL_KNN_NEAREST_NEIGHBORS_SQRT_APPROX_H #define FCL_KNN_NEAREST_NEIGHBORS_SQRT_APPROX_H -#include "fcl/knn/nearest_neighbors_linear.h" -#include "fcl/exception.h" +#include <hpp/fcl/knn/nearest_neighbors_linear.h> +#include <hpp/fcl/exception.h> #include <algorithm> #include <cmath> diff --git a/include/fcl/learning/classifier.h b/include/hpp/fcl/learning/classifier.h similarity index 99% rename from include/fcl/learning/classifier.h rename to include/hpp/fcl/learning/classifier.h index eaf22e44..d6660e91 100644 --- a/include/fcl/learning/classifier.h +++ b/include/hpp/fcl/learning/classifier.h @@ -1,7 +1,7 @@ #ifndef FCL_LEARNING_CLASSIFIER_H #define FCL_LEARNING_CLASSIFIER_H -#include "fcl/math/vec_nf.h" +#include <hpp/fcl/math/vec_nf.h> namespace fcl { diff --git a/include/fcl/math/math_details.h b/include/hpp/fcl/math/math_details.h similarity index 100% rename from include/fcl/math/math_details.h rename to include/hpp/fcl/math/math_details.h diff --git a/include/fcl/math/matrix_3f.h b/include/hpp/fcl/math/matrix_3f.h similarity index 99% rename from include/fcl/math/matrix_3f.h rename to include/hpp/fcl/math/matrix_3f.h index 9bfec2b3..f67934e9 100644 --- a/include/fcl/math/matrix_3f.h +++ b/include/hpp/fcl/math/matrix_3f.h @@ -38,7 +38,7 @@ #ifndef FCL_MATRIX_3F_H #define FCL_MATRIX_3F_H -#include "fcl/math/vec_3f.h" +#include <hpp/fcl/math/vec_3f.h> namespace fcl { diff --git a/include/fcl/math/sampling.h b/include/hpp/fcl/math/sampling.h similarity index 99% rename from include/fcl/math/sampling.h rename to include/hpp/fcl/math/sampling.h index 29a4ce93..3af1fdd6 100644 --- a/include/fcl/math/sampling.h +++ b/include/hpp/fcl/math/sampling.h @@ -7,8 +7,8 @@ #include <boost/random/variate_generator.hpp> #include <boost/math/constants/constants.hpp> #include <boost/assign/list_of.hpp> -#include "fcl/math/vec_nf.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/math/vec_nf.h> +#include <hpp/fcl/math/transform.h> namespace fcl { diff --git a/include/fcl/math/transform.h b/include/hpp/fcl/math/transform.h similarity index 99% rename from include/fcl/math/transform.h rename to include/hpp/fcl/math/transform.h index 6fd7f01a..900053fa 100644 --- a/include/fcl/math/transform.h +++ b/include/hpp/fcl/math/transform.h @@ -39,7 +39,7 @@ #ifndef FCL_TRANSFORM_H #define FCL_TRANSFORM_H -#include "fcl/math/matrix_3f.h" +#include <hpp/fcl/math/matrix_3f.h> #include <boost/thread/mutex.hpp> namespace fcl diff --git a/include/fcl/math/vec_3f.h b/include/hpp/fcl/math/vec_3f.h similarity index 98% rename from include/fcl/math/vec_3f.h rename to include/hpp/fcl/math/vec_3f.h index 4c39e241..555d12b6 100644 --- a/include/fcl/math/vec_3f.h +++ b/include/hpp/fcl/math/vec_3f.h @@ -38,12 +38,12 @@ #ifndef FCL_VEC_3F_H #define FCL_VEC_3F_H -#include <fcl/config-fcl.hh> -#include "fcl/data_types.h" -#include "fcl/math/math_details.h" +#include <hpp/fcl/config-fcl.hh> +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/math/math_details.h> #if FCL_HAVE_SSE -# include "fcl/simd/math_simd_details.h" +#include <hpp/fcl/simd/math_simd_details.h> #endif #include <cmath> diff --git a/include/fcl/math/vec_nf.h b/include/hpp/fcl/math/vec_nf.h similarity index 99% rename from include/fcl/math/vec_nf.h rename to include/hpp/fcl/math/vec_nf.h index db3d416f..05ff8617 100644 --- a/include/fcl/math/vec_nf.h +++ b/include/hpp/fcl/math/vec_nf.h @@ -7,7 +7,7 @@ #include <vector> #include <boost/array.hpp> #include <cstdarg> -#include "fcl/data_types.h" +#include <hpp/fcl/data_types.h> namespace fcl { diff --git a/include/fcl/narrowphase/gjk.h b/include/hpp/fcl/narrowphase/gjk.h similarity index 99% rename from include/fcl/narrowphase/gjk.h rename to include/hpp/fcl/narrowphase/gjk.h index 7849a39d..51ac2684 100644 --- a/include/fcl/narrowphase/gjk.h +++ b/include/hpp/fcl/narrowphase/gjk.h @@ -38,8 +38,8 @@ #ifndef FCL_GJK_H #define FCL_GJK_H -#include "fcl/shape/geometric_shapes.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/math/transform.h> namespace fcl { diff --git a/include/fcl/narrowphase/gjk_libccd.h b/include/hpp/fcl/narrowphase/gjk_libccd.h similarity index 98% rename from include/fcl/narrowphase/gjk_libccd.h rename to include/hpp/fcl/narrowphase/gjk_libccd.h index dd3ca349..19cf2b9a 100644 --- a/include/fcl/narrowphase/gjk_libccd.h +++ b/include/hpp/fcl/narrowphase/gjk_libccd.h @@ -39,8 +39,8 @@ #ifndef FCL_GJK_LIBCCD_H #define FCL_GJK_LIBCCD_H -#include "fcl/shape/geometric_shapes.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/math/transform.h> #include <ccd/ccd.h> #include <ccd/quat.h> diff --git a/include/fcl/narrowphase/narrowphase.h b/include/hpp/fcl/narrowphase/narrowphase.h similarity index 99% rename from include/fcl/narrowphase/narrowphase.h rename to include/hpp/fcl/narrowphase/narrowphase.h index 6821ec32..84c074c6 100644 --- a/include/fcl/narrowphase/narrowphase.h +++ b/include/hpp/fcl/narrowphase/narrowphase.h @@ -38,8 +38,8 @@ #ifndef FCL_NARROWPHASE_H #define FCL_NARROWPHASE_H -#include "fcl/narrowphase/gjk.h" -#include "fcl/narrowphase/gjk_libccd.h" +#include <hpp/fcl/narrowphase/gjk.h> +#include <hpp/fcl/narrowphase/gjk_libccd.h> diff --git a/include/fcl/octree.h b/include/hpp/fcl/octree.h similarity index 99% rename from include/fcl/octree.h rename to include/hpp/fcl/octree.h index 451224e3..7f223d1c 100644 --- a/include/fcl/octree.h +++ b/include/hpp/fcl/octree.h @@ -44,8 +44,8 @@ #include <boost/array.hpp> #include <octomap/octomap.h> -#include "fcl/BV/AABB.h" -#include "fcl/collision_object.h" +#include <hpp/fcl/BV/AABB.h> +#include <hpp/fcl/collision_object.h> namespace fcl { diff --git a/include/fcl/profile.h b/include/hpp/fcl/profile.h similarity index 100% rename from include/fcl/profile.h rename to include/hpp/fcl/profile.h diff --git a/include/fcl/shape/geometric_shape_to_BVH_model.h b/include/hpp/fcl/shape/geometric_shape_to_BVH_model.h similarity index 99% rename from include/fcl/shape/geometric_shape_to_BVH_model.h rename to include/hpp/fcl/shape/geometric_shape_to_BVH_model.h index a07022b8..f7d827cb 100644 --- a/include/fcl/shape/geometric_shape_to_BVH_model.h +++ b/include/hpp/fcl/shape/geometric_shape_to_BVH_model.h @@ -39,8 +39,8 @@ #ifndef GEOMETRIC_SHAPE_TO_BVH_MODEL_H #define GEOMETRIC_SHAPE_TO_BVH_MODEL_H -#include "fcl/shape/geometric_shapes.h" -#include "fcl/BVH/BVH_model.h" +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/BVH/BVH_model.h> #include <boost/math/constants/constants.hpp> namespace fcl diff --git a/include/fcl/shape/geometric_shapes.h b/include/hpp/fcl/shape/geometric_shapes.h similarity index 99% rename from include/fcl/shape/geometric_shapes.h rename to include/hpp/fcl/shape/geometric_shapes.h index ad2fbff5..7d9322a0 100644 --- a/include/fcl/shape/geometric_shapes.h +++ b/include/hpp/fcl/shape/geometric_shapes.h @@ -39,8 +39,8 @@ #ifndef FCL_GEOMETRIC_SHAPES_H #define FCL_GEOMETRIC_SHAPES_H -#include "fcl/collision_object.h" -#include "fcl/math/vec_3f.h" +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/math/vec_3f.h> #include <string.h> namespace fcl diff --git a/include/fcl/shape/geometric_shapes_utility.h b/include/hpp/fcl/shape/geometric_shapes_utility.h similarity index 99% rename from include/fcl/shape/geometric_shapes_utility.h rename to include/hpp/fcl/shape/geometric_shapes_utility.h index 6feab73e..d6efeecc 100644 --- a/include/fcl/shape/geometric_shapes_utility.h +++ b/include/hpp/fcl/shape/geometric_shapes_utility.h @@ -40,8 +40,8 @@ #define FCL_GEOMETRIC_SHAPES_UTILITY_H #include <vector> -#include "fcl/shape/geometric_shapes.h" -#include "fcl/BV/BV.h" +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/BV/BV.h> namespace fcl { diff --git a/include/fcl/simd/math_simd_details.h b/include/hpp/fcl/simd/math_simd_details.h similarity index 99% rename from include/fcl/simd/math_simd_details.h rename to include/hpp/fcl/simd/math_simd_details.h index 01ebca04..13346b63 100644 --- a/include/fcl/simd/math_simd_details.h +++ b/include/hpp/fcl/simd/math_simd_details.h @@ -39,7 +39,7 @@ #ifndef FCL_MATH_SIMD_DETAILS_H #define FCL_MATH_SIMD_DETAILS_H -#include "fcl/data_types.h" +#include <hpp/fcl/data_types.h> #include <xmmintrin.h> #if defined (__SSE3__) diff --git a/include/fcl/simd/simd_intersect.h b/include/hpp/fcl/simd/simd_intersect.h similarity index 99% rename from include/fcl/simd/simd_intersect.h rename to include/hpp/fcl/simd/simd_intersect.h index 312fa7c1..1e94e8e5 100644 --- a/include/fcl/simd/simd_intersect.h +++ b/include/hpp/fcl/simd/simd_intersect.h @@ -38,7 +38,7 @@ #ifndef FCL_MULTIPLE_INTERSECT #define FCL_MULTIPLE_INTERSECT -#include "fcl/math/vec_3f.h" +#include <hpp/fcl/math/vec_3f.h> #include <xmmintrin.h> #include <pmmintrin.h> diff --git a/include/fcl/traversal/traversal_node_base.h b/include/hpp/fcl/traversal/traversal_node_base.h similarity index 98% rename from include/fcl/traversal/traversal_node_base.h rename to include/hpp/fcl/traversal/traversal_node_base.h index 13ad9d3e..2208b0ab 100644 --- a/include/fcl/traversal/traversal_node_base.h +++ b/include/hpp/fcl/traversal/traversal_node_base.h @@ -38,9 +38,9 @@ #ifndef FCL_TRAVERSAL_NODE_BASE_H #define FCL_TRAVERSAL_NODE_BASE_H -#include "fcl/data_types.h" -#include "fcl/math/transform.h" -#include "fcl/collision_data.h" +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/collision_data.h> namespace fcl { diff --git a/include/fcl/traversal/traversal_node_bvh_shape.h b/include/hpp/fcl/traversal/traversal_node_bvh_shape.h similarity index 99% rename from include/fcl/traversal/traversal_node_bvh_shape.h rename to include/hpp/fcl/traversal/traversal_node_bvh_shape.h index e142ce59..fe61f5f8 100644 --- a/include/fcl/traversal/traversal_node_bvh_shape.h +++ b/include/hpp/fcl/traversal/traversal_node_bvh_shape.h @@ -39,11 +39,11 @@ #ifndef FCL_TRAVERSAL_NODE_MESH_SHAPE_H #define FCL_TRAVERSAL_NODE_MESH_SHAPE_H -#include "fcl/collision_data.h" -#include "fcl/shape/geometric_shapes.h" -#include "fcl/shape/geometric_shapes_utility.h" -#include "fcl/traversal/traversal_node_base.h" -#include "fcl/BVH/BVH_model.h" +#include <hpp/fcl/collision_data.h> +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> +#include <hpp/fcl/traversal/traversal_node_base.h> +#include <hpp/fcl/BVH/BVH_model.h> namespace fcl diff --git a/include/fcl/traversal/traversal_node_bvhs.h b/include/hpp/fcl/traversal/traversal_node_bvhs.h similarity index 99% rename from include/fcl/traversal/traversal_node_bvhs.h rename to include/hpp/fcl/traversal/traversal_node_bvhs.h index 6e167d76..9b3f4efd 100644 --- a/include/fcl/traversal/traversal_node_bvhs.h +++ b/include/hpp/fcl/traversal/traversal_node_bvhs.h @@ -39,13 +39,13 @@ #ifndef FCL_TRAVERSAL_NODE_MESHES_H #define FCL_TRAVERSAL_NODE_MESHES_H -#include "fcl/collision_data.h" -#include "fcl/traversal/traversal_node_base.h" -#include "fcl/BV/BV_node.h" -#include "fcl/BV/BV.h" -#include "fcl/BVH/BVH_model.h" -#include "fcl/intersect.h" -#include "fcl/ccd/motion.h" +#include <hpp/fcl/collision_data.h> +#include <hpp/fcl/traversal/traversal_node_base.h> +#include <hpp/fcl/BV/BV_node.h> +#include <hpp/fcl/BV/BV.h> +#include <hpp/fcl/BVH/BVH_model.h> +#include <hpp/fcl/intersect.h> +#include <hpp/fcl/ccd/motion.h> #include <boost/shared_array.hpp> #include <boost/shared_ptr.hpp> diff --git a/include/fcl/traversal/traversal_node_octree.h b/include/hpp/fcl/traversal/traversal_node_octree.h similarity index 99% rename from include/fcl/traversal/traversal_node_octree.h rename to include/hpp/fcl/traversal/traversal_node_octree.h index 7606cece..331dc89f 100644 --- a/include/fcl/traversal/traversal_node_octree.h +++ b/include/hpp/fcl/traversal/traversal_node_octree.h @@ -38,12 +38,12 @@ #ifndef FCL_TRAVERSAL_NODE_OCTREE_H #define FCL_TRAVERSAL_NODE_OCTREE_H -#include "fcl/collision_data.h" -#include "fcl/traversal/traversal_node_base.h" -#include "fcl/narrowphase/narrowphase.h" -#include "fcl/shape/geometric_shapes_utility.h" -#include "fcl/octree.h" -#include "fcl/BVH/BVH_model.h" +#include <hpp/fcl/collision_data.h> +#include <hpp/fcl/traversal/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> namespace fcl { diff --git a/include/fcl/traversal/traversal_node_setup.h b/include/hpp/fcl/traversal/traversal_node_setup.h similarity index 99% rename from include/fcl/traversal/traversal_node_setup.h rename to include/hpp/fcl/traversal/traversal_node_setup.h index 26ce827c..75271c30 100644 --- a/include/fcl/traversal/traversal_node_setup.h +++ b/include/hpp/fcl/traversal/traversal_node_setup.h @@ -39,16 +39,16 @@ #ifndef FCL_TRAVERSAL_NODE_SETUP_H #define FCL_TRAVERSAL_NODE_SETUP_H -#include <fcl/config-fcl.hh> -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/traversal/traversal_node_shapes.h" -#include "fcl/traversal/traversal_node_bvh_shape.h" +#include <hpp/fcl/config-fcl.hh> +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/traversal/traversal_node_shapes.h> +#include <hpp/fcl/traversal/traversal_node_bvh_shape.h> #if FCL_HAVE_OCTOMAP -#include "fcl/traversal/traversal_node_octree.h" +#include <hpp/fcl/traversal/traversal_node_octree.h> #endif -#include "fcl/BVH/BVH_utility.h" +#include <hpp/fcl/BVH/BVH_utility.h> namespace fcl { diff --git a/include/fcl/traversal/traversal_node_shapes.h b/include/hpp/fcl/traversal/traversal_node_shapes.h similarity index 95% rename from include/fcl/traversal/traversal_node_shapes.h rename to include/hpp/fcl/traversal/traversal_node_shapes.h index 550e92a5..fccdbadf 100644 --- a/include/fcl/traversal/traversal_node_shapes.h +++ b/include/hpp/fcl/traversal/traversal_node_shapes.h @@ -39,13 +39,13 @@ #ifndef FCL_TRAVERSAL_NODE_SHAPES_H #define FCL_TRAVERSAL_NODE_SHAPES_H -#include "fcl/collision_data.h" -#include "fcl/traversal/traversal_node_base.h" -#include "fcl/narrowphase/narrowphase.h" -#include "fcl/shape/geometric_shapes_utility.h" -#include "fcl/BV/BV.h" -#include "fcl/shape/geometric_shapes_utility.h" -#include "fcl/ccd/motion.h" +#include <hpp/fcl/collision_data.h> +#include <hpp/fcl/traversal/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 <hpp/fcl/ccd/motion.h> namespace fcl { diff --git a/include/fcl/traversal/traversal_recurse.h b/include/hpp/fcl/traversal/traversal_recurse.h similarity index 96% rename from include/fcl/traversal/traversal_recurse.h rename to include/hpp/fcl/traversal/traversal_recurse.h index 0225c632..4000a930 100644 --- a/include/fcl/traversal/traversal_recurse.h +++ b/include/hpp/fcl/traversal/traversal_recurse.h @@ -39,9 +39,9 @@ #ifndef FCL_TRAVERSAL_RECURSE_H #define FCL_TRAVERSAL_RECURSE_H -#include "fcl/traversal/traversal_node_base.h" -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/BVH/BVH_front.h" +#include <hpp/fcl/traversal/traversal_node_base.h> +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/BVH/BVH_front.h> #include <queue> namespace fcl diff --git a/src/BV/AABB.cpp b/src/BV/AABB.cpp index 46048944..0f66b459 100644 --- a/src/BV/AABB.cpp +++ b/src/BV/AABB.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/BV/AABB.h" +#include <hpp/fcl/BV/AABB.h> #include <limits> #include <iostream> diff --git a/src/BV/OBB.cpp b/src/BV/OBB.cpp index d415dbdb..8fb9e8de 100644 --- a/src/BV/OBB.cpp +++ b/src/BV/OBB.cpp @@ -35,9 +35,9 @@ /** \author Jia Pan */ -#include "fcl/BV/OBB.h" -#include "fcl/BVH/BVH_utility.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/BV/OBB.h> +#include <hpp/fcl/BVH/BVH_utility.h> +#include <hpp/fcl/math/transform.h> #include <iostream> #include <limits> diff --git a/src/BV/OBBRSS.cpp b/src/BV/OBBRSS.cpp index 9d257d2c..15c2b0d6 100644 --- a/src/BV/OBBRSS.cpp +++ b/src/BV/OBBRSS.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/BV/OBBRSS.h" +#include <hpp/fcl/BV/OBBRSS.h> namespace fcl { diff --git a/src/BV/RSS.cpp b/src/BV/RSS.cpp index fc49ea3b..197fc776 100644 --- a/src/BV/RSS.cpp +++ b/src/BV/RSS.cpp @@ -35,8 +35,8 @@ /** \author Jia Pan */ -#include "fcl/BV/RSS.h" -#include "fcl/BVH/BVH_utility.h" +#include <hpp/fcl/BV/RSS.h> +#include <hpp/fcl/BVH/BVH_utility.h> #include <iostream> namespace fcl { diff --git a/src/BV/kDOP.cpp b/src/BV/kDOP.cpp index c8833276..5c6f2ddd 100644 --- a/src/BV/kDOP.cpp +++ b/src/BV/kDOP.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/BV/kDOP.h" +#include <hpp/fcl/BV/kDOP.h> #include <limits> #include <iostream> diff --git a/src/BV/kIOS.cpp b/src/BV/kIOS.cpp index 50422c5a..111aecb4 100644 --- a/src/BV/kIOS.cpp +++ b/src/BV/kIOS.cpp @@ -35,9 +35,9 @@ /** \author Jia Pan */ -#include "fcl/BV/kIOS.h" -#include "fcl/BVH/BVH_utility.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/BV/kIOS.h> +#include <hpp/fcl/BVH/BVH_utility.h> +#include <hpp/fcl/math/transform.h> #include <iostream> #include <limits> diff --git a/src/BVH/BVH_model.cpp b/src/BVH/BVH_model.cpp index 796ab746..1aa211b3 100644 --- a/src/BVH/BVH_model.cpp +++ b/src/BVH/BVH_model.cpp @@ -35,8 +35,8 @@ /** \author Jia Pan */ -#include "fcl/BVH/BVH_model.h" -#include "fcl/BV/BV.h" +#include <hpp/fcl/BVH/BVH_model.h> +#include <hpp/fcl/BV/BV.h> #include <iostream> #include <string.h> diff --git a/src/BVH/BVH_utility.cpp b/src/BVH/BVH_utility.cpp index 24f40b4b..0ccc22d6 100644 --- a/src/BVH/BVH_utility.cpp +++ b/src/BVH/BVH_utility.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include "fcl/BVH/BVH_utility.h" +#include <hpp/fcl/BVH/BVH_utility.h> namespace fcl { diff --git a/src/BVH/BV_fitter.cpp b/src/BVH/BV_fitter.cpp index ff92a753..5240c429 100644 --- a/src/BVH/BV_fitter.cpp +++ b/src/BVH/BV_fitter.cpp @@ -35,8 +35,8 @@ /** \author Jia Pan */ -#include "fcl/BVH/BV_fitter.h" -#include "fcl/BVH/BVH_utility.h" +#include <hpp/fcl/BVH/BV_fitter.h> +#include <hpp/fcl/BVH/BVH_utility.h> #include <limits> namespace fcl diff --git a/src/BVH/BV_splitter.cpp b/src/BVH/BV_splitter.cpp index bb423eb3..a7f53f48 100644 --- a/src/BVH/BV_splitter.cpp +++ b/src/BVH/BV_splitter.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/BVH/BV_splitter.h" +#include <hpp/fcl/BVH/BV_splitter.h> namespace fcl { diff --git a/src/articulated_model/joint.cpp b/src/articulated_model/joint.cpp index 64531230..965bd12d 100644 --- a/src/articulated_model/joint.cpp +++ b/src/articulated_model/joint.cpp @@ -35,9 +35,9 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/articulated_model/joint.h" -#include "fcl/articulated_model/link.h" -#include "fcl/articulated_model/joint_config.h" +#include <hpp/fcl/articulated_model/joint.h> +#include <hpp/fcl/articulated_model/link.h> +#include <hpp/fcl/articulated_model/joint_config.h> namespace fcl { diff --git a/src/articulated_model/joint_config.cpp b/src/articulated_model/joint_config.cpp index 9a65ff65..7c8c3b41 100644 --- a/src/articulated_model/joint_config.cpp +++ b/src/articulated_model/joint_config.cpp @@ -35,8 +35,8 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/articulated_model/joint_config.h" -#include "fcl/articulated_model/joint.h" +#include <hpp/fcl/articulated_model/joint_config.h> +#include <hpp/fcl/articulated_model/joint.h> namespace fcl { diff --git a/src/articulated_model/link.cpp b/src/articulated_model/link.cpp index c8c68df2..faf85193 100644 --- a/src/articulated_model/link.cpp +++ b/src/articulated_model/link.cpp @@ -35,9 +35,9 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/articulated_model/link.h" +#include <hpp/fcl/articulated_model/link.h> -#include "fcl/articulated_model/joint.h" +#include <hpp/fcl/articulated_model/joint.h> namespace fcl { diff --git a/src/articulated_model/model.cpp b/src/articulated_model/model.cpp index d95cc95c..906e0252 100644 --- a/src/articulated_model/model.cpp +++ b/src/articulated_model/model.cpp @@ -35,8 +35,8 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/articulated_model/model.h" -#include "fcl/articulated_model/model_config.h" +#include <hpp/fcl/articulated_model/model.h> +#include <hpp/fcl/articulated_model/model_config.h> #include <boost/assert.hpp> namespace fcl diff --git a/src/articulated_model/model_config.cpp b/src/articulated_model/model_config.cpp index 31af9628..8f72deb8 100644 --- a/src/articulated_model/model_config.cpp +++ b/src/articulated_model/model_config.cpp @@ -35,8 +35,8 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/articulated_model/model_config.h" -#include "fcl/articulated_model/joint.h" +#include <hpp/fcl/articulated_model/model_config.h> +#include <hpp/fcl/articulated_model/joint.h> #include <algorithm> // Define for boost version < 1.47 diff --git a/src/broadphase/broadphase_SSaP.cpp b/src/broadphase/broadphase_SSaP.cpp index bd420c37..a08bf5a9 100644 --- a/src/broadphase/broadphase_SSaP.cpp +++ b/src/broadphase/broadphase_SSaP.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/broadphase/broadphase_SSaP.h" +#include <hpp/fcl/broadphase/broadphase_SSaP.h> #include <algorithm> #include <limits> diff --git a/src/broadphase/broadphase_SaP.cpp b/src/broadphase/broadphase_SaP.cpp index 34667b00..e60c0a35 100644 --- a/src/broadphase/broadphase_SaP.cpp +++ b/src/broadphase/broadphase_SaP.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/broadphase/broadphase_SaP.h" +#include <hpp/fcl/broadphase/broadphase_SaP.h> #include <algorithm> #include <limits> #include <boost/bind.hpp> diff --git a/src/broadphase/broadphase_bruteforce.cpp b/src/broadphase/broadphase_bruteforce.cpp index e6e41fc8..f5eb1f6e 100644 --- a/src/broadphase/broadphase_bruteforce.cpp +++ b/src/broadphase/broadphase_bruteforce.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/broadphase/broadphase_bruteforce.h" +#include <hpp/fcl/broadphase/broadphase_bruteforce.h> #include <limits> namespace fcl diff --git a/src/broadphase/broadphase_dynamic_AABB_tree.cpp b/src/broadphase/broadphase_dynamic_AABB_tree.cpp index 1b518589..03e83ff0 100644 --- a/src/broadphase/broadphase_dynamic_AABB_tree.cpp +++ b/src/broadphase/broadphase_dynamic_AABB_tree.cpp @@ -36,10 +36,10 @@ /** \author Jia Pan */ -#include "fcl/broadphase/broadphase_dynamic_AABB_tree.h" +#include <hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h> #if FCL_HAVE_OCTOMAP -#include "fcl/octree.h" +#include <hpp/fcl/octree.h> #endif namespace fcl diff --git a/src/broadphase/broadphase_dynamic_AABB_tree_array.cpp b/src/broadphase/broadphase_dynamic_AABB_tree_array.cpp index 6f3be372..079be206 100644 --- a/src/broadphase/broadphase_dynamic_AABB_tree_array.cpp +++ b/src/broadphase/broadphase_dynamic_AABB_tree_array.cpp @@ -35,10 +35,10 @@ /** \author Jia Pan */ -#include "fcl/broadphase/broadphase_dynamic_AABB_tree_array.h" +#include <hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h> #if FCL_HAVE_OCTOMAP -#include "fcl/octree.h" +#include <hpp/fcl/octree.h> #endif namespace fcl diff --git a/src/broadphase/broadphase_interval_tree.cpp b/src/broadphase/broadphase_interval_tree.cpp index 92a36518..7c66c1f2 100644 --- a/src/broadphase/broadphase_interval_tree.cpp +++ b/src/broadphase/broadphase_interval_tree.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/broadphase/broadphase_interval_tree.h" +#include <hpp/fcl/broadphase/broadphase_interval_tree.h> #include <algorithm> #include <limits> #include <boost/bind.hpp> diff --git a/src/broadphase/broadphase_spatialhash.cpp b/src/broadphase/broadphase_spatialhash.cpp index 41cf4767..90f272a5 100644 --- a/src/broadphase/broadphase_spatialhash.cpp +++ b/src/broadphase/broadphase_spatialhash.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/broadphase/broadphase_spatialhash.h" +#include <hpp/fcl/broadphase/broadphase_spatialhash.h> namespace fcl { diff --git a/src/broadphase/hierarchy_tree.cpp b/src/broadphase/hierarchy_tree.cpp index 76df94d1..e1d48d98 100644 --- a/src/broadphase/hierarchy_tree.cpp +++ b/src/broadphase/hierarchy_tree.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/broadphase/hierarchy_tree.h" +#include <hpp/fcl/broadphase/hierarchy_tree.h> namespace fcl { diff --git a/src/broadphase/interval_tree.cpp b/src/broadphase/interval_tree.cpp index 361e2cb5..b5e84d45 100644 --- a/src/broadphase/interval_tree.cpp +++ b/src/broadphase/interval_tree.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/broadphase/interval_tree.h" +#include <hpp/fcl/broadphase/interval_tree.h> #include <iostream> #include <cstdlib> diff --git a/src/ccd/conservative_advancement.cpp b/src/ccd/conservative_advancement.cpp index c83f3de3..146cecb9 100644 --- a/src/ccd/conservative_advancement.cpp +++ b/src/ccd/conservative_advancement.cpp @@ -35,13 +35,13 @@ /** \author Jia Pan */ -#include "fcl/ccd/conservative_advancement.h" -#include "fcl/ccd/motion.h" -#include "fcl/collision_node.h" -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/traversal/traversal_node_setup.h" -#include "fcl/traversal/traversal_recurse.h" -#include "fcl/collision.h" +#include <hpp/fcl/ccd/conservative_advancement.h> +#include <hpp/fcl/ccd/motion.h> +#include <hpp/fcl/collision_node.h> +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/traversal/traversal_node_setup.h> +#include <hpp/fcl/traversal/traversal_recurse.h> +#include <hpp/fcl/collision.h> namespace fcl diff --git a/src/ccd/interpolation/interpolation.cpp b/src/ccd/interpolation/interpolation.cpp index 5f1b914b..f77a4f17 100644 --- a/src/ccd/interpolation/interpolation.cpp +++ b/src/ccd/interpolation/interpolation.cpp @@ -35,7 +35,7 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/ccd/interpolation/interpolation.h" +#include <hpp/fcl/ccd/interpolation/interpolation.h> namespace fcl { diff --git a/src/ccd/interpolation/interpolation_factory.cpp b/src/ccd/interpolation/interpolation_factory.cpp index d7586531..d09ece2c 100644 --- a/src/ccd/interpolation/interpolation_factory.cpp +++ b/src/ccd/interpolation/interpolation_factory.cpp @@ -35,8 +35,8 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/ccd/interpolation/interpolation_factory.h" -#include "fcl/ccd/interpolation/interpolation_linear.h" +#include <hpp/fcl/ccd/interpolation/interpolation_factory.h> +#include <hpp/fcl/ccd/interpolation/interpolation_linear.h> #include <boost/assert.hpp> diff --git a/src/ccd/interpolation/interpolation_linear.cpp b/src/ccd/interpolation/interpolation_linear.cpp index 45cb4b3a..3821531d 100644 --- a/src/ccd/interpolation/interpolation_linear.cpp +++ b/src/ccd/interpolation/interpolation_linear.cpp @@ -35,8 +35,8 @@ /** \author Dalibor Matura, Jia Pan */ -#include "fcl/ccd/interpolation/interpolation_linear.h" -#include "fcl/ccd/interpolation/interpolation_factory.h" +#include <hpp/fcl/ccd/interpolation/interpolation_linear.h> +#include <hpp/fcl/ccd/interpolation/interpolation_factory.h> namespace fcl { diff --git a/src/ccd/interval.cpp b/src/ccd/interval.cpp index ef3b7216..07bf68d4 100644 --- a/src/ccd/interval.cpp +++ b/src/ccd/interval.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/ccd/interval.h" +#include <hpp/fcl/ccd/interval.h> #include <iostream> namespace fcl diff --git a/src/ccd/interval_matrix.cpp b/src/ccd/interval_matrix.cpp index 4b8a3467..0c03f3bf 100644 --- a/src/ccd/interval_matrix.cpp +++ b/src/ccd/interval_matrix.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/ccd/interval_matrix.h" +#include <hpp/fcl/ccd/interval_matrix.h> #include <iostream> namespace fcl diff --git a/src/ccd/interval_vector.cpp b/src/ccd/interval_vector.cpp index 3e2c09bb..b0c8e650 100644 --- a/src/ccd/interval_vector.cpp +++ b/src/ccd/interval_vector.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/ccd/interval_vector.h" +#include <hpp/fcl/ccd/interval_vector.h> #include <iostream> namespace fcl diff --git a/src/ccd/motion.cpp b/src/ccd/motion.cpp index a08f2467..a0fb8536 100644 --- a/src/ccd/motion.cpp +++ b/src/ccd/motion.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include "fcl/ccd/motion.h" +#include <hpp/fcl/ccd/motion.h> namespace fcl { diff --git a/src/ccd/taylor_matrix.cpp b/src/ccd/taylor_matrix.cpp index b06a64ef..ecde6afd 100644 --- a/src/ccd/taylor_matrix.cpp +++ b/src/ccd/taylor_matrix.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/ccd/taylor_matrix.h" +#include <hpp/fcl/ccd/taylor_matrix.h> namespace fcl { diff --git a/src/ccd/taylor_model.cpp b/src/ccd/taylor_model.cpp index c08b39c1..b1b64468 100644 --- a/src/ccd/taylor_model.cpp +++ b/src/ccd/taylor_model.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/ccd/taylor_model.h" +#include <hpp/fcl/ccd/taylor_model.h> #include <cassert> #include <iostream> #include <cmath> diff --git a/src/ccd/taylor_vector.cpp b/src/ccd/taylor_vector.cpp index 34090179..de94c2df 100644 --- a/src/ccd/taylor_vector.cpp +++ b/src/ccd/taylor_vector.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/ccd/taylor_vector.h" +#include <hpp/fcl/ccd/taylor_vector.h> namespace fcl { diff --git a/src/collision.cpp b/src/collision.cpp index 5979fe8d..5178a45a 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -36,9 +36,9 @@ /** \author Jia Pan */ -#include "fcl/collision.h" -#include "fcl/collision_func_matrix.h" -#include "fcl/narrowphase/narrowphase.h" +#include <hpp/fcl/collision.h> +#include <hpp/fcl/collision_func_matrix.h> +#include <hpp/fcl/narrowphase/narrowphase.h> #include <iostream> diff --git a/src/collision_data.cpp b/src/collision_data.cpp index 2ba31b42..1283912d 100644 --- a/src/collision_data.cpp +++ b/src/collision_data.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/collision_data.h" +#include <hpp/fcl/collision_data.h> namespace fcl { diff --git a/src/collision_func_matrix.cpp b/src/collision_func_matrix.cpp index 6cc4853f..7e8dea63 100644 --- a/src/collision_func_matrix.cpp +++ b/src/collision_func_matrix.cpp @@ -36,11 +36,11 @@ /** \author Jia Pan */ -#include "fcl/collision_func_matrix.h" +#include <hpp/fcl/collision_func_matrix.h> -#include "fcl/traversal/traversal_node_setup.h" -#include "fcl/collision_node.h" -#include "fcl/narrowphase/narrowphase.h" +#include <hpp/fcl/traversal/traversal_node_setup.h> +#include <hpp/fcl/collision_node.h> +#include <hpp/fcl/narrowphase/narrowphase.h> #include "distance_func_matrix.h" namespace fcl diff --git a/src/collision_node.cpp b/src/collision_node.cpp index 26cbdd97..02be38e0 100644 --- a/src/collision_node.cpp +++ b/src/collision_node.cpp @@ -36,8 +36,8 @@ /** \author Jia Pan */ -#include "fcl/collision_node.h" -#include "fcl/traversal/traversal_recurse.h" +#include <hpp/fcl/collision_node.h> +#include <hpp/fcl/traversal/traversal_recurse.h> namespace fcl { diff --git a/src/continuous_collision.cpp b/src/continuous_collision.cpp index 1768eca9..c4896d59 100644 --- a/src/continuous_collision.cpp +++ b/src/continuous_collision.cpp @@ -1,11 +1,11 @@ -#include "fcl/collision.h" -#include "fcl/continuous_collision.h" -#include "fcl/ccd/motion.h" -#include "fcl/BVH/BVH_model.h" -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/traversal/traversal_node_setup.h" -#include "fcl/collision_node.h" -#include "fcl/ccd/conservative_advancement.h" +#include <hpp/fcl/collision.h> +#include <hpp/fcl/continuous_collision.h> +#include <hpp/fcl/ccd/motion.h> +#include <hpp/fcl/BVH/BVH_model.h> +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/traversal/traversal_node_setup.h> +#include <hpp/fcl/collision_node.h> +#include <hpp/fcl/ccd/conservative_advancement.h> #include <iostream> namespace fcl diff --git a/src/distance.cpp b/src/distance.cpp index 7fc6c96d..30341788 100644 --- a/src/distance.cpp +++ b/src/distance.cpp @@ -35,9 +35,9 @@ /** \author Jia Pan */ -#include "fcl/distance.h" -#include "fcl/distance_func_matrix.h" -#include "fcl/narrowphase/narrowphase.h" +#include <hpp/fcl/distance.h> +#include <hpp/fcl/distance_func_matrix.h> +#include <hpp/fcl/narrowphase/narrowphase.h> #include <iostream> diff --git a/src/distance_capsule_capsule.cpp b/src/distance_capsule_capsule.cpp index 7b88f61a..7239066a 100644 --- a/src/distance_capsule_capsule.cpp +++ b/src/distance_capsule_capsule.cpp @@ -8,8 +8,8 @@ #include <cmath> #include <limits> -#include <fcl/math/transform.h> -#include <fcl/shape/geometric_shapes.h> +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/shape/geometric_shapes.h> #include "distance_func_matrix.h" // Note that partial specialization of template functions is not allowed. diff --git a/src/distance_func_matrix.cpp b/src/distance_func_matrix.cpp index a83c114a..84a182a1 100644 --- a/src/distance_func_matrix.cpp +++ b/src/distance_func_matrix.cpp @@ -35,11 +35,11 @@ /** \author Jia Pan */ -#include "fcl/distance_func_matrix.h" +#include <hpp/fcl/distance_func_matrix.h> -#include "fcl/collision_node.h" -#include "fcl/traversal/traversal_node_setup.h" -#include "fcl/narrowphase/narrowphase.h" +#include <hpp/fcl/collision_node.h> +#include <hpp/fcl/traversal/traversal_node_setup.h> +#include <hpp/fcl/narrowphase/narrowphase.h> namespace fcl { diff --git a/src/distance_func_matrix.h b/src/distance_func_matrix.h index a4933c69..3776853c 100644 --- a/src/distance_func_matrix.h +++ b/src/distance_func_matrix.h @@ -34,7 +34,7 @@ /** \author Florent Lamiraux */ -#include <fcl/collision_data.h> +#include <hpp/fcl/collision_data.h> namespace fcl { template<typename T_SH1, typename T_SH2, typename NarrowPhaseSolver> diff --git a/src/intersect.cpp b/src/intersect.cpp index 6a08069b..10a57248 100644 --- a/src/intersect.cpp +++ b/src/intersect.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "fcl/intersect.h" +#include <hpp/fcl/intersect.h> #include <iostream> #include <limits> #include <vector> diff --git a/src/math/sampling.cpp b/src/math/sampling.cpp index 4838eda4..f8498b59 100644 --- a/src/math/sampling.cpp +++ b/src/math/sampling.cpp @@ -1,4 +1,4 @@ -#include "fcl/math/sampling.h" +#include <hpp/fcl/math/sampling.h> #include <boost/random/lagged_fibonacci.hpp> #include <boost/random/uniform_int.hpp> #include <boost/thread/mutex.hpp> diff --git a/src/math/transform.cpp b/src/math/transform.cpp index a2c20b36..c64b2666 100644 --- a/src/math/transform.cpp +++ b/src/math/transform.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include "fcl/math/transform.h" +#include <hpp/fcl/math/transform.h> #include <boost/math/constants/constants.hpp> namespace fcl diff --git a/src/narrowphase/gjk.cpp b/src/narrowphase/gjk.cpp index c880df85..8a11f832 100644 --- a/src/narrowphase/gjk.cpp +++ b/src/narrowphase/gjk.cpp @@ -35,8 +35,8 @@ /** \author Jia Pan */ -#include "fcl/narrowphase/gjk.h" -#include "fcl/intersect.h" +#include <hpp/fcl/narrowphase/gjk.h> +#include <hpp/fcl/intersect.h> namespace fcl { diff --git a/src/narrowphase/gjk_libccd.cpp b/src/narrowphase/gjk_libccd.cpp index 5f19800c..3afa4945 100644 --- a/src/narrowphase/gjk_libccd.cpp +++ b/src/narrowphase/gjk_libccd.cpp @@ -36,8 +36,8 @@ /** \author Jia Pan */ -#include "fcl/narrowphase/gjk_libccd.h" -#include "fcl/ccd/simplex.h" +#include <hpp/fcl/narrowphase/gjk_libccd.h> +#include <hpp/fcl/ccd/simplex.h> #include <ccd/vec3.h> #include <ccd/ccd.h> diff --git a/src/narrowphase/narrowphase.cpp b/src/narrowphase/narrowphase.cpp index a40799f3..56c7014f 100644 --- a/src/narrowphase/narrowphase.cpp +++ b/src/narrowphase/narrowphase.cpp @@ -35,9 +35,9 @@ /** \author Jia Pan */ -#include "fcl/narrowphase/narrowphase.h" -#include "fcl/shape/geometric_shapes_utility.h" -#include "fcl/intersect.h" +#include <hpp/fcl/narrowphase/narrowphase.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> +#include <hpp/fcl/intersect.h> #include <boost/math/constants/constants.hpp> #include <vector> diff --git a/src/profile.cpp b/src/profile.cpp index f25a8894..08009faf 100644 --- a/src/profile.cpp +++ b/src/profile.cpp @@ -36,7 +36,7 @@ /** \author Ioan Sucan */ -#include "fcl/profile.h" +#include <hpp/fcl/profile.h> fcl::tools::Profiler& fcl::tools::Profiler::Instance(void) diff --git a/src/shape/geometric_shapes.cpp b/src/shape/geometric_shapes.cpp index 5824f7c9..fc3f056f 100644 --- a/src/shape/geometric_shapes.cpp +++ b/src/shape/geometric_shapes.cpp @@ -36,8 +36,8 @@ /** \author Jia Pan */ -#include "fcl/shape/geometric_shapes.h" -#include "fcl/shape/geometric_shapes_utility.h" +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> namespace fcl { diff --git a/src/shape/geometric_shapes_utility.cpp b/src/shape/geometric_shapes_utility.cpp index 4c377294..efb09790 100644 --- a/src/shape/geometric_shapes_utility.cpp +++ b/src/shape/geometric_shapes_utility.cpp @@ -36,8 +36,8 @@ /** \author Jia Pan */ -#include "fcl/shape/geometric_shapes_utility.h" -#include "fcl/BVH/BV_fitter.h" +#include <hpp/fcl/shape/geometric_shapes_utility.h> +#include <hpp/fcl/BVH/BV_fitter.h> namespace fcl { diff --git a/src/traversal/traversal_node_base.cpp b/src/traversal/traversal_node_base.cpp index 15f3ff07..fcaeb160 100644 --- a/src/traversal/traversal_node_base.cpp +++ b/src/traversal/traversal_node_base.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include "fcl/traversal/traversal_node_base.h" +#include <hpp/fcl/traversal/traversal_node_base.h> #include <limits> namespace fcl diff --git a/src/traversal/traversal_node_bvhs.cpp b/src/traversal/traversal_node_bvhs.cpp index 337f2e07..edd316d3 100644 --- a/src/traversal/traversal_node_bvhs.cpp +++ b/src/traversal/traversal_node_bvhs.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include "fcl/traversal/traversal_node_bvhs.h" +#include <hpp/fcl/traversal/traversal_node_bvhs.h> namespace fcl { diff --git a/src/traversal/traversal_node_setup.cpp b/src/traversal/traversal_node_setup.cpp index c3d3ff55..5f31d364 100644 --- a/src/traversal/traversal_node_setup.cpp +++ b/src/traversal/traversal_node_setup.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include "fcl/traversal/traversal_node_setup.h" +#include <hpp/fcl/traversal/traversal_node_setup.h> namespace fcl { diff --git a/src/traversal/traversal_recurse.cpp b/src/traversal/traversal_recurse.cpp index 4a6f055f..fa72b346 100644 --- a/src/traversal/traversal_recurse.cpp +++ b/src/traversal/traversal_recurse.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include "fcl/traversal/traversal_recurse.h" +#include <hpp/fcl/traversal/traversal_recurse.h> namespace fcl { diff --git a/test/general_test.cpp b/test/general_test.cpp index 1b3399a0..e8edfb04 100644 --- a/test/general_test.cpp +++ b/test/general_test.cpp @@ -1,8 +1,8 @@ -#include <fcl/shape/geometric_shapes.h> -#include <fcl/shape/geometric_shapes_utility.h> -#include <fcl/narrowphase/narrowphase.h> +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> +#include <hpp/fcl/narrowphase/narrowphase.h> #include <iostream> -#include <fcl/collision.h> +#include <hpp/fcl/collision.h> #include <boost/foreach.hpp> using namespace std; diff --git a/test/libsvm_classifier.h b/test/libsvm_classifier.h index 8faeb7a9..31e81eca 100644 --- a/test/libsvm_classifier.h +++ b/test/libsvm_classifier.h @@ -1,7 +1,7 @@ #ifndef FCL_TEST_LIBSVM_CLASSIFIER_H #define FCL_TEST_LIBSVM_CLASSIFIER_H -#include "fcl/learning/classifier.h" +#include <hpp/fcl/learning/classifier.h> #include <libsvm/svm.h> namespace fcl diff --git a/test/test_fcl_box_box_distance.cpp b/test/test_fcl_box_box_distance.cpp index 67bf84dc..5fd1bea4 100644 --- a/test/test_fcl_box_box_distance.cpp +++ b/test/test_fcl_box_box_distance.cpp @@ -40,11 +40,11 @@ #include <boost/test/included/unit_test.hpp> #include <cmath> -#include <fcl/distance.h> -#include <fcl/math/transform.h> -#include <fcl/collision.h> -#include <fcl/collision_object.h> -#include <fcl/shape/geometric_shapes.h> +#include <hpp/fcl/distance.h> +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/collision.h> +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/shape/geometric_shapes.h> typedef boost::shared_ptr <fcl::CollisionGeometry> CollisionGeometryPtr_t; diff --git a/test/test_fcl_broadphase.cpp b/test/test_fcl_broadphase.cpp index d94fbbf9..6d861269 100644 --- a/test/test_fcl_broadphase.cpp +++ b/test/test_fcl_broadphase.cpp @@ -39,10 +39,10 @@ #define BOOST_TEST_MODULE "FCL_BROADPHASE" #include <boost/test/included/unit_test.hpp> -#include "fcl/config.h" -#include "fcl/broadphase/broadphase.h" -#include "fcl/shape/geometric_shape_to_BVH_model.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/config.h> +#include <hpp/fcl/broadphase/broadphase.h> +#include <hpp/fcl/shape/geometric_shape_to_BVH_model.h> +#include <hpp/fcl/math/transform.h> #include "test_fcl_utility.h" #if USE_GOOGLEHASH diff --git a/test/test_fcl_capsule_box_1.cpp b/test/test_fcl_capsule_box_1.cpp index 154409f4..b849c4e8 100644 --- a/test/test_fcl_capsule_box_1.cpp +++ b/test/test_fcl_capsule_box_1.cpp @@ -40,11 +40,11 @@ #include <boost/test/included/unit_test.hpp> #include <cmath> -#include <fcl/distance.h> -#include <fcl/math/transform.h> -#include <fcl/collision.h> -#include <fcl/collision_object.h> -#include <fcl/shape/geometric_shapes.h> +#include <hpp/fcl/distance.h> +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/collision.h> +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/shape/geometric_shapes.h> BOOST_AUTO_TEST_CASE(distance_capsule_box) { diff --git a/test/test_fcl_capsule_box_2.cpp b/test/test_fcl_capsule_box_2.cpp index 87959192..81e355bc 100644 --- a/test/test_fcl_capsule_box_2.cpp +++ b/test/test_fcl_capsule_box_2.cpp @@ -40,11 +40,11 @@ #include <boost/test/included/unit_test.hpp> #include <cmath> -#include <fcl/distance.h> -#include <fcl/math/transform.h> -#include <fcl/collision.h> -#include <fcl/collision_object.h> -#include <fcl/shape/geometric_shapes.h> +#include <hpp/fcl/distance.h> +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/collision.h> +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/shape/geometric_shapes.h> BOOST_AUTO_TEST_CASE(distance_capsule_box) { diff --git a/test/test_fcl_capsule_capsule.cpp b/test/test_fcl_capsule_capsule.cpp index 8de1f641..432e8ffe 100644 --- a/test/test_fcl_capsule_capsule.cpp +++ b/test/test_fcl_capsule_capsule.cpp @@ -41,11 +41,11 @@ #include <boost/test/included/unit_test.hpp> #include <cmath> -#include <fcl/distance.h> -#include <fcl/math/transform.h> -#include <fcl/collision.h> -#include <fcl/collision_object.h> -#include <fcl/shape/geometric_shapes.h> +#include <hpp/fcl/distance.h> +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/collision.h> +#include <hpp/fcl/collision_object.h> +#include <hpp/fcl/shape/geometric_shapes.h> using namespace fcl; typedef boost::shared_ptr <CollisionGeometry> CollisionGeometryPtr_t; diff --git a/test/test_fcl_collision.cpp b/test/test_fcl_collision.cpp index 94ea55cd..7ce96904 100644 --- a/test/test_fcl_collision.cpp +++ b/test/test_fcl_collision.cpp @@ -38,13 +38,13 @@ #define BOOST_TEST_MODULE "FCL_COLLISION" #include <boost/test/included/unit_test.hpp> -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/traversal/traversal_node_setup.h" -#include "fcl/collision_node.h" -#include "fcl/collision.h" -#include "fcl/BV/BV.h" -#include "fcl/shape/geometric_shapes.h" -#include "fcl/narrowphase/narrowphase.h" +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/traversal/traversal_node_setup.h> +#include <hpp/fcl/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 "test_fcl_utility.h" #include "fcl_resources/config.h" #include <boost/filesystem.hpp> diff --git a/test/test_fcl_distance.cpp b/test/test_fcl_distance.cpp index d58d1d0f..2ca8e032 100644 --- a/test/test_fcl_distance.cpp +++ b/test/test_fcl_distance.cpp @@ -38,9 +38,9 @@ #define BOOST_TEST_MODULE "FCL_DISTANCE" #include <boost/test/included/unit_test.hpp> -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/traversal/traversal_node_setup.h" -#include "fcl/collision_node.h" +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/traversal/traversal_node_setup.h> +#include <hpp/fcl/collision_node.h> #include "test_fcl_utility.h" #include <boost/timer.hpp> #include "fcl_resources/config.h" diff --git a/test/test_fcl_distance_lower_bound.cpp b/test/test_fcl_distance_lower_bound.cpp index 3f604748..54f6160d 100644 --- a/test/test_fcl_distance_lower_bound.cpp +++ b/test/test_fcl_distance_lower_bound.cpp @@ -36,13 +36,13 @@ # include <boost/test/included/unit_test.hpp> # include <boost/filesystem.hpp> -# include <fcl/fwd.hh> -# include <fcl/data_types.h> -# include <fcl/BV/OBBRSS.h> -# include <fcl/BVH/BVH_model.h> -# include <fcl/narrowphase/narrowphase.h> -# include <fcl/collision.h> -# include <fcl/distance.h> +#include <hpp/fcl/fwd.hh> +#include <hpp/fcl/data_types.h> +#include <hpp/fcl/BV/OBBRSS.h> +#include <hpp/fcl/BVH/BVH_model.h> +#include <hpp/fcl/narrowphase/narrowphase.h> +#include <hpp/fcl/collision.h> +#include <hpp/fcl/distance.h> # include "test_fcl_utility.h" # include "fcl_resources/config.h" diff --git a/test/test_fcl_frontlist.cpp b/test/test_fcl_frontlist.cpp index 0b880c76..12b0ab2a 100644 --- a/test/test_fcl_frontlist.cpp +++ b/test/test_fcl_frontlist.cpp @@ -39,9 +39,9 @@ #define BOOST_TEST_MODULE "FCL_FRONT_LIST" #include <boost/test/included/unit_test.hpp> -#include "fcl/traversal/traversal_node_bvhs.h" -#include "fcl/traversal/traversal_node_setup.h" -#include "fcl/collision_node.h" +#include <hpp/fcl/traversal/traversal_node_bvhs.h> +#include <hpp/fcl/traversal/traversal_node_setup.h> +#include <hpp/fcl/collision_node.h> #include "test_fcl_utility.h" #include "fcl_resources/config.h" diff --git a/test/test_fcl_geometric_shapes.cpp b/test/test_fcl_geometric_shapes.cpp index 92c30dc8..1704c661 100644 --- a/test/test_fcl_geometric_shapes.cpp +++ b/test/test_fcl_geometric_shapes.cpp @@ -39,10 +39,10 @@ #define BOOST_TEST_MODULE "FCL_GEOMETRIC_SHAPES" #include <boost/test/included/unit_test.hpp> -#include "fcl/narrowphase/narrowphase.h" -#include "fcl/collision.h" +#include <hpp/fcl/narrowphase/narrowphase.h> +#include <hpp/fcl/collision.h> #include "test_fcl_utility.h" -#include "fcl/ccd/motion.h" +#include <hpp/fcl/ccd/motion.h> #include <iostream> using namespace fcl; diff --git a/test/test_fcl_math.cpp b/test/test_fcl_math.cpp index f26cfb84..e35c21d0 100644 --- a/test/test_fcl_math.cpp +++ b/test/test_fcl_math.cpp @@ -38,12 +38,12 @@ #include <boost/test/included/unit_test.hpp> #if FCL_HAVE_SSE - #include "fcl/simd/math_simd_details.h" +#include <hpp/fcl/simd/math_simd_details.h> #endif -#include "fcl/math/vec_3f.h" -#include "fcl/math/matrix_3f.h" -#include "fcl/broadphase/morton.h" -#include "fcl/config.h" +#include <hpp/fcl/math/vec_3f.h> +#include <hpp/fcl/math/matrix_3f.h> +#include <hpp/fcl/broadphase/morton.h> +#include <hpp/fcl/config.h> using namespace fcl; diff --git a/test/test_fcl_obb.cpp b/test/test_fcl_obb.cpp index 42d173e8..47c7453a 100644 --- a/test/test_fcl_obb.cpp +++ b/test/test_fcl_obb.cpp @@ -37,7 +37,7 @@ #define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps)) #include <boost/test/included/unit_test.hpp> -#include <fcl/narrowphase/narrowphase.h> +#include <hpp/fcl/narrowphase/narrowphase.h> #include "../src/BV/OBB.h" #include "../src/distance_func_matrix.h" diff --git a/test/test_fcl_octomap.cpp b/test/test_fcl_octomap.cpp index fe826b2e..1d21e103 100644 --- a/test/test_fcl_octomap.cpp +++ b/test/test_fcl_octomap.cpp @@ -38,12 +38,12 @@ #define BOOST_TEST_MODULE "FCL_OCTOMAP" #include <boost/test/included/unit_test.hpp> -#include "fcl/config.h" -#include "fcl/octree.h" -#include "fcl/traversal/traversal_node_octree.h" -#include "fcl/broadphase/broadphase.h" -#include "fcl/shape/geometric_shape_to_BVH_model.h" -#include "fcl/math/transform.h" +#include <hpp/fcl/config.h> +#include <hpp/fcl/octree.h> +#include <hpp/fcl/traversal/traversal_node_octree.h> +#include <hpp/fcl/broadphase/broadphase.h> +#include <hpp/fcl/shape/geometric_shape_to_BVH_model.h> +#include <hpp/fcl/math/transform.h> #include "test_fcl_utility.h" #include "fcl_resources/config.h" #include <boost/filesystem.hpp> diff --git a/test/test_fcl_shape_mesh_consistency.cpp b/test/test_fcl_shape_mesh_consistency.cpp index 1cf09511..c82d6143 100644 --- a/test/test_fcl_shape_mesh_consistency.cpp +++ b/test/test_fcl_shape_mesh_consistency.cpp @@ -38,10 +38,10 @@ #define BOOST_TEST_MODULE "FCL_SHAPE_MESH_CONSISTENCY" #include <boost/test/included/unit_test.hpp> -#include "fcl/narrowphase/narrowphase.h" -#include "fcl/shape/geometric_shape_to_BVH_model.h" -#include "fcl/distance.h" -#include "fcl/collision.h" +#include <hpp/fcl/narrowphase/narrowphase.h> +#include <hpp/fcl/shape/geometric_shape_to_BVH_model.h> +#include <hpp/fcl/distance.h> +#include <hpp/fcl/collision.h> #include "test_fcl_utility.h" diff --git a/test/test_fcl_simple.cpp b/test/test_fcl_simple.cpp index 45dc3493..e3e57d4f 100644 --- a/test/test_fcl_simple.cpp +++ b/test/test_fcl_simple.cpp @@ -1,15 +1,15 @@ #define BOOST_TEST_MODULE "FCL_SIMPLE" #include <boost/test/included/unit_test.hpp> -#include "fcl/intersect.h" -#include "fcl/collision.h" -#include "fcl/BVH/BVH_model.h" +#include <hpp/fcl/intersect.h> +#include <hpp/fcl/collision.h> +#include <hpp/fcl/BVH/BVH_model.h> #include "fcl_resources/config.h" #include <boost/filesystem.hpp> #include <sstream> -#include "fcl/math/vec_nf.h" -#include "fcl/math/sampling.h" -#include "fcl/knn/nearest_neighbors_GNAT.h" +#include <hpp/fcl/math/vec_nf.h> +#include <hpp/fcl/math/sampling.h> +#include <hpp/fcl/knn/nearest_neighbors_GNAT.h> #include <boost/assign/list_of.hpp> diff --git a/test/test_fcl_sphere_capsule.cpp b/test/test_fcl_sphere_capsule.cpp index 4c040c5d..4e0763aa 100644 --- a/test/test_fcl_sphere_capsule.cpp +++ b/test/test_fcl_sphere_capsule.cpp @@ -38,9 +38,9 @@ #define BOOST_TEST_MODULE "FCL_SPHERE_CAPSULE" #include <boost/test/included/unit_test.hpp> -#include "fcl/collision.h" -#include "fcl/shape/geometric_shapes.h" -#include "fcl/narrowphase/narrowphase.h" +#include <hpp/fcl/collision.h> +#include <hpp/fcl/shape/geometric_shapes.h> +#include <hpp/fcl/narrowphase/narrowphase.h> #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/test/test_fcl_utility.cpp b/test/test_fcl_utility.cpp index 76f8e952..7f7f1723 100644 --- a/test/test_fcl_utility.cpp +++ b/test/test_fcl_utility.cpp @@ -1,7 +1,7 @@ #include "test_fcl_utility.h" -#include "fcl/collision.h" -#include "fcl/continuous_collision.h" -#include "fcl/distance.h" +#include <hpp/fcl/collision.h> +#include <hpp/fcl/continuous_collision.h> +#include <hpp/fcl/distance.h> #include <cstdio> #include <cstddef> #include <fstream> diff --git a/test/test_fcl_utility.h b/test/test_fcl_utility.h index 6d04a91a..65fd59ad 100644 --- a/test/test_fcl_utility.h +++ b/test/test_fcl_utility.h @@ -38,9 +38,9 @@ #ifndef TEST_FCL_UTILITY_H #define TEST_FCL_UTILITY_H -#include "fcl/math/transform.h" -#include "fcl/collision_data.h" -#include "fcl/collision_object.h" +#include <hpp/fcl/math/transform.h> +#include <hpp/fcl/collision_data.h> +#include <hpp/fcl/collision_object.h> #ifdef _WIN32 #define NOMINMAX // required to avoid compilation errors with Visual Studio 2010 -- GitLab