From 208ae2cfe77721b27d2a0da88dd2151e6c6679a1 Mon Sep 17 00:00:00 2001
From: jpan <jpan@253336fb-580f-4252-a368-f3cef5a2a82b>
Date: Thu, 12 Jul 2012 22:07:15 +0000
Subject: [PATCH] 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
---
 trunk/fcl/CMakeLists.txt                          | 2 +-
 trunk/fcl/include/fcl/{ => ccd}/interval.h        | 0
 trunk/fcl/include/fcl/{ => ccd}/interval_matrix.h | 4 ++--
 trunk/fcl/include/fcl/{ => ccd}/interval_vector.h | 2 +-
 trunk/fcl/include/fcl/{ => ccd}/taylor_matrix.h   | 4 ++--
 trunk/fcl/include/fcl/{ => ccd}/taylor_model.h    | 2 +-
 trunk/fcl/include/fcl/{ => ccd}/taylor_vector.h   | 4 ++--
 trunk/fcl/src/{ => ccd}/interval.cpp              | 2 +-
 trunk/fcl/src/{ => ccd}/interval_matrix.cpp       | 2 +-
 trunk/fcl/src/{ => ccd}/interval_vector.cpp       | 2 +-
 trunk/fcl/src/{ => ccd}/taylor_matrix.cpp         | 2 +-
 trunk/fcl/src/{ => ccd}/taylor_model.cpp          | 2 +-
 trunk/fcl/src/{ => ccd}/taylor_vector.cpp         | 2 +-
 trunk/fcl/src/{ => narrowphase}/gjk.cpp           | 0
 trunk/fcl/src/{ => narrowphase}/gjk_libccd.cpp    | 0
 trunk/fcl/src/{ => narrowphase}/narrowphase.cpp   | 0
 16 files changed, 15 insertions(+), 15 deletions(-)
 rename trunk/fcl/include/fcl/{ => ccd}/interval.h (100%)
 rename trunk/fcl/include/fcl/{ => ccd}/interval_matrix.h (97%)
 rename trunk/fcl/include/fcl/{ => ccd}/interval_vector.h (99%)
 rename trunk/fcl/include/fcl/{ => ccd}/taylor_matrix.h (97%)
 rename trunk/fcl/include/fcl/{ => ccd}/taylor_model.h (99%)
 rename trunk/fcl/include/fcl/{ => ccd}/taylor_vector.h (97%)
 rename trunk/fcl/src/{ => ccd}/interval.cpp (99%)
 rename trunk/fcl/src/{ => ccd}/interval_matrix.cpp (99%)
 rename trunk/fcl/src/{ => ccd}/interval_vector.cpp (99%)
 rename trunk/fcl/src/{ => ccd}/taylor_matrix.cpp (99%)
 rename trunk/fcl/src/{ => ccd}/taylor_model.cpp (99%)
 rename trunk/fcl/src/{ => ccd}/taylor_vector.cpp (99%)
 rename trunk/fcl/src/{ => narrowphase}/gjk.cpp (100%)
 rename trunk/fcl/src/{ => narrowphase}/gjk_libccd.cpp (100%)
 rename trunk/fcl/src/{ => narrowphase}/narrowphase.cpp (100%)

diff --git a/trunk/fcl/CMakeLists.txt b/trunk/fcl/CMakeLists.txt
index 3fabb869..ce9ce460 100644
--- a/trunk/fcl/CMakeLists.txt
+++ b/trunk/fcl/CMakeLists.txt
@@ -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})
 
diff --git a/trunk/fcl/include/fcl/interval.h b/trunk/fcl/include/fcl/ccd/interval.h
similarity index 100%
rename from trunk/fcl/include/fcl/interval.h
rename to trunk/fcl/include/fcl/ccd/interval.h
diff --git a/trunk/fcl/include/fcl/interval_matrix.h b/trunk/fcl/include/fcl/ccd/interval_matrix.h
similarity index 97%
rename from trunk/fcl/include/fcl/interval_matrix.h
rename to trunk/fcl/include/fcl/ccd/interval_matrix.h
index 147ad613..1c0a01a5 100644
--- a/trunk/fcl/include/fcl/interval_matrix.h
+++ b/trunk/fcl/include/fcl/ccd/interval_matrix.h
@@ -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
 {
diff --git a/trunk/fcl/include/fcl/interval_vector.h b/trunk/fcl/include/fcl/ccd/interval_vector.h
similarity index 99%
rename from trunk/fcl/include/fcl/interval_vector.h
rename to trunk/fcl/include/fcl/ccd/interval_vector.h
index 2e3d3c61..c66911fe 100644
--- a/trunk/fcl/include/fcl/interval_vector.h
+++ b/trunk/fcl/include/fcl/ccd/interval_vector.h
@@ -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
diff --git a/trunk/fcl/include/fcl/taylor_matrix.h b/trunk/fcl/include/fcl/ccd/taylor_matrix.h
similarity index 97%
rename from trunk/fcl/include/fcl/taylor_matrix.h
rename to trunk/fcl/include/fcl/ccd/taylor_matrix.h
index ef545b2b..2f4f560c 100644
--- a/trunk/fcl/include/fcl/taylor_matrix.h
+++ b/trunk/fcl/include/fcl/ccd/taylor_matrix.h
@@ -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
 {
diff --git a/trunk/fcl/include/fcl/taylor_model.h b/trunk/fcl/include/fcl/ccd/taylor_model.h
similarity index 99%
rename from trunk/fcl/include/fcl/taylor_model.h
rename to trunk/fcl/include/fcl/ccd/taylor_model.h
index 5d73c672..ff29711f 100644
--- a/trunk/fcl/include/fcl/taylor_model.h
+++ b/trunk/fcl/include/fcl/ccd/taylor_model.h
@@ -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
 {
diff --git a/trunk/fcl/include/fcl/taylor_vector.h b/trunk/fcl/include/fcl/ccd/taylor_vector.h
similarity index 97%
rename from trunk/fcl/include/fcl/taylor_vector.h
rename to trunk/fcl/include/fcl/ccd/taylor_vector.h
index 50a98e44..5ba4a8d2 100644
--- a/trunk/fcl/include/fcl/taylor_vector.h
+++ b/trunk/fcl/include/fcl/ccd/taylor_vector.h
@@ -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
 {
diff --git a/trunk/fcl/src/interval.cpp b/trunk/fcl/src/ccd/interval.cpp
similarity index 99%
rename from trunk/fcl/src/interval.cpp
rename to trunk/fcl/src/ccd/interval.cpp
index e9bde63d..86250917 100644
--- a/trunk/fcl/src/interval.cpp
+++ b/trunk/fcl/src/ccd/interval.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/interval.h"
+#include "fcl/ccd/interval.h"
 #include <iostream>
 
 namespace fcl
diff --git a/trunk/fcl/src/interval_matrix.cpp b/trunk/fcl/src/ccd/interval_matrix.cpp
similarity index 99%
rename from trunk/fcl/src/interval_matrix.cpp
rename to trunk/fcl/src/ccd/interval_matrix.cpp
index 896a5821..452e48a8 100644
--- a/trunk/fcl/src/interval_matrix.cpp
+++ b/trunk/fcl/src/ccd/interval_matrix.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/interval_matrix.h"
+#include "fcl/ccd/interval_matrix.h"
 #include <iostream>
 
 namespace fcl
diff --git a/trunk/fcl/src/interval_vector.cpp b/trunk/fcl/src/ccd/interval_vector.cpp
similarity index 99%
rename from trunk/fcl/src/interval_vector.cpp
rename to trunk/fcl/src/ccd/interval_vector.cpp
index 78f7ebe6..4c875e28 100644
--- a/trunk/fcl/src/interval_vector.cpp
+++ b/trunk/fcl/src/ccd/interval_vector.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/interval_vector.h"
+#include "fcl/ccd/interval_vector.h"
 #include <iostream>
 
 namespace fcl
diff --git a/trunk/fcl/src/taylor_matrix.cpp b/trunk/fcl/src/ccd/taylor_matrix.cpp
similarity index 99%
rename from trunk/fcl/src/taylor_matrix.cpp
rename to trunk/fcl/src/ccd/taylor_matrix.cpp
index 77801e08..264d1651 100644
--- a/trunk/fcl/src/taylor_matrix.cpp
+++ b/trunk/fcl/src/ccd/taylor_matrix.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/taylor_matrix.h"
+#include "fcl/ccd/taylor_matrix.h"
 
 namespace fcl
 {
diff --git a/trunk/fcl/src/taylor_model.cpp b/trunk/fcl/src/ccd/taylor_model.cpp
similarity index 99%
rename from trunk/fcl/src/taylor_model.cpp
rename to trunk/fcl/src/ccd/taylor_model.cpp
index 955ae050..dd2d25da 100644
--- a/trunk/fcl/src/taylor_model.cpp
+++ b/trunk/fcl/src/ccd/taylor_model.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/taylor_model.h"
+#include "fcl/ccd/taylor_model.h"
 #include <cassert>
 #include <iostream>
 #include <cmath>
diff --git a/trunk/fcl/src/taylor_vector.cpp b/trunk/fcl/src/ccd/taylor_vector.cpp
similarity index 99%
rename from trunk/fcl/src/taylor_vector.cpp
rename to trunk/fcl/src/ccd/taylor_vector.cpp
index 9d8694c4..95859ce9 100644
--- a/trunk/fcl/src/taylor_vector.cpp
+++ b/trunk/fcl/src/ccd/taylor_vector.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/taylor_vector.h"
+#include "fcl/ccd/taylor_vector.h"
 
 namespace fcl
 {
diff --git a/trunk/fcl/src/gjk.cpp b/trunk/fcl/src/narrowphase/gjk.cpp
similarity index 100%
rename from trunk/fcl/src/gjk.cpp
rename to trunk/fcl/src/narrowphase/gjk.cpp
diff --git a/trunk/fcl/src/gjk_libccd.cpp b/trunk/fcl/src/narrowphase/gjk_libccd.cpp
similarity index 100%
rename from trunk/fcl/src/gjk_libccd.cpp
rename to trunk/fcl/src/narrowphase/gjk_libccd.cpp
diff --git a/trunk/fcl/src/narrowphase.cpp b/trunk/fcl/src/narrowphase/narrowphase.cpp
similarity index 100%
rename from trunk/fcl/src/narrowphase.cpp
rename to trunk/fcl/src/narrowphase/narrowphase.cpp
-- 
GitLab