From a7b89213593ed37749ff35945e63a0fdb90d3b11 Mon Sep 17 00:00:00 2001 From: Lucile Remigy <lucile.remigy@epitech.eu> Date: Fri, 8 Nov 2019 15:07:37 +0100 Subject: [PATCH] correction internal file --- {src/BVH => include/hpp/fcl/internal}/BV_splitter.h | 0 include/hpp/fcl/internal/traversal_node_bvh_shape.h | 2 +- include/hpp/fcl/internal/traversal_node_octree.h | 2 +- include/hpp/fcl/internal/traversal_node_shapes.h | 2 +- include/hpp/fcl/{internal => shape}/geometric_shapes_utility.h | 0 src/BVH/BVH_model.cpp | 2 +- src/BVH/BVH_utility.cpp | 2 +- src/BVH/BV_splitter.cpp | 2 +- src/collision_func_matrix.cpp | 2 +- src/distance_func_matrix.cpp | 2 +- src/narrowphase/narrowphase.cpp | 2 +- src/shape/geometric_shapes.cpp | 2 +- src/shape/geometric_shapes_utility.cpp | 2 +- {include/hpp/fcl/internal => src}/traits_traversal.h | 0 test/benchmark.cpp | 2 +- test/collision.cpp | 2 +- test/distance.cpp | 2 +- test/frontlist.cpp | 2 +- test/general_test.cpp | 2 +- test/octree.cpp | 2 +- 20 files changed, 17 insertions(+), 17 deletions(-) rename {src/BVH => include/hpp/fcl/internal}/BV_splitter.h (100%) rename include/hpp/fcl/{internal => shape}/geometric_shapes_utility.h (100%) rename {include/hpp/fcl/internal => src}/traits_traversal.h (100%) diff --git a/src/BVH/BV_splitter.h b/include/hpp/fcl/internal/BV_splitter.h similarity index 100% rename from src/BVH/BV_splitter.h rename to include/hpp/fcl/internal/BV_splitter.h diff --git a/include/hpp/fcl/internal/traversal_node_bvh_shape.h b/include/hpp/fcl/internal/traversal_node_bvh_shape.h index 7a66586a..37162e5c 100644 --- a/include/hpp/fcl/internal/traversal_node_bvh_shape.h +++ b/include/hpp/fcl/internal/traversal_node_bvh_shape.h @@ -44,7 +44,7 @@ #include <hpp/fcl/collision_data.h> #include <hpp/fcl/shape/geometric_shapes.h> #include <hpp/fcl/narrowphase/narrowphase.h> -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> #include <hpp/fcl/internal/traversal_node_base.h> #include <hpp/fcl/internal/traversal.h> #include <hpp/fcl/BVH/BVH_model.h> diff --git a/include/hpp/fcl/internal/traversal_node_octree.h b/include/hpp/fcl/internal/traversal_node_octree.h index 7569a023..e2857da2 100644 --- a/include/hpp/fcl/internal/traversal_node_octree.h +++ b/include/hpp/fcl/internal/traversal_node_octree.h @@ -45,7 +45,7 @@ #include <hpp/fcl/narrowphase/narrowphase.h> #include <hpp/fcl/octree.h> #include <hpp/fcl/BVH/BVH_model.h> -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> namespace hpp { diff --git a/include/hpp/fcl/internal/traversal_node_shapes.h b/include/hpp/fcl/internal/traversal_node_shapes.h index 3a1ba178..eff6de32 100644 --- a/include/hpp/fcl/internal/traversal_node_shapes.h +++ b/include/hpp/fcl/internal/traversal_node_shapes.h @@ -43,7 +43,7 @@ #include <hpp/fcl/collision_data.h> #include <hpp/fcl/narrowphase/narrowphase.h> #include <hpp/fcl/BV/BV.h> -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> #include <hpp/fcl/internal/traversal_node_base.h> namespace hpp diff --git a/include/hpp/fcl/internal/geometric_shapes_utility.h b/include/hpp/fcl/shape/geometric_shapes_utility.h similarity index 100% rename from include/hpp/fcl/internal/geometric_shapes_utility.h rename to include/hpp/fcl/shape/geometric_shapes_utility.h diff --git a/src/BVH/BVH_model.cpp b/src/BVH/BVH_model.cpp index 86523a18..a56cf1ac 100644 --- a/src/BVH/BVH_model.cpp +++ b/src/BVH/BVH_model.cpp @@ -43,7 +43,7 @@ #include <hpp/fcl/BV/BV.h> #include <hpp/fcl/shape/convex.h> -#include "BV_splitter.h" +#include <hpp/fcl/internal/BV_splitter.h> #include <hpp/fcl/internal/BV_fitter.h> namespace hpp diff --git a/src/BVH/BVH_utility.cpp b/src/BVH/BVH_utility.cpp index 171dd170..c408fc61 100644 --- a/src/BVH/BVH_utility.cpp +++ b/src/BVH/BVH_utility.cpp @@ -38,7 +38,7 @@ #include <hpp/fcl/BVH/BVH_utility.h> #include <hpp/fcl/narrowphase/narrowphase.h> -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> namespace hpp { diff --git a/src/BVH/BV_splitter.cpp b/src/BVH/BV_splitter.cpp index c709ed63..bb5ac2e8 100644 --- a/src/BVH/BV_splitter.cpp +++ b/src/BVH/BV_splitter.cpp @@ -35,7 +35,7 @@ /** \author Jia Pan */ -#include "BV_splitter.h" +#include <hpp/fcl/internal/BV_splitter.h> namespace hpp { diff --git a/src/collision_func_matrix.cpp b/src/collision_func_matrix.cpp index 33c92250..efffb50c 100644 --- a/src/collision_func_matrix.cpp +++ b/src/collision_func_matrix.cpp @@ -42,7 +42,7 @@ #include <../src/collision_node.h> #include <hpp/fcl/narrowphase/narrowphase.h> #include <../src/distance_func_matrix.h> -#include <hpp/fcl/internal/traits_traversal.h> +#include <../src/traits_traversal.h> namespace hpp { diff --git a/src/distance_func_matrix.cpp b/src/distance_func_matrix.cpp index 11cd679b..7eb6e612 100644 --- a/src/distance_func_matrix.cpp +++ b/src/distance_func_matrix.cpp @@ -39,7 +39,7 @@ #include <../src/collision_node.h> #include <hpp/fcl/internal/traversal_node_setup.h> -#include <hpp/fcl/internal/traits_traversal.h> +#include <../src/traits_traversal.h> namespace hpp { diff --git a/src/narrowphase/narrowphase.cpp b/src/narrowphase/narrowphase.cpp index 03068fcb..829855fb 100644 --- a/src/narrowphase/narrowphase.cpp +++ b/src/narrowphase/narrowphase.cpp @@ -40,7 +40,7 @@ #include <vector> #include <boost/math/constants/constants.hpp> -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> #include <hpp/fcl/internal/intersect.h> #include "details.h" diff --git a/src/shape/geometric_shapes.cpp b/src/shape/geometric_shapes.cpp index b53651d1..ddf0cb4f 100644 --- a/src/shape/geometric_shapes.cpp +++ b/src/shape/geometric_shapes.cpp @@ -37,7 +37,7 @@ #include <hpp/fcl/shape/geometric_shapes.h> -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> namespace hpp { diff --git a/src/shape/geometric_shapes_utility.cpp b/src/shape/geometric_shapes_utility.cpp index 2f233c82..c70049c9 100644 --- a/src/shape/geometric_shapes_utility.cpp +++ b/src/shape/geometric_shapes_utility.cpp @@ -36,7 +36,7 @@ /** \author Jia Pan */ -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> #include <hpp/fcl/internal/BV_fitter.h> #include <hpp/fcl/internal/tools.h> diff --git a/include/hpp/fcl/internal/traits_traversal.h b/src/traits_traversal.h similarity index 100% rename from include/hpp/fcl/internal/traits_traversal.h rename to src/traits_traversal.h diff --git a/test/benchmark.cpp b/test/benchmark.cpp index 42d6126f..2b120ad0 100644 --- a/test/benchmark.cpp +++ b/test/benchmark.cpp @@ -19,7 +19,7 @@ #include <hpp/fcl/internal/traversal_node_setup.h> #include <hpp/fcl/internal/traversal_node_bvhs.h> #include "../src/collision_node.h" -#include "../src/BVH/BV_splitter.h" +#include <hpp/fcl/internal/BV_splitter.h> #include "utility.h" #include "fcl_resources/config.h" diff --git a/test/collision.cpp b/test/collision.cpp index 0a2cd80d..178a7612 100644 --- a/test/collision.cpp +++ b/test/collision.cpp @@ -56,7 +56,7 @@ #include <hpp/fcl/internal/traversal_node_bvhs.h> #include <hpp/fcl/internal/traversal_node_setup.h> #include "../src/collision_node.h" -#include "../src/BVH/BV_splitter.h" +#include <hpp/fcl/internal/BV_splitter.h> #include "utility.h" #include "fcl_resources/config.h" diff --git a/test/distance.cpp b/test/distance.cpp index 27944c2a..dc4c2489 100644 --- a/test/distance.cpp +++ b/test/distance.cpp @@ -45,7 +45,7 @@ #include <hpp/fcl/internal/traversal_node_bvhs.h> #include <hpp/fcl/internal/traversal_node_setup.h> #include "../src/collision_node.h" -#include "../src/BVH/BV_splitter.h" +#include <hpp/fcl/internal/BV_splitter.h> #include "utility.h" #include "fcl_resources/config.h" diff --git a/test/frontlist.cpp b/test/frontlist.cpp index 119f4822..c46aca48 100644 --- a/test/frontlist.cpp +++ b/test/frontlist.cpp @@ -44,7 +44,7 @@ #include <hpp/fcl/internal/traversal_node_bvhs.h> #include <hpp/fcl/internal/traversal_node_setup.h> #include <../src/collision_node.h> -#include <../src/BVH/BV_splitter.h> +#include <hpp/fcl/internal/BV_splitter.h> #include "utility.h" #include "fcl_resources/config.h" diff --git a/test/general_test.cpp b/test/general_test.cpp index 11c9186c..144eb5fc 100644 --- a/test/general_test.cpp +++ b/test/general_test.cpp @@ -1,5 +1,5 @@ #include <hpp/fcl/shape/geometric_shapes.h> -#include <hpp/fcl/internal/geometric_shapes_utility.h> +#include <hpp/fcl/shape/geometric_shapes_utility.h> #include <hpp/fcl/narrowphase/narrowphase.h> #include <iostream> #include <hpp/fcl/collision.h> diff --git a/test/octree.cpp b/test/octree.cpp index 406339dc..5632a496 100644 --- a/test/octree.cpp +++ b/test/octree.cpp @@ -44,7 +44,7 @@ #include <hpp/fcl/collision.h> #include <hpp/fcl/distance.h> #include <hpp/fcl/shape/geometric_shapes.h> -#include "../src/BVH/BV_splitter.h" +#include <hpp/fcl/internal/BV_splitter.h> #include "utility.h" #include "fcl_resources/config.h" -- GitLab