Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pinocchio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
pinocchio
Commits
5f2cb66f
Commit
5f2cb66f
authored
9 years ago
by
Valenza Florian
Browse files
Options
Downloads
Patches
Plain Diff
[C++] clarify method name
parent
ac636b53
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/multibody/parser/from-collada-to-fcl.hpp
+1
-11
1 addition, 11 deletions
src/multibody/parser/from-collada-to-fcl.hpp
src/multibody/parser/urdf-with-geometry.hxx
+1
-1
1 addition, 1 deletion
src/multibody/parser/urdf-with-geometry.hxx
with
2 additions
and
12 deletions
src/multibody/parser/from-collada-to-fcl.hpp
+
1
−
11
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
...
...
This diff is collapsed.
Click to expand it.
src/multibody/parser/urdf-with-geometry.hxx
+
1
−
1
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment