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
Gabriele Buondonno
pinocchio
Commits
5f2cb66f
Commit
5f2cb66f
authored
Mar 03, 2016
by
Valenza Florian
Browse files
[C++] clarify method name
parent
ac636b53
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/multibody/parser/from-collada-to-fcl.hpp
View file @
5f2cb66f
...
...
@@ -206,7 +206,7 @@ namespace se3
*
* @return The absolute path to the mesh file
*/
inline
std
::
string
from
URDFMeshPathToAbsolutePath
Pack
(
const
std
::
string
&
urdf_mesh_path
,
inline
std
::
string
convert
URDFMeshPathToAbsolutePath
(
const
std
::
string
&
urdf_mesh_path
,
const
std
::
vector
<
std
::
string
>
&
package_dirs
)
{
// if exists p1/mesh, absolutePath = p1/mesh,
...
...
@@ -228,16 +228,6 @@ namespace se3
return
absolutePath
;
}
inline
std
::
string
fromURDFMeshPathToAbsolutePath
(
const
std
::
string
&
urdf_mesh_path
,
const
std
::
string
&
meshRootDir
)
{
std
::
string
absolutePath
=
std
::
string
(
meshRootDir
+
urdf_mesh_path
.
substr
(
10
,
urdf_mesh_path
.
size
()));
return
absolutePath
;
}
}
// namespace se3
...
...
src/multibody/parser/urdf-with-geometry.hxx
View file @
5f2cb66f
...
...
@@ -42,7 +42,7 @@ namespace se3
boost
::
shared_ptr
<
::
urdf
::
Mesh
>
collisionGeometry
=
boost
::
dynamic_pointer_cast
<
::
urdf
::
Mesh
>
(
collision
->
geometry
);
std
::
string
collisionFilename
=
collisionGeometry
->
filename
;
std
::
string
full_path
=
from
URDFMeshPathToAbsolutePath
Pack
(
collisionFilename
,
package_dirs
);
std
::
string
full_path
=
convert
URDFMeshPathToAbsolutePath
(
collisionFilename
,
package_dirs
);
::
urdf
::
Vector3
scale
=
collisionGeometry
->
scale
;
...
...
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