From 1df1002765ec0e8269154baaefee583de2ce7b8e Mon Sep 17 00:00:00 2001
From: Lucile Remigy <lucile.remigy@epitech.eu>
Date: Tue, 1 Oct 2019 11:00:59 +0200
Subject: [PATCH] reorganize the file'
---
include/hpp/fcl/data_types.h | 46 +++++++++++++++---------------------
1 file changed, 19 insertions(+), 27 deletions(-)
diff --git a/include/hpp/fcl/data_types.h b/include/hpp/fcl/data_types.h
index dbaa684e..bec19192 100644
--- a/include/hpp/fcl/data_types.h
+++ b/include/hpp/fcl/data_types.h
@@ -44,16 +44,34 @@
#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 double FCL_REAL;
typedef boost::uint64_t FCL_INT64;
typedef boost::int64_t FCL_UINT64;
typedef boost::uint32_t FCL_UINT32;
typedef boost::int32_t FCL_INT32;
+typedef Eigen::Matrix<FCL_REAL, 3, 1> Vec3f;
+typedef Eigen::Matrix<FCL_REAL, 3, 3> Matrix3f;
/// @brief Triangle with 3 indices for points
class Triangle
@@ -87,31 +105,5 @@ 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
--
GitLab