Skip to content

Commit

Permalink
Add comments and remove whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
jslee02 committed Mar 28, 2017
1 parent 4b564d0 commit 845d112
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
21 changes: 9 additions & 12 deletions dart/collision/ode/OdeCollisionDetector.hpp
Expand Up @@ -40,16 +40,17 @@
namespace dart {
namespace collision {

namespace detail {
class OdeGeom;
}

/// OdeCollisionDetector wraps the ODE collision detector.
///
/// The supported collision shape types are sphere, box, capsule, cylinder,
/// plane, and trimesh.
///
/// ODE additionally supports ray and heightfiled, but DART doesn't support them
/// yet.
class OdeCollisionDetector : public CollisionDetector
{
public:

friend class OdeCollisionObject;
friend class detail::OdeGeom;

static std::shared_ptr<OdeCollisionDetector> create();

Expand Down Expand Up @@ -81,21 +82,20 @@ class OdeCollisionDetector : public CollisionDetector
const CollisionOption& option = CollisionOption(false, 1u, nullptr),
CollisionResult* result = nullptr) override;

// Documentation inherited
/// \warning Not implemented yet.
double distance(
CollisionGroup* group,
const DistanceOption& option = DistanceOption(false, 0.0, nullptr),
DistanceResult* result = nullptr) override;

// Documentation inherited
/// \warning Not implemented yet.
double distance(
CollisionGroup* group1,
CollisionGroup* group2,
const DistanceOption& option = DistanceOption(false, 0.0, nullptr),
DistanceResult* result = nullptr) override;

protected:

/// Constructor
OdeCollisionDetector();

Expand All @@ -106,17 +106,14 @@ class OdeCollisionDetector : public CollisionDetector
dWorldID getOdeWorldId() const;

protected:

/// Top-level world for all bodies
dWorldID mWorldId;

private:
dGeomID createOdeCollisionGeometry(const dynamics::ConstShapePtr& shape);

private:

dContactGeom contactCollisions[MAX_COLLIDE_RETURNS];

};

} // namespace collision
Expand Down
7 changes: 4 additions & 3 deletions dart/collision/ode/OdeCollisionObject.hpp
Expand Up @@ -39,6 +39,10 @@
namespace dart {
namespace collision {

namespace detail {
class OdeGeom;
} // namespace detail

class OdeCollisionObject : public CollisionObject
{
public:
Expand Down Expand Up @@ -71,9 +75,6 @@ class OdeCollisionObject : public CollisionObject
///
/// If the ODE geom type is immobile, this is nullptr.
dBodyID mBodyId;

private:

};

} // namespace collision
Expand Down

0 comments on commit 845d112

Please sign in to comment.