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
pinocchio
Commits
6a9490b5
Commit
6a9490b5
authored
Feb 01, 2017
by
Justin Carpentier
Committed by
GitHub
Feb 01, 2017
Browse files
Merge pull request #372 from jmirabel/devel
Minor changes
parents
1d572294
2abbac65
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/math/quaternion.hpp
View file @
6a9490b5
...
...
@@ -97,7 +97,7 @@ namespace se3
#ifndef NDEBUG
const
Scalar
M
=
3
*
std
::
pow
((
Scalar
)
1.
-
epsilon
,
((
Scalar
)
-
5
)
/
2
)
/
4
;
assert
(
std
::
fabs
(
q
.
norm
()
-
1
)
<=
std
::
max
(
M
*
sqrt
(
N2
)
*
(
N2
-
1
)
*
(
N2
-
1
)
/
2
,
Eigen
::
NumTraits
<
Scalar
>::
ep
si
l
on
()));
std
::
max
(
M
*
sqrt
(
N2
)
*
(
N2
-
1
)
*
(
N2
-
1
)
/
2
,
Eigen
::
NumTraits
<
Scalar
>::
dummy_preci
sion
()));
#endif
}
...
...
src/parsers/urdf/geometry.cpp
View file @
6a9490b5
...
...
@@ -67,6 +67,11 @@ namespace se3
std
::
string
collisionFilename
=
collisionGeometry
->
filename
;
meshPath
=
retrieveResourcePath
(
collisionFilename
,
package_dirs
);
if
(
meshPath
==
""
)
{
std
::
stringstream
ss
;
ss
<<
"Mesh "
<<
collisionFilename
<<
" could not be found."
;
throw
std
::
invalid_argument
(
ss
.
str
());
}
fcl
::
Vec3f
scale
=
fcl
::
Vec3f
(
collisionGeometry
->
scale
.
x
,
collisionGeometry
->
scale
.
y
,
...
...
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