Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-fcl
Commits
c8d55914
Commit
c8d55914
authored
Oct 02, 2017
by
Justin Carpentier
Committed by
GitHub
Oct 02, 2017
Browse files
Merge pull request #25 from jcarpent/devel
Minor fixes
parents
e28c8771
bde2a6b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
.gitignore
0 → 100644
View file @
c8d55914
build*
Xcode/*
CMakeLists.txt
View file @
c8d55914
...
...
@@ -44,6 +44,19 @@ set(PROJECT_DESCRIPTION
)
set
(
PROJECT_URL
"http://github.com/humanoid-path-planner/hpp-fcl"
)
IF
(
APPLE
)
SET
(
CMAKE_MACOSX_RPATH TRUE
)
SET
(
CMAKE_SKIP_BUILD_RPATH FALSE
)
SET
(
CMAKE_BUILD_WITH_INSTALL_RPATH FALSE
)
SET
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
list
(
FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
isSystemDir
)
if
(
"
${
isSystemDir
}
"
STREQUAL
"-1"
)
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
endif
(
"
${
isSystemDir
}
"
STREQUAL
"-1"
)
ENDIF
(
APPLE
)
setup_project
()
add_required_dependency
(
"eigen3 >= 3.0.0"
)
...
...
include/hpp/fcl/collision_data.h
View file @
c8d55914
...
...
@@ -469,12 +469,26 @@ public:
/// @brief whether two DistanceResult are the same or not
inline
bool
operator
==
(
const
DistanceResult
&
other
)
const
{
return
min_distance
==
other
.
min_distance
&&
o1
==
other
.
o1
&&
o2
==
other
.
o2
&&
nearest_points
[
0
]
==
other
.
nearest_points
[
0
]
&&
nearest_points
[
1
]
==
other
.
nearest_points
[
1
];
bool
is_same
=
min_distance
==
other
.
min_distance
&&
nearest_points
[
0
]
==
other
.
nearest_points
[
0
]
&&
nearest_points
[
1
]
==
other
.
nearest_points
[
1
]
&&
o1
==
other
.
o1
&&
o2
==
other
.
o2
&&
b1
==
other
.
b1
&&
b2
==
other
.
b2
;
// TODO: check also that two GeometryObject are indeed equal.
if
(
o1
!=
NULL
xor
other
.
o1
!=
NULL
)
return
false
;
is_same
&=
(
o1
==
other
.
o1
);
// else if (o1 != NULL and other.o1 != NULL) is_same &= *o1 == *other.o1;
if
(
o2
!=
NULL
xor
other
.
o2
!=
NULL
)
return
false
;
is_same
&=
(
o2
==
other
.
o2
);
// else if (o2 != NULL and other.o2 != NULL) is_same &= *o2 == *other.o2;
return
is_same
;
}
};
}
...
...
test/CMakeLists.txt
View file @
c8d55914
...
...
@@ -44,6 +44,7 @@ add_fcl_test(test_fcl_capsule_box_2 test_fcl_capsule_box_2.cpp test_fcl_utility.
add_fcl_test
(
test_fcl_bvh_models test_fcl_bvh_models.cpp test_fcl_utility.cpp
)
add_fcl_test
(
test_fcl_profiling test_fcl_profiling.cpp test_fcl_utility.cpp
)
PKG_CONFIG_USE_DEPENDENCY
(
test_fcl_profiling assimp
)
if
(
FCL_HAVE_OCTOMAP
)
add_fcl_test
(
test_fcl_octomap test_fcl_octomap.cpp test_fcl_utility.cpp
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment