From b46274307c9b1443fad3cb91896a091ad4df26f9 Mon Sep 17 00:00:00 2001
From: jpan <jpan@253336fb-580f-4252-a368-f3cef5a2a82b>
Date: Thu, 7 Jun 2012 19:14:40 +0000
Subject: [PATCH] git-svn-id: https://kforge.ros.org/fcl/fcl_ros@94
 253336fb-580f-4252-a368-f3cef5a2a82b

---
 trunk/fcl/CMakeLists.txt                      |  2 +-
 trunk/fcl/include/fcl/BV.h                    | 10 ++++++----
 trunk/fcl/include/fcl/{ => BV}/AABB.h         |  0
 trunk/fcl/include/fcl/{ => BV}/OBB.h          |  0
 trunk/fcl/include/fcl/{ => BV}/OBBRSS.h       |  0
 trunk/fcl/include/fcl/{ => BV}/RSS.h          |  0
 trunk/fcl/include/fcl/{ => BV}/kDOP.h         |  0
 trunk/fcl/include/fcl/{ => BV}/kIOS.h         |  2 +-
 trunk/fcl/include/fcl/BV_fitter.h             |  8 ++++----
 trunk/fcl/include/fcl/BV_node.h               |  4 ++--
 trunk/fcl/include/fcl/BV_splitter.h           |  8 ++++----
 trunk/fcl/include/fcl/broad_phase_collision.h |  2 +-
 trunk/fcl/include/fcl/collision_object.h      |  2 +-
 trunk/fcl/include/fcl/motion.h                |  2 +-
 trunk/fcl/include/fcl/motion_base.h           |  2 +-
 trunk/fcl/include/fcl/vec_3f.h                |  1 -
 trunk/fcl/src/{ => BV}/AABB.cpp               |  2 +-
 trunk/fcl/src/{ => BV}/OBB.cpp                |  2 +-
 trunk/fcl/src/{ => BV}/RSS.cpp                |  2 +-
 trunk/fcl/src/{ => BV}/kIOS.cpp               |  2 +-
 20 files changed, 26 insertions(+), 25 deletions(-)
 rename trunk/fcl/include/fcl/{ => BV}/AABB.h (100%)
 rename trunk/fcl/include/fcl/{ => BV}/OBB.h (100%)
 rename trunk/fcl/include/fcl/{ => BV}/OBBRSS.h (100%)
 rename trunk/fcl/include/fcl/{ => BV}/RSS.h (100%)
 rename trunk/fcl/include/fcl/{ => BV}/kDOP.h (100%)
 rename trunk/fcl/include/fcl/{ => BV}/kIOS.h (99%)
 rename trunk/fcl/src/{ => BV}/AABB.cpp (99%)
 rename trunk/fcl/src/{ => BV}/OBB.cpp (99%)
 rename trunk/fcl/src/{ => BV}/RSS.cpp (99%)
 rename trunk/fcl/src/{ => BV}/kIOS.cpp (99%)

diff --git a/trunk/fcl/CMakeLists.txt b/trunk/fcl/CMakeLists.txt
index 1e64b34a..0a5e0a2f 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/AABB.cpp src/OBB.cpp src/RSS.cpp src/kIOS.cpp src/vec_3f.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/geometric_shapes_intersect.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)
+add_library(${PROJECT_NAME} SHARED src/BV/AABB.cpp src/BV/OBB.cpp src/BV/RSS.cpp src/BV/kIOS.cpp src/vec_3f.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/geometric_shapes_intersect.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)
 
 target_link_libraries(${PROJECT_NAME} ${FLANN_LIBRARIES} ${CCD_LIBRARIES})
 
diff --git a/trunk/fcl/include/fcl/BV.h b/trunk/fcl/include/fcl/BV.h
index 895c811e..4ae915f2 100644
--- a/trunk/fcl/include/fcl/BV.h
+++ b/trunk/fcl/include/fcl/BV.h
@@ -38,10 +38,12 @@
 #define FCL_BV_H
 
 
-#include "fcl/kDOP.h"
-#include "fcl/AABB.h"
-#include "fcl/OBB.h"
-#include "fcl/RSS.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"
 
 /** \brief Main namespace */
 namespace fcl
diff --git a/trunk/fcl/include/fcl/AABB.h b/trunk/fcl/include/fcl/BV/AABB.h
similarity index 100%
rename from trunk/fcl/include/fcl/AABB.h
rename to trunk/fcl/include/fcl/BV/AABB.h
diff --git a/trunk/fcl/include/fcl/OBB.h b/trunk/fcl/include/fcl/BV/OBB.h
similarity index 100%
rename from trunk/fcl/include/fcl/OBB.h
rename to trunk/fcl/include/fcl/BV/OBB.h
diff --git a/trunk/fcl/include/fcl/OBBRSS.h b/trunk/fcl/include/fcl/BV/OBBRSS.h
similarity index 100%
rename from trunk/fcl/include/fcl/OBBRSS.h
rename to trunk/fcl/include/fcl/BV/OBBRSS.h
diff --git a/trunk/fcl/include/fcl/RSS.h b/trunk/fcl/include/fcl/BV/RSS.h
similarity index 100%
rename from trunk/fcl/include/fcl/RSS.h
rename to trunk/fcl/include/fcl/BV/RSS.h
diff --git a/trunk/fcl/include/fcl/kDOP.h b/trunk/fcl/include/fcl/BV/kDOP.h
similarity index 100%
rename from trunk/fcl/include/fcl/kDOP.h
rename to trunk/fcl/include/fcl/BV/kDOP.h
diff --git a/trunk/fcl/include/fcl/kIOS.h b/trunk/fcl/include/fcl/BV/kIOS.h
similarity index 99%
rename from trunk/fcl/include/fcl/kIOS.h
rename to trunk/fcl/include/fcl/BV/kIOS.h
index b1903406..8532702e 100644
--- a/trunk/fcl/include/fcl/kIOS.h
+++ b/trunk/fcl/include/fcl/BV/kIOS.h
@@ -40,7 +40,7 @@
 #include "fcl/BVH_internal.h"
 #include "fcl/vec_3f.h"
 #include "fcl/matrix_3f.h"
-#include "fcl/OBB.h"
+#include "fcl/BV/OBB.h"
 
 /** \brief Main namespace */
 namespace fcl
diff --git a/trunk/fcl/include/fcl/BV_fitter.h b/trunk/fcl/include/fcl/BV_fitter.h
index dfd66e27..cd312166 100644
--- a/trunk/fcl/include/fcl/BV_fitter.h
+++ b/trunk/fcl/include/fcl/BV_fitter.h
@@ -41,10 +41,10 @@
 #include "fcl/BVH_internal.h"
 #include "fcl/primitive.h"
 #include "fcl/vec_3f.h"
-#include "fcl/OBB.h"
-#include "fcl/RSS.h"
-#include "fcl/kIOS.h"
-#include "fcl/OBBRSS.h"
+#include "fcl/BV/OBB.h"
+#include "fcl/BV/RSS.h"
+#include "fcl/BV/kIOS.h"
+#include "fcl/BV/OBBRSS.h"
 #include <iostream>
 
 /** \brief Main namespace */
diff --git a/trunk/fcl/include/fcl/BV_node.h b/trunk/fcl/include/fcl/BV_node.h
index 0058275a..bfafb835 100644
--- a/trunk/fcl/include/fcl/BV_node.h
+++ b/trunk/fcl/include/fcl/BV_node.h
@@ -41,8 +41,8 @@
 #include "fcl/vec_3f.h"
 #include "fcl/matrix_3f.h"
 
-#include "fcl/OBB.h"
-#include "fcl/RSS.h"
+#include "fcl/BV/OBB.h"
+#include "fcl/BV/RSS.h"
 
 /** \brief Main namespace */
 namespace fcl
diff --git a/trunk/fcl/include/fcl/BV_splitter.h b/trunk/fcl/include/fcl/BV_splitter.h
index 8187a513..192dfeb6 100644
--- a/trunk/fcl/include/fcl/BV_splitter.h
+++ b/trunk/fcl/include/fcl/BV_splitter.h
@@ -41,10 +41,10 @@
 #include "fcl/BVH_internal.h"
 #include "fcl/primitive.h"
 #include "fcl/vec_3f.h"
-#include "fcl/OBB.h"
-#include "fcl/RSS.h"
-#include "fcl/kIOS.h"
-#include "fcl/OBBRSS.h"
+#include "fcl/BV/OBB.h"
+#include "fcl/BV/RSS.h"
+#include "fcl/BV/kIOS.h"
+#include "fcl/BV/OBBRSS.h"
 #include <vector>
 #include <iostream>
 
diff --git a/trunk/fcl/include/fcl/broad_phase_collision.h b/trunk/fcl/include/fcl/broad_phase_collision.h
index a848866b..e52c62db 100644
--- a/trunk/fcl/include/fcl/broad_phase_collision.h
+++ b/trunk/fcl/include/fcl/broad_phase_collision.h
@@ -41,7 +41,7 @@
 
 #include "fcl/collision_object.h"
 #include "fcl/collision_data.h"
-#include "fcl/AABB.h"
+#include "fcl/BV/AABB.h"
 #include "fcl/interval_tree.h"
 #include "fcl/hash.h"
 #include <vector>
diff --git a/trunk/fcl/include/fcl/collision_object.h b/trunk/fcl/include/fcl/collision_object.h
index 8fcb56e9..eb062de6 100644
--- a/trunk/fcl/include/fcl/collision_object.h
+++ b/trunk/fcl/include/fcl/collision_object.h
@@ -38,7 +38,7 @@
 #ifndef FCL_COLLISION_OBJECT_BASE_H
 #define FCL_COLLISION_OBJECT_BASE_H
 
-#include "fcl/AABB.h"
+#include "fcl/BV/AABB.h"
 #include "fcl/transform.h"
 #include <boost/shared_ptr.hpp>
 
diff --git a/trunk/fcl/include/fcl/motion.h b/trunk/fcl/include/fcl/motion.h
index b8953e29..e8af515f 100644
--- a/trunk/fcl/include/fcl/motion.h
+++ b/trunk/fcl/include/fcl/motion.h
@@ -40,7 +40,7 @@
 
 #include "fcl/vec_3f.h"
 #include "fcl/matrix_3f.h"
-#include "fcl/RSS.h"
+#include "fcl/BV/RSS.h"
 #include "fcl/transform.h"
 #include "fcl/motion_base.h"
 #include "fcl/intersect.h"
diff --git a/trunk/fcl/include/fcl/motion_base.h b/trunk/fcl/include/fcl/motion_base.h
index 1725ab50..1b4f9443 100644
--- a/trunk/fcl/include/fcl/motion_base.h
+++ b/trunk/fcl/include/fcl/motion_base.h
@@ -41,7 +41,7 @@
 #include "fcl/vec_3f.h"
 #include "fcl/matrix_3f.h"
 #include "fcl/transform.h"
-#include "fcl/RSS.h"
+#include "fcl/BV/RSS.h"
 namespace fcl
 {
 
diff --git a/trunk/fcl/include/fcl/vec_3f.h b/trunk/fcl/include/fcl/vec_3f.h
index 35adfa02..86f79dd3 100644
--- a/trunk/fcl/include/fcl/vec_3f.h
+++ b/trunk/fcl/include/fcl/vec_3f.h
@@ -47,7 +47,6 @@
 namespace fcl
 {
 
-
 #if COLLISION_USE_SSE
 #include <xmmintrin.h>
 #include <pmmintrin.h>
diff --git a/trunk/fcl/src/AABB.cpp b/trunk/fcl/src/BV/AABB.cpp
similarity index 99%
rename from trunk/fcl/src/AABB.cpp
rename to trunk/fcl/src/BV/AABB.cpp
index 39ba0c09..03faf76f 100644
--- a/trunk/fcl/src/AABB.cpp
+++ b/trunk/fcl/src/BV/AABB.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/AABB.h"
+#include "fcl/BV/AABB.h"
 
 #include <limits>
 #include <iostream>
diff --git a/trunk/fcl/src/OBB.cpp b/trunk/fcl/src/BV/OBB.cpp
similarity index 99%
rename from trunk/fcl/src/OBB.cpp
rename to trunk/fcl/src/BV/OBB.cpp
index b44a5940..7ed1001e 100644
--- a/trunk/fcl/src/OBB.cpp
+++ b/trunk/fcl/src/BV/OBB.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/OBB.h"
+#include "fcl/BV/OBB.h"
 #include "fcl/BVH_utility.h"
 #include "fcl/transform.h"
 
diff --git a/trunk/fcl/src/RSS.cpp b/trunk/fcl/src/BV/RSS.cpp
similarity index 99%
rename from trunk/fcl/src/RSS.cpp
rename to trunk/fcl/src/BV/RSS.cpp
index 9aa0652b..6c6253f6 100644
--- a/trunk/fcl/src/RSS.cpp
+++ b/trunk/fcl/src/BV/RSS.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/RSS.h"
+#include "fcl/BV/RSS.h"
 #include "fcl/BVH_utility.h"
 #include <iostream>
 namespace fcl
diff --git a/trunk/fcl/src/kIOS.cpp b/trunk/fcl/src/BV/kIOS.cpp
similarity index 99%
rename from trunk/fcl/src/kIOS.cpp
rename to trunk/fcl/src/BV/kIOS.cpp
index 1370de6d..29d3677b 100644
--- a/trunk/fcl/src/kIOS.cpp
+++ b/trunk/fcl/src/BV/kIOS.cpp
@@ -34,7 +34,7 @@
 
 /** \author Jia Pan */
 
-#include "fcl/kIOS.h"
+#include "fcl/BV/kIOS.h"
 #include "fcl/BVH_utility.h"
 #include "fcl/transform.h"
 
-- 
GitLab