Commit 87b17c31 authored by Lucile Remigy's avatar Lucile Remigy
Browse files

Merge branch 'devel' into refactoring

parents fea6c2e7 d2b8fc79
......@@ -149,8 +149,8 @@ class Capsule : public ShapeBase
public:
Capsule(FCL_REAL radius_, FCL_REAL lz_) : ShapeBase(), radius(radius_), lz(lz_)
{
lz = 0;
HalfLength = lz/2;
lz = lz_;
HalfLength = lz_/2;
}
/// @brief Radius of capsule
......@@ -194,8 +194,8 @@ class Cone : public ShapeBase
public:
Cone(FCL_REAL radius_, FCL_REAL lz_) : ShapeBase(), radius(radius_), lz(lz_)
{
lz = 0;
HalfLength = lz/2;
lz = lz_;
HalfLength = lz_/2;
}
/// @brief Radius of the cone
......@@ -241,8 +241,8 @@ class Cylinder : public ShapeBase
public:
Cylinder(FCL_REAL radius_, FCL_REAL lz_) : ShapeBase(), radius(radius_), lz(lz_)
{
lz = 0;
HalfLength = lz/2;
lz = lz_;
HalfLength = lz_/2;
}
/// @brief Radius of the cylinder
......
Supports Markdown
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