Commit 3fa6789e authored by Lucile Remigy's avatar Lucile Remigy
Browse files

fusion data_types.h and types.h

parent 67e2cd13
......@@ -39,7 +39,7 @@
#define HPP_FCL_AABB_H
#include <stdexcept>
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
namespace hpp
{
......
......@@ -39,7 +39,7 @@
#ifndef HPP_FCL_BV_NODE_H
#define HPP_FCL_BV_NODE_H
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <hpp/fcl/BV/BV.h>
#include <iostream>
......
......@@ -38,7 +38,7 @@
#ifndef HPP_FCL_OBB_H
#define HPP_FCL_OBB_H
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
namespace hpp
{
......
......@@ -39,7 +39,7 @@
#define HPP_FCL_RSS_H
#include <stdexcept>
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <boost/math/constants/constants.hpp>
namespace hpp
......
......@@ -39,7 +39,7 @@
#define HPP_FCL_KDOP_H
#include <stdexcept>
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
namespace hpp
{
......
......@@ -39,7 +39,7 @@
#ifndef HPP_FCL_COLLISION_H
#define HPP_FCL_COLLISION_H
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/collision_data.h>
......
......@@ -41,7 +41,7 @@
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <vector>
#include <set>
#include <limits>
......
......@@ -41,6 +41,9 @@
#include <cstddef>
#include <boost/cstdint.hpp>
#include <Eigen/Core>
#include <Eigen/Geometry>
namespace hpp
{
namespace fcl
......@@ -84,4 +87,31 @@ public:
} // namespace hpp
namespace hpp
{
#ifdef HPP_FCL_HAVE_OCTOMAP
#define OCTOMAP_VERSION_AT_LEAST(x,y,z) \
(OCTOMAP_MAJOR_VERSION > x || (OCTOMAP_MAJOR_VERSION >= x && \
(OCTOMAP_MINOR_VERSION > y || (OCTOMAP_MINOR_VERSION >= y && \
OCTOMAP_PATCH_VERSION >= z))))
#define OCTOMAP_VERSION_AT_MOST(x,y,z) \
(OCTOMAP_MAJOR_VERSION < x || (OCTOMAP_MAJOR_VERSION <= x && \
(OCTOMAP_MINOR_VERSION < y || (OCTOMAP_MINOR_VERSION <= y && \
OCTOMAP_PATCH_VERSION <= z))))
#endif // HPP_FCL_HAVE_OCTOMAP
}
namespace hpp
{
namespace fcl
{
typedef Eigen::Matrix<FCL_REAL, 3, 1> Vec3f;
typedef Eigen::Matrix<FCL_REAL, 3, 3> Matrix3f;
}
} // namespace hpp
#endif
......@@ -39,7 +39,7 @@
#ifndef HPP_FCL_TRANSFORM_H
#define HPP_FCL_TRANSFORM_H
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <boost/thread/mutex.hpp>
namespace hpp
......
......@@ -38,35 +38,9 @@
#ifndef HPP_FCL_MATH_TYPES_H
#define HPP_FCL_MATH_TYPES_H
#include <hpp/fcl/data_types.h>
# warning "This file is deprecated. Include <hpp/fcl/data_types.h> instead."
#include <Eigen/Core>
#include <Eigen/Geometry>
namespace hpp
{
#ifdef HPP_FCL_HAVE_OCTOMAP
#define OCTOMAP_VERSION_AT_LEAST(x,y,z) \
(OCTOMAP_MAJOR_VERSION > x || (OCTOMAP_MAJOR_VERSION >= x && \
(OCTOMAP_MINOR_VERSION > y || (OCTOMAP_MINOR_VERSION >= y && \
OCTOMAP_PATCH_VERSION >= z))))
#define OCTOMAP_VERSION_AT_MOST(x,y,z) \
(OCTOMAP_MAJOR_VERSION < x || (OCTOMAP_MAJOR_VERSION <= x && \
(OCTOMAP_MINOR_VERSION < y || (OCTOMAP_MINOR_VERSION <= y && \
OCTOMAP_PATCH_VERSION <= z))))
#endif // HPP_FCL_HAVE_OCTOMAP
}
namespace hpp
{
namespace fcl
{
typedef Eigen::Matrix<FCL_REAL, 3, 1> Vec3f;
typedef Eigen::Matrix<FCL_REAL, 3, 3> Matrix3f;
}
} // namespace hpp
// List of equivalent includes.
# include <hpp/fcl/data_types.h>
#endif
\ No newline at end of file
......@@ -40,7 +40,7 @@
#include <boost/shared_ptr.hpp>
#include <hpp/fcl/fwd.hh>
#include <hpp/fcl/config.hh>
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <hpp/fcl/collision_object.h>
namespace hpp
......
......@@ -42,7 +42,7 @@
#include <boost/math/constants/constants.hpp>
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <string.h>
namespace hpp
......
......@@ -39,7 +39,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/math/types.h>
#include <hpp/fcl/data_types.h>
#include <hpp/fcl/math/transform.h>
#include <hpp/fcl/intersect.h>
......
Markdown is supported
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