Skip to content
Snippets Groups Projects
Commit cd2a4395 authored by Lucile Remigy's avatar Lucile Remigy
Browse files

remove extra space

parent a5cd7416
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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;
......
......@@ -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)
{
......
......@@ -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
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment