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
86699284
Verified
Commit
86699284
authored
6 years ago
by
Justin Carpentier
Committed by
Justin Carpentier
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[Parsers/URDF] Move .cpp file as .hxx files
The parsers will be templatized
parent
33093283
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+2
-0
2 additions, 0 deletions
CMakeLists.txt
src/CMakeLists.txt
+0
-10
0 additions, 10 deletions
src/CMakeLists.txt
src/parsers/urdf/geometry.hxx
+1
-1
1 addition, 1 deletion
src/parsers/urdf/geometry.hxx
src/parsers/urdf/model.hxx
+9
-4
9 additions, 4 deletions
src/parsers/urdf/model.hxx
with
12 additions
and
15 deletions
CMakeLists.txt
+
2
−
0
View file @
86699284
...
...
@@ -314,6 +314,8 @@ SET(${PROJECT_NAME}_PARSERS_HEADERS
IF
(
URDFDOM_FOUND
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_HEADERS
parsers/urdf.hpp
parsers/urdf/model.hxx
parsers/urdf/geometry.hxx
parsers/urdf/utils.hpp
parsers/urdf/types.hpp
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
0
−
10
View file @
86699284
...
...
@@ -32,16 +32,6 @@ SET(${PROJECT_NAME}_PARSERS_SOURCES
parsers/srdf.cpp
)
IF
(
URDFDOM_FOUND
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_SOURCES
parsers/urdf/model.cpp
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_SOURCES
parsers/urdf/geometry.cpp
)
ENDIF
(
URDFDOM_FOUND
)
IF
(
LUA5_FOUND
)
LIST
(
APPEND
${
PROJECT_NAME
}
_PARSERS_SOURCES
parsers/lua/lua_tables.cpp
...
...
This diff is collapsed.
Click to expand it.
src/parsers/urdf/geometry.
cpp
→
src/parsers/urdf/geometry.
hxx
+
1
−
1
View file @
86699284
//
// Copyright (c) 2015-201
6
CNRS
// Copyright (c) 2015-201
8
CNRS
//
// This file is part of Pinocchio
// Pinocchio is free software: you can redistribute it
...
...
This diff is collapsed.
Click to expand it.
src/parsers/urdf/model.
cpp
→
src/parsers/urdf/model.
hxx
+
9
−
4
View file @
86699284
...
...
@@ -575,7 +575,10 @@ namespace se3
details
::
parseRootTree
(
m_root_link
,
m_model
,
root_joint
,
m_verbose
);
}
static
void
run
(
::
urdf
::
LinkConstSharedPtr
root_link
,
Model
&
model
,
const
JointModelVariant
&
root_joint
,
const
bool
verbose
)
static
void
run
(
::
urdf
::
LinkConstSharedPtr
root_link
,
Model
&
model
,
const
JointModelVariant
&
root_joint
,
const
bool
verbose
)
{
boost
::
apply_visitor
(
ParseRootTreeVisitor
(
root_link
,
model
,
verbose
),
root_joint
);
}
...
...
@@ -601,7 +604,9 @@ namespace se3
return
model
;
}
Model
&
buildModel
(
const
std
::
string
&
filename
,
Model
&
model
,
const
bool
verbose
)
Model
&
buildModel
(
const
std
::
string
&
filename
,
Model
&
model
,
const
bool
verbose
)
throw
(
std
::
invalid_argument
)
{
::
urdf
::
ModelInterfaceSharedPtr
urdfTree
=
::
urdf
::
parseURDFFile
(
filename
);
...
...
@@ -653,7 +658,7 @@ namespace se3
return
model
;
}
Model
&
buildModel
(
const
::
urdf
::
ModelInterfaceSharedPtr
&
urdfTree
,
Model
&
buildModel
(
const
::
urdf
::
ModelInterfaceSharedPtr
&
urdfTree
,
const
JointModelVariant
&
root_joint
,
Model
&
model
,
const
bool
verbose
)
...
...
@@ -664,7 +669,7 @@ namespace se3
return
model
;
}
Model
&
buildModel
(
const
::
urdf
::
ModelInterfaceSharedPtr
&
urdfTree
,
Model
&
buildModel
(
const
::
urdf
::
ModelInterfaceSharedPtr
&
urdfTree
,
Model
&
model
,
const
bool
verbose
)
{
...
...
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