Skip to content
GitLab
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
818c2de7
Unverified
Commit
818c2de7
authored
Feb 12, 2019
by
Guilhem Saurel
Committed by
GitHub
Feb 12, 2019
Browse files
Merge pull request #58 from jmirabel/devel
Declare CachedMeshLoader::Key::operator<
parents
f3f0639e
632e3156
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/hpp/fcl/mesh_loader/loader.h
View file @
818c2de7
...
...
@@ -77,6 +77,8 @@ namespace fcl {
Key
(
const
std
::
string
&
f
,
const
Vec3f
&
s
,
const
NODE_TYPE
&
t
)
:
filename
(
f
),
scale
(
s
),
bvType
(
t
)
{}
bool
operator
<
(
const
CachedMeshLoader
::
Key
&
b
)
const
;
};
typedef
std
::
map
<
Key
,
CollisionGeometryPtr_t
>
Cache_t
;
...
...
src/mesh_loader/loader.cpp
View file @
818c2de7
...
...
@@ -42,8 +42,9 @@
namespace
hpp
{
namespace
fcl
{
bool
operator
<
(
const
CachedMeshLoader
::
Key
&
a
,
const
CachedMeshLoader
::
Key
&
b
)
bool
CachedMeshLoader
::
Key
::
operator
<
(
const
CachedMeshLoader
::
Key
&
b
)
const
{
const
CachedMeshLoader
::
Key
&
a
=
*
this
;
if
(
a
.
bvType
<
b
.
bvType
)
return
true
;
if
(
a
.
bvType
>
b
.
bvType
)
return
false
;
for
(
int
i
=
0
;
i
<
3
;
++
i
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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