Unverified Commit 3852a0f8 authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #116 from jcarpent/topic/python

Improve bindings + remove borring warnings + fix
parents f46b141f 0fef5b66
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Box, Halfspace>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Box, Plane>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Box, Sphere>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Capsule, Halfspace>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Capsule, Plane>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Cone, Halfspace>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Cone, Plane>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Cylinder, Halfspace>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Cylinder, Plane>
......
......@@ -66,3 +66,4 @@ namespace fcl
/// @endcond
#endif
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Sphere, Cylinder>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Sphere, Halfspace>
......
......@@ -46,7 +46,7 @@
namespace hpp
{
namespace fcl {
class GJKSolver;
struct GJKSolver;
template <>
FCL_REAL ShapeShapeDistance <Sphere, Plane>
......
......@@ -32,6 +32,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#if __cplusplus < 201103L
#define nullptr NULL
#endif
#include <hpp/fcl/mesh_loader/assimp.h>
// Assimp >= 5.0 is forcing the use of C++11 keywords. A fix has been submitted https://github.com/assimp/assimp/pull/2758.
......
......@@ -103,3 +103,4 @@ struct TraversalTraitsDistance <BVHModel<T_BVH>, OcTree>
}
} //hpp
......@@ -11,6 +11,7 @@ macro(add_fcl_test test_name)
)
PKG_CONFIG_USE_DEPENDENCY(${test_name} assimp)
add_test(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
target_compile_options(${test_name} PRIVATE "-Wno-c99-extensions")
endmacro(add_fcl_test)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
......
......@@ -160,7 +160,7 @@ double run<OBB> (const std::vector<Transform3f>& tf,
const BVHModel<OBB> (&models)[2][3], int split_method,
const char* prefix)
{
double col = collide <OBB, typename traits<OBB>::CollisionTraversalNode>
double col = collide <OBB,traits<OBB>::CollisionTraversalNode>
(tf, models[0][split_method], models[1][split_method], verbose);
double dist = 0;
......
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