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
c4a3902f
Commit
c4a3902f
authored
Feb 17, 2014
by
Mark Moll
Browse files
Don't use deprecated API. Fix compiler warnings. Cmake cleanup. (Missing changes from
44ea1ea9
)
parent
677539bb
Changes
7
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
c4a3902f
...
...
@@ -65,22 +65,21 @@ find_package(flann QUIET)
if
(
FLANN_FOUND
)
set
(
FCL_HAVE_FLANN 1
)
include_directories
(
${
FLANN_INCLUDE_DIRS
}
)
link_directories
(
${
FLANN_LIBRARY_DIRS
}
)
message
(
STATUS
"FCL uses Flann"
)
else
()
message
(
STATUS
"FCL does not use Flann"
)
endif
()
find_package
(
tinyxml QUIET
)
if
(
TINYXML_FOUND
)
set
(
FCL_HAVE_TINYXML 1
)
include_directories
(
${
TINYXML_INCLUDE_DIRS
}
)
link_directories
(
${
TINYXML_LIBRARY_DIRS
}
)
message
(
STATUS
"FCL uses tinyxml"
)
else
()
message
(
STATUS
"FCL does not use tinyxml"
)
endif
()
#
find_package(tinyxml QUIET)
#
if (TINYXML_FOUND)
#
set(FCL_HAVE_TINYXML 1)
#
include_directories(${TINYXML_INCLUDE_DIRS})
#
link_directories(${TINYXML_LIBRARY_DIRS})
#
message(STATUS "FCL uses tinyxml")
#
else()
#
message(STATUS "FCL does not use tinyxml")
#
endif()
find_package
(
Boost COMPONENTS thread date_time filesystem system unit_test_framework REQUIRED
)
...
...
include/fcl/math/vec_nf.h
View file @
c4a3902f
...
...
@@ -167,7 +167,7 @@ template<typename T1, std::size_t N1,
void
repack
(
const
Vec_n
<
T1
,
N1
>&
input
,
Vec_n
<
T2
,
N2
>&
output
)
{
in
t
n
=
std
::
min
(
N1
,
N2
);
std
::
size_
t
n
=
std
::
min
(
N1
,
N2
);
for
(
std
::
size_t
i
=
0
;
i
<
n
;
++
i
)
output
[
i
]
=
input
[
i
];
}
...
...
src/broadphase/broadphase_dynamic_AABB_tree.cpp
View file @
c4a3902f
...
...
@@ -739,7 +739,7 @@ void DynamicAABBTreeCollisionManager::update(const std::vector<CollisionObject*>
void
DynamicAABBTreeCollisionManager
::
collide
(
CollisionObject
*
obj
,
void
*
cdata
,
CollisionCallBack
callback
)
const
{
if
(
size
()
==
0
)
return
;
switch
(
obj
->
getC
ollisionGeometry
()
->
getNodeType
())
switch
(
obj
->
c
ollisionGeometry
()
->
getNodeType
())
{
#if FCL_HAVE_OCTOMAP
case
GEOM_OCTREE
:
...
...
@@ -763,7 +763,7 @@ void DynamicAABBTreeCollisionManager::distance(CollisionObject* obj, void* cdata
{
if
(
size
()
==
0
)
return
;
FCL_REAL
min_dist
=
std
::
numeric_limits
<
FCL_REAL
>::
max
();
switch
(
obj
->
getC
ollisionGeometry
()
->
getNodeType
())
switch
(
obj
->
c
ollisionGeometry
()
->
getNodeType
())
{
#if FCL_HAVE_OCTOMAP
case
GEOM_OCTREE
:
...
...
src/broadphase/broadphase_dynamic_AABB_tree_array.cpp
View file @
c4a3902f
...
...
@@ -764,7 +764,7 @@ void DynamicAABBTreeCollisionManager_Array::update(const std::vector<CollisionOb
void
DynamicAABBTreeCollisionManager_Array
::
collide
(
CollisionObject
*
obj
,
void
*
cdata
,
CollisionCallBack
callback
)
const
{
if
(
size
()
==
0
)
return
;
switch
(
obj
->
getC
ollisionGeometry
()
->
getNodeType
())
switch
(
obj
->
c
ollisionGeometry
()
->
getNodeType
())
{
#if FCL_HAVE_OCTOMAP
case
GEOM_OCTREE
:
...
...
@@ -788,7 +788,7 @@ void DynamicAABBTreeCollisionManager_Array::distance(CollisionObject* obj, void*
{
if
(
size
()
==
0
)
return
;
FCL_REAL
min_dist
=
std
::
numeric_limits
<
FCL_REAL
>::
max
();
switch
(
obj
->
getC
ollisionGeometry
()
->
getNodeType
())
switch
(
obj
->
c
ollisionGeometry
()
->
getNodeType
())
{
#if FCL_HAVE_OCTOMAP
case
GEOM_OCTREE
:
...
...
src/collision.cpp
View file @
c4a3902f
...
...
@@ -57,7 +57,7 @@ std::size_t collide(const CollisionObject* o1, const CollisionObject* o2,
const
CollisionRequest
&
request
,
CollisionResult
&
result
)
{
return
collide
(
o1
->
getC
ollisionGeometry
(),
o1
->
getTransform
(),
o2
->
getC
ollisionGeometry
(),
o2
->
getTransform
(),
return
collide
(
o1
->
c
ollisionGeometry
()
.
get
()
,
o1
->
getTransform
(),
o2
->
c
ollisionGeometry
()
.
get
()
,
o2
->
getTransform
(),
nsolver
,
request
,
result
);
}
...
...
src/continuous_collision.cpp
View file @
c4a3902f
...
...
@@ -316,8 +316,8 @@ FCL_REAL continuousCollide(const CollisionObject* o1, const Transform3f& tf1_end
const
ContinuousCollisionRequest
&
request
,
ContinuousCollisionResult
&
result
)
{
return
continuousCollide
(
o1
->
getC
ollisionGeometry
(),
o1
->
getTransform
(),
tf1_end
,
o2
->
getC
ollisionGeometry
(),
o2
->
getTransform
(),
tf2_end
,
return
continuousCollide
(
o1
->
c
ollisionGeometry
()
.
get
()
,
o1
->
getTransform
(),
tf1_end
,
o2
->
c
ollisionGeometry
()
.
get
()
,
o2
->
getTransform
(),
tf2_end
,
request
,
result
);
}
...
...
@@ -326,8 +326,8 @@ FCL_REAL collide(const ContinuousCollisionObject* o1, const ContinuousCollisionO
const
ContinuousCollisionRequest
&
request
,
ContinuousCollisionResult
&
result
)
{
return
continuousCollide
(
o1
->
getC
ollisionGeometry
(),
o1
->
getMotion
(),
o2
->
getC
ollisionGeometry
(),
o2
->
getMotion
(),
return
continuousCollide
(
o1
->
c
ollisionGeometry
()
.
get
()
,
o1
->
getMotion
(),
o2
->
c
ollisionGeometry
()
.
get
()
,
o2
->
getMotion
(),
request
,
result
);
}
...
...
src/distance.cpp
View file @
c4a3902f
...
...
@@ -54,7 +54,7 @@ template<typename NarrowPhaseSolver>
FCL_REAL
distance
(
const
CollisionObject
*
o1
,
const
CollisionObject
*
o2
,
const
NarrowPhaseSolver
*
nsolver
,
const
DistanceRequest
&
request
,
DistanceResult
&
result
)
{
return
distance
<
NarrowPhaseSolver
>
(
o1
->
getC
ollisionGeometry
(),
o1
->
getTransform
(),
o2
->
getC
ollisionGeometry
(),
o2
->
getTransform
(),
nsolver
,
return
distance
<
NarrowPhaseSolver
>
(
o1
->
c
ollisionGeometry
()
.
get
()
,
o1
->
getTransform
(),
o2
->
c
ollisionGeometry
()
.
get
()
,
o2
->
getTransform
(),
nsolver
,
request
,
result
);
}
...
...
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