Skip to content

Commit

Permalink
w
Browse files Browse the repository at this point in the history
  • Loading branch information
jslee02 committed Apr 2, 2024
1 parent 82ee900 commit 472621b
Show file tree
Hide file tree
Showing 85 changed files with 271 additions and 207 deletions.
18 changes: 9 additions & 9 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,23 @@ IncludeCategories:
Priority: 22
- Regex: '^<dart\/utils\/.*\.h(pp)?>$'
Priority: 23
- Regex: '^<dart\/simulation\/.*\.h(pp)?>$'
- Regex: '^<dart\/Export.hpp>$'
Priority: 24
- Regex: '^<dart\/constraint\/.*\.h(pp)?>$'
- Regex: '^<dart\/simulation\/.*\.h(pp)?>$'
Priority: 25
- Regex: '^<dart\/collision\/.*\.h(pp)?>$'
- Regex: '^<dart\/constraint\/.*\.h(pp)?>$'
Priority: 26
- Regex: '^<dart\/dynamics\/.*\.h(pp)?>$'
- Regex: '^<dart\/collision\/.*\.h(pp)?>$'
Priority: 27
- Regex: '^<dart\/optimizer\/.*\.h(pp)?>$'
- Regex: '^<dart\/dynamics\/.*\.h(pp)?>$'
Priority: 28
- Regex: '^<dart\/lcpsolver\/.*\.h(pp)?>$'
- Regex: '^<dart\/optimizer\/.*\.h(pp)?>$'
Priority: 29
- Regex: '^<dart\/integration\/.*\.h(pp)?>$'
- Regex: '^<dart\/lcpsolver\/.*\.h(pp)?>$'
Priority: 30
- Regex: '^<dart\/math\/.*\.h(pp)?>$'
- Regex: '^<dart\/integration\/.*\.h(pp)?>$'
Priority: 31
- Regex: '^<dart\/common\/.*\.h(pp)?>$'
- Regex: '^<dart\/math\/.*\.h(pp)?>$'
Priority: 32
- Regex: '^<dart\/common\/.*\.h(pp)?>$'
Priority: 33
Expand Down
5 changes: 4 additions & 1 deletion dart/collision/CollisionDetector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_COLLISIONDETECTOR_HPP_
#define DART_COLLISION_COLLISIONDETECTOR_HPP_

#include <dart/Export.hpp>

#include <dart/collision/CollisionOption.hpp>
#include <dart/collision/CollisionResult.hpp>
#include <dart/collision/Contact.hpp>
Expand All @@ -56,7 +58,8 @@ namespace collision {

class CollisionObject;

class CollisionDetector : public std::enable_shared_from_this<CollisionDetector>
class DART_API CollisionDetector
: public std::enable_shared_from_this<CollisionDetector>
{
public:
friend class CollisionObject;
Expand Down
8 changes: 5 additions & 3 deletions dart/collision/CollisionFilter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_COLLISIONFILTER_HPP_
#define DART_COLLISION_COLLISIONFILTER_HPP_

#include <dart/Export.hpp>

#include <dart/collision/detail/UnorderedPairs.hpp>

#include <dart/common/Deprecated.hpp>
Expand All @@ -47,7 +49,7 @@ namespace collision {

class CollisionObject;

class CollisionFilter
class DART_API CollisionFilter
{
public:
/// Destructor.
Expand All @@ -68,7 +70,7 @@ class CollisionFilter
const CollisionObject* object1, const CollisionObject* object2) const = 0;
};

class CompositeCollisionFilter : public CollisionFilter
class DART_API CompositeCollisionFilter : public CollisionFilter
{
public:
/// Adds a collision filter to this CompositeCollisionFilter.
Expand All @@ -90,7 +92,7 @@ class CompositeCollisionFilter : public CollisionFilter
std::unordered_set<const CollisionFilter*> mFilters;
};

class BodyNodeCollisionFilter : public CollisionFilter
class DART_API BodyNodeCollisionFilter : public CollisionFilter
{
public:
/// Add a BodyNode pair to the blacklist.
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/CollisionGroup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_COLLISIONGROUP_HPP_
#define DART_COLLISION_COLLISIONGROUP_HPP_

#include <dart/Export.hpp>

#include <dart/collision/CollisionOption.hpp>
#include <dart/collision/CollisionResult.hpp>
#include <dart/collision/DistanceOption.hpp>
Expand All @@ -52,7 +54,7 @@
namespace dart {
namespace collision {

class CollisionGroup
class DART_API CollisionGroup
{
public:
/// Constructor
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/CollisionObject.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_COLLISIONOBJECT_HPP_
#define DART_COLLISION_COLLISIONOBJECT_HPP_

#include <dart/Export.hpp>

#include <dart/collision/SmartPointer.hpp>

#include <dart/dynamics/SmartPointer.hpp>
Expand All @@ -42,7 +44,7 @@
namespace dart {
namespace collision {

class CollisionObject
class DART_API CollisionObject
{
public:
friend class CollisionGroup;
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/CollisionOption.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_COLLISIONOPTION_HPP_
#define DART_COLLISION_COLLISIONOPTION_HPP_

#include <dart/Export.hpp>

#include <memory>

#include <cstddef>
Expand All @@ -42,7 +44,7 @@ namespace collision {

class CollisionFilter;

struct CollisionOption
struct DART_API CollisionOption
{
/// Flag whether the collision detector computes contact information (contact
/// point, normal, and penetration depth). If it is set to false, only the
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/CollisionResult.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_COLLISIONRESULT_HPP_
#define DART_COLLISION_COLLISIONRESULT_HPP_

#include <dart/Export.hpp>

#include <dart/collision/Contact.hpp>

#include <unordered_set>
Expand All @@ -49,7 +51,7 @@ class ShapeFrame;

namespace collision {

class CollisionResult
class DART_API CollisionResult
{
public:
/// Add one contact
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/Contact.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_CONTACT_HPP_
#define DART_COLLISION_CONTACT_HPP_

#include <dart/Export.hpp>

#include <dart/collision/SmartPointer.hpp>

#include <dart/dynamics/SmartPointer.hpp>
Expand All @@ -43,7 +45,7 @@ namespace dart {
namespace collision {

/// Contact information
struct Contact
struct DART_API Contact
{
/// Default constructor
Contact();
Expand Down
6 changes: 4 additions & 2 deletions dart/collision/DistanceFilter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_DISTANCEFILTER_HPP_
#define DART_COLLISION_DISTANCEFILTER_HPP_

#include <dart/Export.hpp>

namespace dart {

namespace dynamics {
Expand All @@ -43,13 +45,13 @@ namespace collision {

class CollisionObject;

struct DistanceFilter
struct DART_API DistanceFilter
{
virtual bool needDistance(
const CollisionObject* object1, const CollisionObject* object2) const = 0;
};

struct BodyNodeDistanceFilter : DistanceFilter
struct DART_API BodyNodeDistanceFilter : DistanceFilter
{
bool needDistance(
const CollisionObject* object1,
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/DistanceOption.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_DISTANCE_OPTION_HPP_
#define DART_COLLISION_DISTANCE_OPTION_HPP_

#include <dart/Export.hpp>

#include <memory>

#include <cstddef>
Expand All @@ -42,7 +44,7 @@ namespace collision {

struct DistanceFilter;

struct DistanceOption
struct DART_API DistanceOption
{
/// Whether to calculate the nearest points.
///
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/DistanceResult.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_DISTANCE_RESULT_HPP_
#define DART_COLLISION_DISTANCE_RESULT_HPP_

#include <dart/Export.hpp>

#include <Eigen/Dense>

namespace dart {
Expand All @@ -43,7 +45,7 @@ class ShapeFrame;

namespace collision {

struct DistanceResult
struct DART_API DistanceResult
{
/// Minimum \b singed distance between the checked Shape pairs.
///
Expand Down
4 changes: 3 additions & 1 deletion dart/collision/RaycastOption.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@
#ifndef DART_COLLISION_RAYCASTOPTION_HPP_
#define DART_COLLISION_RAYCASTOPTION_HPP_

#include <dart/Export.hpp>

#include <memory>

#include <cstddef>

namespace dart {
namespace collision {

struct RaycastOption
struct DART_API RaycastOption
{
/// Constructor
RaycastOption(bool enableAllHits = false, bool sortByClosest = false);
Expand Down
6 changes: 4 additions & 2 deletions dart/collision/RaycastResult.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COLLISION_RAYCASTRESULT_HPP_
#define DART_COLLISION_RAYCASTRESULT_HPP_

#include <dart/Export.hpp>

#include <Eigen/Dense>

#include <vector>
Expand All @@ -42,7 +44,7 @@ namespace collision {

class CollisionObject;

struct RayHit
struct DART_API RayHit
{
/// The collision object the ray hit
const CollisionObject* mCollisionObject;
Expand All @@ -60,7 +62,7 @@ struct RayHit
RayHit();
};

struct RaycastResult
struct DART_API RaycastResult
{
/// Clear the result
void clear();
Expand Down
2 changes: 2 additions & 0 deletions dart/common/Aspect.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COMMON_ASPECT_HPP_
#define DART_COMMON_ASPECT_HPP_

#include <dart/Export.hpp>

#include <dart/common/ClassWithVirtualBase.hpp>
#include <dart/common/Cloneable.hpp>
#include <dart/common/detail/NoOp.hpp>
Expand Down
2 changes: 2 additions & 0 deletions dart/common/MemoryAllocator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@

#include <dart/config.hpp>

#include <dart/Export.hpp>

#include <dart/common/Castable.hpp>

#include <iostream>
Expand Down
4 changes: 3 additions & 1 deletion dart/common/Observer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COMMON_OBSERVER_HPP_
#define DART_COMMON_OBSERVER_HPP_

#include <dart/Export.hpp>

#include <set>

namespace dart {
Expand All @@ -48,7 +50,7 @@ class Subject;
/// dart::sub_ptr is a templated smart pointer that will change itself into a
/// nullptr when its Subject is destroyed. It offers one of the easiest ways to
/// take advantage of the Subject/Observer pattern.
class Observer
class DART_API Observer
{
public:
friend class Subject;
Expand Down
4 changes: 3 additions & 1 deletion dart/common/Resource.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COMMON_RESOURCE_HPP_
#define DART_COMMON_RESOURCE_HPP_

#include <dart/Export.hpp>

#include <memory>
#include <string>

Expand All @@ -46,7 +48,7 @@ namespace common {
/// It is expected that each \a ResourceRetriever will provide a concrete /
/// instantiation of the Resource class. This interface exposes an similar API
/// to that of the the standard C file manipulation functions.
class Resource
class DART_API Resource
{
public:
/// \brief Position to seek relative to.
Expand Down
2 changes: 1 addition & 1 deletion dart/common/ResourceRetriever.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace common {

/// ResourceRetriever provides methods for testing for the existance of and
/// accessing the content of a resource specified by URI.
class ResourceRetriever
class DART_API ResourceRetriever
{
public:
virtual ~ResourceRetriever() = default;
Expand Down
4 changes: 3 additions & 1 deletion dart/common/SharedLibrary.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#ifndef DART_COMMON_SHAREDLIBRARY_HPP_
#define DART_COMMON_SHAREDLIBRARY_HPP_

#include <dart/Export.hpp>

#include <dart/common/Deprecated.hpp>
#include <dart/common/Filesystem.hpp>
#include <dart/common/Platform.hpp>
Expand Down Expand Up @@ -84,7 +86,7 @@ class SharedLibraryManager;
} // namespace detail

/// SharedLibrary is a RAII object wrapping a shared library.
class SharedLibrary
class DART_API SharedLibrary
{
protected:
enum ProtectedConstructionTag
Expand Down
Loading

0 comments on commit 472621b

Please sign in to comment.