tmp: reduce includes

Author: fmessmer

cob_obstacle_distance/include/cob_obstacle_distance/link_to_collision.hpp

@@ -28,10 +28,17 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/pointer_cast.hpp>
 
-#include <fcl/collision_object.h>
-#include <fcl/collision.h>
-#include <fcl/distance.h>
-#include <fcl/collision_data.h>
+/*
+#include <fcl/config.h>
+#if FCL_MINOR_VERSION == 5
+    #include <fcl/collision_object.h>
+    #include <fcl/collision.h>
+    #include <fcl/distance.h>
+    #include <fcl/collision_data.h>
+#else
+
+#endif
+*/
 
 #include <std_msgs/ColorRGBA.h>
 #include <geometry_msgs/Vector3.h>

cob_obstacle_distance/include/cob_obstacle_distance/marker_shapes/marker_shapes.hpp

@@ -25,7 +25,7 @@
 
 #include <fcl/config.h>
 #if FCL_MINOR_VERSION == 5
-#include "fcl/shape/geometric_shapes.h"
+    //#include "fcl/shape/geometric_shapes.h"
     #include "fcl/collision_object.h"
     typedef fcl::CollisionObject FCL_CollisionObject;
 #else
@@ -36,8 +36,14 @@
 #include "cob_obstacle_distance/fcl_marker_converter.hpp"
 #include "cob_obstacle_distance/marker_shapes/marker_shapes_interface.hpp"
 
-#include <fcl/distance.h>
-#include <fcl/collision_data.h>
+/*
+#if FCL_MINOR_VERSION == 5
+    #include <fcl/distance.h>
+    #include <fcl/collision_data.h>
+#else
+
+#endif
+*/
 
 static const std::string g_marker_namespace = "collision_object";
 

cob_obstacle_distance/include/cob_obstacle_distance/marker_shapes/marker_shapes_impl.hpp

@@ -18,6 +18,16 @@
 #ifndef MARKER_SHAPES_IMPL_HPP_
 #define MARKER_SHAPES_IMPL_HPP_
 
+/*
+#include <fcl/config.h>
+#include <fcl/common/types.h>
+#if FCL_MINOR_VERSION == 5
+    typedef fcl::Vec3f FCL_Vec3;
+#else
+    typedef fcl::Vector3f FCL_Vec3;
+#endif
+*/
+
 #include "cob_obstacle_distance/marker_shapes/marker_shapes.hpp"
 
 /* BEGIN MarkerShape ********************************************************************************************/

cob_obstacle_distance/include/cob_obstacle_distance/obstacle_distance_data_types.hpp

@@ -25,7 +25,7 @@
 #include <visualization_msgs/Marker.h>
 
 #include <fcl/config.h>
-#include <fcl/common/types.h>
+//#include <fcl/common/types.h>
 #if FCL_MINOR_VERSION == 5
     typedef fcl::Vec3f FCL_Vec3;
 #else

cob_obstacle_distance/include/cob_obstacle_distance/parsers/parser_base.hpp

@@ -21,7 +21,7 @@
 #include <stdint.h>
 
 #include <fcl/config.h>
-#include <fcl/common/types.h>
+//#include <fcl/common/types.h>
 #if FCL_MINOR_VERSION == 5
     #include <fcl/BVH/BVH_model.h>
 #else

cob_obstacle_distance/src/distance_manager.cpp

@@ -28,9 +28,9 @@
 
 #include <fcl/config.h>
 #if FCL_MINOR_VERSION == 5
-#include <fcl/collision_object.h>
-#include <fcl/collision.h>
-#include <fcl/collision_data.h>
+    //#include <fcl/collision_object.h>
+    //#include <fcl/collision.h>
+    //#include <fcl/collision_data.h>
     #include <fcl/distance.h>
     typedef fcl::DistanceRequest FCL_DistanceRequest;
     typedef fcl::DistanceResult FCL_DistanceResult;