From cd2a4395d04b54b09376c35533722fcba86d4fce Mon Sep 17 00:00:00 2001
From: Lucile Remigy <lucile.remigy@epitech.eu>
Date: Tue, 1 Oct 2019 10:24:03 +0200
Subject: [PATCH] remove extra space
---
include/hpp/fcl/BV/AABB.h | 23 -----------------------
include/hpp/fcl/BV/OBB.h | 3 ---
include/hpp/fcl/BV/OBBRSS.h | 9 ---------
include/hpp/fcl/BV/RSS.h | 2 +-
include/hpp/fcl/shape/geometric_shapes.h | 20 ++++++++++++++++++++
5 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/include/hpp/fcl/BV/AABB.h b/include/hpp/fcl/BV/AABB.h
index e67ae4bf..72954a64 100644
--- a/include/hpp/fcl/BV/AABB.h
+++ b/include/hpp/fcl/BV/AABB.h
@@ -81,16 +81,6 @@ public:
{
}
-
-
-
-
-
-
-
-
-
-//start API in common test
/// @name Bounding volume API
/// Common API to BVs.
/// @{
@@ -189,19 +179,6 @@ public:
}
/// @}
-//End API in common test
-
-
-
-
-
-
-
-
-
-
-
-
/// @brief Check whether the AABB contains another AABB
inline bool contain(const AABB& other) const
diff --git a/include/hpp/fcl/BV/OBB.h b/include/hpp/fcl/BV/OBB.h
index c359e315..5dee5cb1 100644
--- a/include/hpp/fcl/BV/OBB.h
+++ b/include/hpp/fcl/BV/OBB.h
@@ -60,9 +60,6 @@ public:
/// @brief Half dimensions of OBB
Vec3f extent;
-
-
-
/// @brief Check whether the OBB contains a point.
bool contain(const Vec3f& p) const;
diff --git a/include/hpp/fcl/BV/OBBRSS.h b/include/hpp/fcl/BV/OBBRSS.h
index cb6ed77b..36c97e61 100644
--- a/include/hpp/fcl/BV/OBBRSS.h
+++ b/include/hpp/fcl/BV/OBBRSS.h
@@ -59,10 +59,6 @@ public:
/// @brief RSS member, for distance
RSS rss;
-
-
-
-
/// @brief Check whether the OBBRSS contains a point
inline bool contain(const Vec3f& p) const
{
@@ -151,11 +147,6 @@ public:
}
};
-
-
-
-
-
/// @brief Check collision between two OBBRSS, b1 is in configuration (R0, T0) and b2 is in indentity
inline bool overlap(const Matrix3f& R0, const Vec3f& T0, const OBBRSS& b1, const OBBRSS& b2)
{
diff --git a/include/hpp/fcl/BV/RSS.h b/include/hpp/fcl/BV/RSS.h
index bf9dd193..b626e27e 100644
--- a/include/hpp/fcl/BV/RSS.h
+++ b/include/hpp/fcl/BV/RSS.h
@@ -161,4 +161,4 @@ bool overlap(const Matrix3f& R0, const Vec3f& T0, const RSS& b1, const RSS& b2,
} // namespace hpp
-#endif
+#endif
\ No newline at end of file
diff --git a/include/hpp/fcl/shape/geometric_shapes.h b/include/hpp/fcl/shape/geometric_shapes.h
index 3c37dc63..391c9c19 100644
--- a/include/hpp/fcl/shape/geometric_shapes.h
+++ b/include/hpp/fcl/shape/geometric_shapes.h
@@ -151,12 +151,19 @@ public:
{
}
+ Capsule::Capsule() : HalfLength(lz/2), lz(0)
+ {
+ }
+
/// @brief Radius of capsule
FCL_REAL radius;
/// @brief Length along z axis
FCL_REAL lz;
+ /// @brief Half Length along z axis
+ FCL_REAL HalfLength;
+
/// @brief Compute AABB
void computeLocalAABB();
@@ -191,12 +198,19 @@ public:
{
}
+ Cone::Cone() : HalfLength(lz/2), lz(0)
+ {
+ }
+
/// @brief Radius of the cone
FCL_REAL radius;
/// @brief Length along z axis
FCL_REAL lz;
+ /// @brief Half Length along z axis
+ FCL_REAL HalfLength;
+
/// @brief Compute AABB
void computeLocalAABB();
@@ -233,6 +247,9 @@ public:
{
}
+ Cylinder::Cylinder() : HalfLength(lz/2), lz(0)
+ {
+ }
/// @brief Radius of the cylinder
FCL_REAL radius;
@@ -240,6 +257,9 @@ public:
/// @brief Length along z axis
FCL_REAL lz;
+ /// @brief Half Length along z axis
+ FCL_REAL HalfLength;
+
/// @brief Compute AABB
void computeLocalAABB();
--
GitLab