Commit 208ae2cf authored by jpan's avatar jpan
Browse files

change the code structure, make a folder for ccd


git-svn-id: https://kforge.ros.org/fcl/fcl_ros@126 253336fb-580f-4252-a368-f3cef5a2a82b
parent 8add7f84
......@@ -37,7 +37,7 @@ link_directories(${CCD_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/traversal_node_base.cpp src/traversal_node_bvhs.cpp src/intersect.cpp src/motion.cpp src/BV_fitter.cpp src/BV_splitter.cpp src/BVH_model.cpp src/BVH_utility.cpp src/transform.cpp src/simple_setup.cpp src/geometric_shapes.cpp src/geometric_shapes_utility.cpp src/gjk_libccd.cpp src/collision_node.cpp src/traversal_recurse.cpp src/broad_phase_collision.cpp src/collision.cpp src/collision_func_matrix.cpp src/interval_tree.cpp src/conservative_advancement.cpp src/matrix_3f.cpp src/interval.cpp src/interval_vector.cpp src/interval_matrix.cpp src/taylor_model.cpp src/taylor_vector.cpp src/taylor_matrix.cpp src/distance_func_matrix.cpp src/distance.cpp src/gjk.cpp src/narrowphase.cpp src/hierarchy_tree.cpp src/profile.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/traversal_node_base.cpp src/traversal_node_bvhs.cpp src/intersect.cpp src/motion.cpp src/BV_fitter.cpp src/BV_splitter.cpp src/BVH_model.cpp src/BVH_utility.cpp src/transform.cpp src/simple_setup.cpp src/geometric_shapes.cpp src/geometric_shapes_utility.cpp src/collision_node.cpp src/traversal_recurse.cpp src/broad_phase_collision.cpp src/collision.cpp src/collision_func_matrix.cpp src/interval_tree.cpp src/conservative_advancement.cpp src/matrix_3f.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/hierarchy_tree.cpp src/profile.cpp)
target_link_libraries(${PROJECT_NAME} ${FLANN_LIBRARIES} ${CCD_LIBRARIES})
......
......@@ -38,9 +38,9 @@
#ifndef FCL_INTERVAL_MATRIX_H
#define FCL_INTERVAL_MATRIX_H
#include "fcl/interval.h"
#include "fcl/ccd/interval.h"
#include "fcl/ccd/interval_vector.h"
#include "fcl/matrix_3f.h"
#include "fcl/interval_vector.h"
namespace fcl
{
......
......@@ -38,7 +38,7 @@
#ifndef FCL_INTERVAL_VECTOR_H
#define FCL_INTERVAL_VECTOR_H
#include "fcl/interval.h"
#include "fcl/ccd/interval.h"
#include "fcl/vec_3f.h"
namespace fcl
......
......@@ -39,8 +39,8 @@
#include "fcl/matrix_3f.h"
#include "fcl/taylor_vector.h"
#include "fcl/interval_matrix.h"
#include "fcl/ccd/taylor_vector.h"
#include "fcl/ccd/interval_matrix.h"
namespace fcl
{
......
......@@ -37,7 +37,7 @@
#ifndef FCL_TAYLOR_MODEL_H
#define FCL_TAYLOR_MODEL_H
#include "fcl/interval.h"
#include "fcl/ccd/interval.h"
namespace fcl
{
......
......@@ -37,8 +37,8 @@
#ifndef FCL_TAYLOR_VECTOR_H
#define FCL_TAYLOR_VECTOR_H
#include "fcl/interval_vector.h"
#include "fcl/taylor_model.h"
#include "fcl/ccd/interval_vector.h"
#include "fcl/ccd/taylor_model.h"
namespace fcl
{
......
......@@ -34,7 +34,7 @@
/** \author Jia Pan */
#include "fcl/interval.h"
#include "fcl/ccd/interval.h"
#include <iostream>
namespace fcl
......
......@@ -34,7 +34,7 @@
/** \author Jia Pan */
#include "fcl/interval_matrix.h"
#include "fcl/ccd/interval_matrix.h"
#include <iostream>
namespace fcl
......
......@@ -34,7 +34,7 @@
/** \author Jia Pan */
#include "fcl/interval_vector.h"
#include "fcl/ccd/interval_vector.h"
#include <iostream>
namespace fcl
......
......@@ -34,7 +34,7 @@
/** \author Jia Pan */
#include "fcl/taylor_matrix.h"
#include "fcl/ccd/taylor_matrix.h"
namespace fcl
{
......
......@@ -34,7 +34,7 @@
/** \author Jia Pan */
#include "fcl/taylor_model.h"
#include "fcl/ccd/taylor_model.h"
#include <cassert>
#include <iostream>
#include <cmath>
......
......@@ -34,7 +34,7 @@
/** \author Jia Pan */
#include "fcl/taylor_vector.h"
#include "fcl/ccd/taylor_vector.h"
namespace fcl
{
......
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