Skip to content
Snippets Groups Projects
Commit a8273abd authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Format code

parent dfa51812
No related branches found
No related tags found
No related merge requests found
......@@ -198,8 +198,8 @@ namespace SimDynamics
// btActionInterface interface
public:
void updateAction(btCollisionWorld *collisionWorld, btScalar deltaTimeStep) override;
void debugDraw(btIDebugDraw *debugDrawer) override;
void updateAction(btCollisionWorld* collisionWorld, btScalar deltaTimeStep) override;
void debugDraw(btIDebugDraw* debugDrawer) override;
};
typedef boost::shared_ptr<BulletEngine> BulletEnginePtr;
......
......@@ -101,7 +101,7 @@ namespace SimDynamics
if (find(robots.begin(), robots.end(), r) == robots.end())
{
for (auto & robot : robots)
for (auto& robot : robots)
{
if (robot->getRobot() == r->getRobot())
{
......@@ -274,8 +274,10 @@ namespace SimDynamics
bool DynamicsEngine::checkCollisionEnabled(DynamicsObject* o1, DynamicsObject* o2)
{
MutexLockPtr lock = getScopedLock();
if(o1 == nullptr || o2 == nullptr)
if (o1 == nullptr || o2 == nullptr)
{
return true;
}
if (!checkCollisionEnabled(o1))
{
return false;
......@@ -341,11 +343,11 @@ namespace SimDynamics
return objects;
}
DynamicsObjectPtr DynamicsEngine::getObject(const std::string &objectName)
DynamicsObjectPtr DynamicsEngine::getObject(const std::string& objectName)
{
MutexLockPtr lock = getScopedLock();
for (auto & object : objects)
for (auto& object : objects)
{
if (object->getName() == objectName)
{
......@@ -360,7 +362,7 @@ namespace SimDynamics
{
MutexLockPtr lock = getScopedLock();
for (auto & object : objects)
for (auto& object : objects)
{
object->activate();
}
......@@ -377,7 +379,7 @@ namespace SimDynamics
{
MutexLockPtr lock = getScopedLock();
for (auto & robot : robots)
for (auto& robot : robots)
{
if (robot->getRobot() == r)
{
......@@ -392,7 +394,7 @@ namespace SimDynamics
{
MutexLockPtr lock = getScopedLock();
for (auto & robot : robots)
for (auto& robot : robots)
{
if (robot->getName() == robName)
{
......
......@@ -12,8 +12,7 @@ namespace SimDynamics
//engineMutexPtr.reset(new boost::recursive_mutex()); // may be overwritten by another mutex!
}
DynamicsObject::~DynamicsObject()
= default;
DynamicsObject::~DynamicsObject() = default;
std::string DynamicsObject::getName() const
{
......
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