Commit 788afa0d authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Wrap library into namespace hpp.

* Commands executed:
* find include src test -iname "*.h" -type f -exec sed -i "s/^namespace fcl/namespace hpp\n{\nnamespace fcl/; \$i} // namespace hpp\n" {} \;
* find src -iname "*.cpp" -type f -exec sed -i "s/^namespace fcl/namespace hpp\n{\nnamespace fcl/; \$a\\\n} // namespace hpp" {} \;
* find test/ -iname "*.cpp" -type f -exec sed -i "s/using namespace fcl/using namespace hpp::fcl/; s/fcl::/hpp::fcl::/g" {} \;
parent c9f854f9
......@@ -42,6 +42,8 @@
#include <hpp/fcl/math/vec_3f.h>
#include <hpp/fcl/math/matrix_3f.h>
namespace hpp
{
namespace fcl
{
class CollisionRequest;
......@@ -262,4 +264,6 @@ static inline AABB rotate(const AABB& aabb, const Matrix3f& t)
}
} // namespace hpp
#endif
......@@ -48,6 +48,8 @@
#include <hpp/fcl/math/transform.h>
/** \brief Main namespace */
namespace hpp
{
namespace fcl
{
......@@ -293,4 +295,6 @@ static inline void convertBV(const BV1& bv1, const Transform3f& tf1, BV2& bv2)
}
} // namespace hpp
#endif
......@@ -45,6 +45,8 @@
#include <hpp/fcl/BV/BV.h>
#include <iostream>
namespace hpp
{
namespace fcl
{
......@@ -130,4 +132,6 @@ inline const Matrix3f& BVNode<OBBRSS>::getOrientation() const
}
} // namespace hpp
#endif
......@@ -42,6 +42,8 @@
#include <hpp/fcl/math/vec_3f.h>
#include <hpp/fcl/math/matrix_3f.h>
namespace hpp
{
namespace fcl
{
class CollisionRequest;
......@@ -156,4 +158,6 @@ bool overlap(const Matrix3f& R0, const Vec3f& T0, const OBB& b1,
bool obbDisjoint(const Matrix3f& B, const Vec3f& T, const Vec3f& a, const Vec3f& b);
}
} // namespace hpp
#endif
......@@ -42,6 +42,8 @@
#include <hpp/fcl/BV/OBB.h>
#include <hpp/fcl/BV/RSS.h>
namespace hpp
{
namespace fcl
{
class CollisionRequest;
......@@ -171,4 +173,6 @@ FCL_REAL distance(const Matrix3f& R0, const Vec3f& T0, const OBBRSS& b1, const O
}
} // namespace hpp
#endif
......@@ -43,6 +43,8 @@
#include <hpp/fcl/math/matrix_3f.h>
#include <boost/math/constants/constants.hpp>
namespace hpp
{
namespace fcl
{
......@@ -157,4 +159,6 @@ bool overlap(const Matrix3f& R0, const Vec3f& T0, const RSS& b1, const RSS& b2);
}
} // namespace hpp
#endif
......@@ -41,6 +41,8 @@
#include <stdexcept>
#include <hpp/fcl/math/vec_3f.h>
namespace hpp
{
namespace fcl
{
......@@ -181,4 +183,6 @@ KDOP<N> translate(const KDOP<N>& bv, const Vec3f& t);
}
} // namespace hpp
#endif
......@@ -41,6 +41,8 @@
#include <hpp/fcl/BV/OBB.h>
namespace hpp
{
namespace fcl
{
class CollisionRequest;
......@@ -161,4 +163,6 @@ FCL_REAL distance(const Matrix3f& R0, const Vec3f& T0, const kIOS& b1, const kIO
}
} // namespace hpp
#endif
......@@ -41,6 +41,8 @@
#include <list>
namespace hpp
{
namespace fcl
{
......@@ -75,4 +77,6 @@ inline void updateFrontList(BVHFrontList* front_list, int b1, int b2)
}
} // namespace hpp
#endif
......@@ -40,6 +40,8 @@
#include <hpp/fcl/data_types.h>
namespace hpp
{
namespace fcl
{
......@@ -82,4 +84,6 @@ enum BVHModelType
}
} // namespace hpp
#endif
......@@ -47,6 +47,8 @@
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
namespace hpp
{
namespace fcl
{
......@@ -354,4 +356,6 @@ NODE_TYPE BVHModel<KDOP<24> >::getNodeType() const;
}
} // namespace hpp
#endif
......@@ -42,6 +42,8 @@
#include <hpp/fcl/BVH/BVH_model.h>
namespace hpp
{
namespace fcl
{
/// @brief Expand the BVH bounding boxes according to the variance matrix corresponding to the data stored within each BV node
......@@ -100,4 +102,6 @@ FCL_REAL maximumDistance(Vec3f* ps, Vec3f* ps2, Triangle* ts, unsigned int* indi
}
} // namespace hpp
#endif
......@@ -43,6 +43,8 @@
#include <hpp/fcl/BV/OBBRSS.h>
#include <iostream>
namespace hpp
{
namespace fcl
{
......@@ -350,4 +352,6 @@ private:
}
} // namespace hpp
#endif
......@@ -44,6 +44,8 @@
#include <vector>
#include <iostream>
namespace hpp
{
namespace fcl
{
......@@ -286,4 +288,6 @@ void BVSplitter<OBBRSS>::computeRule_median(const OBBRSS& bv, unsigned int* prim
}
} // namespace hpp
#endif
......@@ -43,6 +43,8 @@
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/collision_data.h>
namespace hpp
{
namespace fcl
{
......@@ -61,4 +63,6 @@ std::size_t collide(const CollisionGeometry* o1, const Transform3f& tf1,
CollisionResult& result);
}
} // namespace hpp
#endif
......@@ -47,6 +47,8 @@
#include <limits>
namespace hpp
{
namespace fcl
{
......@@ -457,4 +459,6 @@ inline CollisionRequestFlag& operator^=(CollisionRequestFlag& a, CollisionReques
}
} // namespace hpp
#endif
......@@ -43,6 +43,8 @@
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/collision_data.h>
namespace hpp
{
namespace fcl
{
......@@ -67,4 +69,6 @@ struct CollisionFunctionMatrix
}
} // namespace hpp
#endif
......@@ -46,6 +46,8 @@
/// @brief collision and distance function on traversal nodes. these functions provide a higher level abstraction for collision functions provided in collision_func_matrix
namespace hpp
{
namespace fcl
{
......@@ -66,4 +68,6 @@ namespace fcl
void distance(DistanceTraversalNodeBase* node, BVHFrontList* front_list = NULL, int qsize = 2);
}
} // namespace hpp
#endif
......@@ -44,6 +44,8 @@
#include <hpp/fcl/math/transform.h>
#include <boost/shared_ptr.hpp>
namespace hpp
{
namespace fcl
{
......@@ -333,4 +335,6 @@ protected:
}
} // namespace hpp
#endif
......@@ -19,9 +19,13 @@
#include <hpp/fcl/collision_object.h>
namespace hpp
{
namespace fcl
{
CollisionGeometry* extract(const CollisionGeometry* model, const Transform3f& pose, const AABB& aabb);
}
} // namespace hpp
#endif // FCL_COLLISION_UTILITY_H
Markdown is supported
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