Commit ac2776b1 authored by jpan's avatar jpan
Browse files

More reorganize of files


git-svn-id: https://kforge.ros.org/fcl/fcl_ros@153 253336fb-580f-4252-a368-f3cef5a2a82b
parent c45c79a7
......@@ -33,7 +33,7 @@ link_directories(${OCTOMAP_LIBRARY_DIRS})
add_definitions(-DUSE_SVMLIGHT=0)
add_library(${PROJECT_NAME} SHARED src/BV/AABB.cpp src/BV/OBB.cpp src/BV/RSS.cpp src/BV/kIOS.cpp src/BV/OBBRSS.cpp src/BV/kDOP.cpp src/traversal_node_base.cpp src/traversal_node_bvhs.cpp src/intersect.cpp src/ccd/motion.cpp src/BV_fitter.cpp src/BV_splitter.cpp src/BVH_model.cpp src/BVH_utility.cpp src/math/transform.cpp src/traversal_node_setup.cpp src/geometric_shapes.cpp src/geometric_shapes_utility.cpp src/collision_node.cpp src/traversal_recurse.cpp src/broadphase/broadphase_bruteforce.cpp src/broadphase/broadphase_spatialhash.cpp src/broadphase/broadphase_SaP.cpp src/broadphase/broadphase_SSaP.cpp src/broadphase/broadphase_interval_tree.cpp src/broadphase/broadphase_dynamic_AABB_tree.cpp src/broadphase/broadphase_dynamic_AABB_tree_array.cpp src/collision.cpp src/collision_func_matrix.cpp src/broadphase/interval_tree.cpp src/ccd/conservative_advancement.cpp src/ccd/interval.cpp src/ccd/interval_vector.cpp src/ccd/interval_matrix.cpp src/ccd/taylor_model.cpp src/ccd/taylor_vector.cpp src/ccd/taylor_matrix.cpp src/distance_func_matrix.cpp src/distance.cpp src/narrowphase/gjk.cpp src/narrowphase/gjk_libccd.cpp src/narrowphase/narrowphase.cpp src/broadphase/hierarchy_tree.cpp src/profile.cpp src/collision_data.cpp)
add_library(${PROJECT_NAME} SHARED src/BV/AABB.cpp src/BV/OBB.cpp src/BV/RSS.cpp src/BV/kIOS.cpp src/BV/OBBRSS.cpp src/BV/kDOP.cpp src/traversal/traversal_node_base.cpp src/traversal/traversal_node_bvhs.cpp src/intersect.cpp src/ccd/motion.cpp src/BVH/BV_fitter.cpp src/BVH/BV_splitter.cpp src/BVH/BVH_model.cpp src/BVH/BVH_utility.cpp src/math/transform.cpp src/traversal/traversal_node_setup.cpp src/shape/geometric_shapes.cpp src/shape/geometric_shapes_utility.cpp src/collision_node.cpp src/traversal/traversal_recurse.cpp src/broadphase/broadphase_bruteforce.cpp src/broadphase/broadphase_spatialhash.cpp src/broadphase/broadphase_SaP.cpp src/broadphase/broadphase_SSaP.cpp src/broadphase/broadphase_interval_tree.cpp src/broadphase/broadphase_dynamic_AABB_tree.cpp src/broadphase/broadphase_dynamic_AABB_tree_array.cpp src/collision.cpp src/collision_func_matrix.cpp src/broadphase/interval_tree.cpp src/ccd/conservative_advancement.cpp src/ccd/interval.cpp src/ccd/interval_vector.cpp src/ccd/interval_matrix.cpp src/ccd/taylor_model.cpp src/ccd/taylor_vector.cpp src/ccd/taylor_matrix.cpp src/distance_func_matrix.cpp src/distance.cpp src/narrowphase/gjk.cpp src/narrowphase/gjk_libccd.cpp src/narrowphase/narrowphase.cpp src/broadphase/hierarchy_tree.cpp src/profile.cpp src/collision_data.cpp)
target_link_libraries(${PROJECT_NAME} ${CCD_LIBRARIES} ${OCTOMAP_LIBRARIES})
......
......@@ -38,7 +38,6 @@
#define FCL_AABB_H
#include "fcl/BVH_internal.h"
#include "fcl/math/vec_3f.h"
namespace fcl
......
......@@ -41,7 +41,7 @@
#include "fcl/math/vec_3f.h"
#include "fcl/math/matrix_3f.h"
#include "fcl/BV.h"
#include "fcl/BV/BV.h"
#include <iostream>
namespace fcl
......
......@@ -37,7 +37,7 @@
#ifndef FCL_OBB_H
#define FCL_OBB_H
#include "fcl/BVH_internal.h"
#include "fcl/math/vec_3f.h"
#include "fcl/math/matrix_3f.h"
......
......@@ -37,9 +37,7 @@
#ifndef FCL_OBBRSS_H
#define FCL_OBBRSS_H
#include "fcl/BVH_internal.h"
#include "fcl/math/vec_3f.h"
#include "fcl/math/matrix_3f.h"
#include "fcl/BV/OBB.h"
#include "fcl/BV/RSS.h"
......
......@@ -37,7 +37,7 @@
#ifndef FCL_RSS_H
#define FCL_RSS_H
#include "fcl/BVH_internal.h"
#include "fcl/math/vec_3f.h"
#include "fcl/math/matrix_3f.h"
#include <boost/math/constants/constants.hpp>
......
......@@ -37,7 +37,7 @@
#ifndef FCL_KDOP_H
#define FCL_KDOP_H
#include "fcl/BVH_internal.h"
#include "fcl/math/vec_3f.h"
namespace fcl
......
......@@ -38,11 +38,10 @@
#define FCL_BVH_MODEL_H
#include "fcl/collision_object.h"
#include "fcl/BVH_internal.h"
#include "fcl/BV.h"
#include "fcl/BV_node.h"
#include "fcl/BV_splitter.h"
#include "fcl/BV_fitter.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 <vector>
#include <boost/shared_ptr.hpp>
......
......@@ -38,7 +38,7 @@
#ifndef FCL_BVH_UTILITY_H
#define FCL_BVH_UTILITY_H
#include "fcl/BVH_model.h"
#include "fcl/BVH/BVH_model.h"
namespace fcl
......
......@@ -38,8 +38,7 @@
#ifndef FCL_BV_FITTER_H
#define FCL_BV_FITTER_H
#include "fcl/BVH_internal.h"
#include "fcl/data_types.h"
#include "fcl/BVH/BVH_internal.h"
#include "fcl/BV/kIOS.h"
#include "fcl/BV/OBBRSS.h"
#include <iostream>
......
......@@ -37,11 +37,7 @@
#ifndef FCL_BV_SPLITTER_H
#define FCL_BV_SPLITTER_H
#include "fcl/BVH_internal.h"
#include "fcl/data_types.h"
#include "fcl/BV/OBB.h"
#include "fcl/BV/RSS.h"
#include "fcl/BVH/BVH_internal.h"
#include "fcl/BV/kIOS.h"
#include "fcl/BV/OBBRSS.h"
#include <vector>
......
......@@ -41,8 +41,8 @@
#include "fcl/broadphase/broadphase.h"
#include "fcl/broadphase/hierarchy_tree.h"
#include "fcl/octree.h"
#include "fcl/BV.h"
#include "fcl/geometric_shapes_utility.h"
#include "fcl/BV/BV.h"
#include "fcl/shape/geometric_shapes_utility.h"
#include <boost/unordered_map.hpp>
#include <boost/bind.hpp>
#include <limits>
......
......@@ -40,8 +40,8 @@
#include "fcl/broadphase/broadphase.h"
#include "fcl/broadphase/hierarchy_tree.h"
#include "fcl/octree.h"
#include "fcl/BV.h"
#include "fcl/geometric_shapes_utility.h"
#include "fcl/BV/BV.h"
#include "fcl/shape/geometric_shapes_utility.h"
#include <boost/unordered_map.hpp>
#include <boost/bind.hpp>
#include <limits>
......
......@@ -38,8 +38,7 @@
#ifndef FCL_INTERVAL_H
#define FCL_INTERVAL_H
#include "fcl/BVH_internal.h"
#include <cstdlib>
#include "fcl/data_types.h"
namespace fcl
{
......
......@@ -38,9 +38,9 @@
#ifndef FCL_COLLISION_NODE_H
#define FCL_COLLISION_NODE_H
#include "fcl/traversal_node_base.h"
#include "fcl/traversal_node_bvhs.h"
#include "fcl/BVH_front.h"
#include "fcl/traversal/traversal_node_base.h"
#include "fcl/traversal/traversal_node_bvhs.h"
#include "fcl/BVH/BVH_front.h"
......
......@@ -38,9 +38,6 @@
#define FCL_INTERSECT_H
#include "fcl/math/transform.h"
#include "fcl/BVH_internal.h"
#include "fcl/data_types.h"
namespace fcl
{
......
......@@ -37,7 +37,7 @@
#ifndef FCL_VEC_3F_H
#define FCL_VEC_3F_H
#include "fcl/BVH_internal.h"
#include "fcl/data_types.h"
#include "fcl/math/math_details.h"
#include "fcl/simd/math_simd_details.h"
#include <cmath>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment